language stringclasses 1
value | owner stringlengths 2 15 | repo stringlengths 2 21 | sha stringlengths 45 45 | message stringlengths 7 36.3k | path stringlengths 1 199 | patch stringlengths 15 102k | is_multipart bool 2
classes |
|---|---|---|---|---|---|---|---|
Other | spring-projects | spring-framework | fb12e234fcee416c4ea6359a2242ce7e3977b0b6.json | Handle NoClassDefFoundError consistently for TELs
Prior to this commit, a NoClassDefFoundError caught in
TestContextManager's retrieveTestExecutionListeners() method would be
handled differently for implicit default listeners (i.e., listeners not
declared via @TestExecutionListeners) and listeners explicitly declared
... | spring-test/src/main/java/org/springframework/test/context/TestContextManager.java | @@ -180,15 +180,13 @@ private TestExecutionListener[] retrieveTestExecutionListeners(Class<?> clazz) {
List<Class<? extends TestExecutionListener>> classesList = new ArrayList<Class<? extends TestExecutionListener>>();
AnnotationDescriptor<TestExecutionListeners> descriptor = findAnnotationDescriptor(clazz, ann... | false |
Other | spring-projects | spring-framework | 2b89c1a87e2469110f9a0d4282eeb348b76262ff.json | Improve cache abstraction chapter
This commit is a general update of the Cache Abstraction chapter.
Existing sections have been updated with recent improvements made in
that area, in particular:
* Guava and JSR-107 caches support
* New @CacheConfig annotation allowing to share some key customizations
at class-level... | src/asciidoc/index.adoc | @@ -46089,6 +46089,8 @@ into an existing Spring application. Similar to the <<transaction,transaction>>
the caching abstraction allows consistent use of various caching solutions with minimal
impact on the code.
+As from Spring 4.1, the cache abstraction has been significantly improved with the
+support of <<cache-... | false |
Other | spring-projects | spring-framework | a1980264691917813037c7015d9a886b938893b0.json | fix CI build
Prior to this commit, AnnotatedJCacheableService contained an annotated
method demonstrating a failure scenario. This could break depending on
the order of the methods array as AopUtils creates the proxy if the
pointcut matches by checking each method.
On the CI server, the first method was this invalid ... | spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/AnnotatedJCacheableService.java | @@ -177,12 +177,6 @@ public void earlyRemoveAllWithException(boolean matchFilter) {
public void noAnnotation() {
}
- @CacheRemove
- @CacheRemoveAll
- public void multiAnnotations() {
-
- }
-
@Override
public long exceptionInvocations() {
return exceptionCounter.get(); | true |
Other | spring-projects | spring-framework | a1980264691917813037c7015d9a886b938893b0.json | fix CI build
Prior to this commit, AnnotatedJCacheableService contained an annotated
method demonstrating a failure scenario. This could break depending on
the order of the methods array as AopUtils creates the proxy if the
pointcut matches by checking each method.
On the CI server, the first method was this invalid ... | spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/AnnotationCacheOperationSourceTests.java | @@ -25,6 +25,8 @@
import javax.cache.annotation.CacheDefaults;
import javax.cache.annotation.CacheKeyGenerator;
+import javax.cache.annotation.CacheRemove;
+import javax.cache.annotation.CacheRemoveAll;
import javax.cache.annotation.CacheResult;
import org.junit.Before;
@@ -105,7 +107,7 @@ public void noAnnotat... | true |
Other | spring-projects | spring-framework | 4cd075bb963d87bb03b6542403d6d0688e1a250d.json | Introduce test for PropertySource + ACI in the TCF
This commit introduces an explicit integration test to verify that a
PropertySource can be set via a custom ApplicationContextInitializer in
the Spring TestContext Framework.
Issue: SPR-11666 | spring-test/src/test/java/org/springframework/test/context/junit4/aci/annotation/PropertySourcesInitializerTests.java | @@ -0,0 +1,89 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *... | false |
Other | spring-projects | spring-framework | 0eba1f818f2553c4f55f3b18cc5b2ad1c2d62a92.json | Use unconstrained quotes in reference manual
Prior to this commit, there were numerous places in the reference
manual, where we would see output similar to the following:
BeanDefinition`s with the `ApplicationContext
This commit addresses this issue by using unconstrained quotes
(e.g., ++XYZ++s) instead of backt... | src/asciidoc/index.adoc | @@ -4308,7 +4308,7 @@ dependency type:
| `BootstrapContextAware`
| Resource adapter `BootstrapContext` the container runs in. Typically available only in
- JCA aware `ApplicationContext`s
+ JCA aware ++ApplicationContext++s
| <<cci>>
| `LoadTimeWeaverAware`
@@ -4460,7 +4460,7 @@ after the Spring container fin... | false |
Other | spring-projects | spring-framework | 1eee339c152a3de2f2a37525899be28bb0bfaf0a.json | Relax constraints in MessageHeaders for subclasses
Allow a subclass to modify MessageHeaders as well as override the
strategy for or even skip having `ID` and `TIMESTAMP` headers.
Issue: SPR-11468 | spring-messaging/src/main/java/org/springframework/messaging/MessageHeaders.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@
* <b>IMPORTANT</b>: This cl... | true |
Other | spring-projects | spring-framework | 1eee339c152a3de2f2a37525899be28bb0bfaf0a.json | Relax constraints in MessageHeaders for subclasses
Allow a subclass to modify MessageHeaders as well as override the
strategy for or even skip having `ID` and `TIMESTAMP` headers.
Issue: SPR-11468 | spring-messaging/src/test/java/org/springframework/messaging/MessageHeadersTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,6 +23,8 @@
import java.util.HashMap;
i... | true |
Other | spring-projects | spring-framework | 3e74d3b2fbea16c55805b9b73c182bdc02e70b83.json | Add putIfAbsent on Cache abstraction
This commit adds a putIfAbsent method to the Cache interface. This
method offers an atomic put if the key is not already associated in
the cache.
Issue: SPR-11400 | spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCache.java | @@ -29,6 +29,7 @@
*
* @author Costin Leau
* @author Juergen Hoeller
+ * @author Stephane Nicoll
* @since 3.1
*/
public class EhCacheCache implements Cache {
@@ -62,7 +63,7 @@ public final Ehcache getNativeCache() {
@Override
public ValueWrapper get(Object key) {
Element element = this.cache.get(key);
... | true |
Other | spring-projects | spring-framework | 3e74d3b2fbea16c55805b9b73c182bdc02e70b83.json | Add putIfAbsent on Cache abstraction
This commit adds a putIfAbsent method to the Cache interface. This
method offers an atomic put if the key is not already associated in
the cache.
Issue: SPR-11400 | spring-context-support/src/main/java/org/springframework/cache/guava/GuavaCache.java | @@ -17,6 +17,8 @@
package org.springframework.cache.guava;
import java.io.Serializable;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
import org.springframework.cache.Cache;
import org.springframework.cache.support.SimpleValueWrapper;
@@ -29,6 +31,7 @@
* <p>Requires G... | true |
Other | spring-projects | spring-framework | 3e74d3b2fbea16c55805b9b73c182bdc02e70b83.json | Add putIfAbsent on Cache abstraction
This commit adds a putIfAbsent method to the Cache interface. This
method offers an atomic put if the key is not already associated in
the cache.
Issue: SPR-11400 | spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCache.java | @@ -29,6 +29,7 @@
* <p>Note: This class has been updated for JCache 1.0, as of Spring 4.0.
*
* @author Juergen Hoeller
+ * @author Stephane Nicoll
* @since 3.2
*/
public class JCacheCache implements Cache {
@@ -95,6 +96,12 @@ public void put(Object key, Object value) {
this.cache.put(key, toStoreValue(val... | true |
Other | spring-projects | spring-framework | 3e74d3b2fbea16c55805b9b73c182bdc02e70b83.json | Add putIfAbsent on Cache abstraction
This commit adds a putIfAbsent method to the Cache interface. This
method offers an atomic put if the key is not already associated in
the cache.
Issue: SPR-11400 | spring-context-support/src/main/java/org/springframework/cache/transaction/TransactionAwareCacheDecorator.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,7 +28,11 @@
* successful transaction. ... | true |
Other | spring-projects | spring-framework | 3e74d3b2fbea16c55805b9b73c182bdc02e70b83.json | Add putIfAbsent on Cache abstraction
This commit adds a putIfAbsent method to the Cache interface. This
method offers an atomic put if the key is not already associated in
the cache.
Issue: SPR-11400 | spring-context-support/src/test/java/org/springframework/cache/AbstractCacheTests.java | @@ -0,0 +1,105 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+... | true |
Other | spring-projects | spring-framework | 3e74d3b2fbea16c55805b9b73c182bdc02e70b83.json | Add putIfAbsent on Cache abstraction
This commit adds a putIfAbsent method to the Cache interface. This
method offers an atomic put if the key is not already associated in
the cache.
Issue: SPR-11400 | spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheTests.java | @@ -16,56 +16,55 @@
package org.springframework.cache.ehcache;
+import static org.junit.Assert.*;
+
import net.sf.ehcache.CacheManager;
import net.sf.ehcache.Ehcache;
import net.sf.ehcache.Element;
import net.sf.ehcache.config.CacheConfiguration;
+import net.sf.ehcache.config.Configuration;
+import org.junit.A... | true |
Other | spring-projects | spring-framework | 3e74d3b2fbea16c55805b9b73c182bdc02e70b83.json | Add putIfAbsent on Cache abstraction
This commit adds a putIfAbsent method to the Cache interface. This
method offers an atomic put if the key is not already associated in
the cache.
Issue: SPR-11400 | spring-context-support/src/test/java/org/springframework/cache/guava/GuavaCacheTests.java | @@ -0,0 +1,67 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ ... | true |
Other | spring-projects | spring-framework | 3e74d3b2fbea16c55805b9b73c182bdc02e70b83.json | Add putIfAbsent on Cache abstraction
This commit adds a putIfAbsent method to the Cache interface. This
method offers an atomic put if the key is not already associated in
the cache.
Issue: SPR-11400 | spring-context-support/src/test/java/org/springframework/cache/transaction/TransactionAwareCacheDecoratorTests.java | @@ -90,6 +90,18 @@ public void putTransactional() {
assertEquals("123", target.get(key, String.class));
}
+ @Test
+ public void putIfAbsent() { // no transactional support for putIfAbsent
+ Cache target = new ConcurrentMapCache("testCache");
+ Cache cache = new TransactionAwareCacheDecorator(target);
+
+ Obje... | true |
Other | spring-projects | spring-framework | 3e74d3b2fbea16c55805b9b73c182bdc02e70b83.json | Add putIfAbsent on Cache abstraction
This commit adds a putIfAbsent method to the Cache interface. This
method offers an atomic put if the key is not already associated in
the cache.
Issue: SPR-11400 | spring-context/src/main/java/org/springframework/cache/Cache.java | @@ -80,6 +80,33 @@ public interface Cache {
*/
void put(Object key, Object value);
+ /**
+ * Atomically associate the specified value with the specified key in this cache if
+ * it is not set already.
+ * <p>This is equivalent to:
+ * <pre><code>
+ * Object existingValue = cache.get(key);
+ * if (existingV... | true |
Other | spring-projects | spring-framework | 3e74d3b2fbea16c55805b9b73c182bdc02e70b83.json | Add putIfAbsent on Cache abstraction
This commit adds a putIfAbsent method to the Cache interface. This
method offers an atomic put if the key is not already associated in
the cache.
Issue: SPR-11400 | spring-context/src/main/java/org/springframework/cache/concurrent/ConcurrentMapCache.java | @@ -103,7 +103,7 @@ public final boolean isAllowNullValues() {
@Override
public ValueWrapper get(Object key) {
Object value = this.store.get(key);
- return (value != null ? new SimpleValueWrapper(fromStoreValue(value)) : null);
+ return toWrapper(value);
}
@Override
@@ -121,6 +121,12 @@ public void put(O... | true |
Other | spring-projects | spring-framework | 3e74d3b2fbea16c55805b9b73c182bdc02e70b83.json | Add putIfAbsent on Cache abstraction
This commit adds a putIfAbsent method to the Cache interface. This
method offers an atomic put if the key is not already associated in
the cache.
Issue: SPR-11400 | spring-context/src/main/java/org/springframework/cache/support/NoOpCacheManager.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
* <p>Will simply accept any... | true |
Other | spring-projects | spring-framework | 3e74d3b2fbea16c55805b9b73c182bdc02e70b83.json | Add putIfAbsent on Cache abstraction
This commit adds a putIfAbsent method to the Cache interface. This
method offers an atomic put if the key is not already associated in
the cache.
Issue: SPR-11400 | spring-context/src/test/java/org/springframework/cache/concurrent/ConcurrentCacheTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2010-2014 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
/**
* @author Costin Leau
... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncExecutionInterceptor.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,6 +23,8 @@
import org.aopalliance.int... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncUncaughtExceptionHandler.java | @@ -0,0 +1,42 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ ... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-aop/src/main/java/org/springframework/aop/interceptor/SimpleAsyncUncaughtExceptionHandler.java | @@ -0,0 +1,41 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ ... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-beans/src/main/resources/META-INF/spring.schemas | @@ -4,14 +4,16 @@ http\://www.springframework.org/schema/beans/spring-beans-3.0.xsd=org/springfram
http\://www.springframework.org/schema/beans/spring-beans-3.1.xsd=org/springframework/beans/factory/xml/spring-beans-3.1.xsd
http\://www.springframework.org/schema/beans/spring-beans-3.2.xsd=org/springframework/beans/fa... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans-4.1.xsd | @@ -0,0 +1,1185 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<xsd:schema xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://www.springframework.org/schema/beans">
+
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace"... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-tool-4.1.xsd | @@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<xsd:schema xmlns="http://www.springframework.org/schema/tool"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://www.springframework.org/schema/tool"
+ elementFormDefault="qualified">
+
+ <xsd:import namespace="http:/... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
import java.util.Collection;... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-context/src/main/java/org/springframework/scheduling/annotation/AnnotationAsyncExecutionInterceptor.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@
import java.util.concurrent.... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,6 +25,8 @@
import org.aopalliance.aop.A... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessor.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
import java.util.concurrent.... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurer.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,17 +18,28 @@
import java.util.concurr... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncConfigurerSupport.java | @@ -0,0 +1,42 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ ... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -56,10 +56,20 @@
* {@code spring-aspects} ... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-context/src/main/java/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
* to enable proxy-based asy... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-context/src/main/java/org/springframework/scheduling/config/AnnotationDrivenBeanDefinitionParser.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@
* @author Juergen Hoeller
... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-context/src/main/resources/META-INF/spring.schemas | @@ -22,7 +22,8 @@ http\://www.springframework.org/schema/task/spring-task-3.0.xsd=org/springframew
http\://www.springframework.org/schema/task/spring-task-3.1.xsd=org/springframework/scheduling/config/spring-task-3.1.xsd
http\://www.springframework.org/schema/task/spring-task-3.2.xsd=org/springframework/scheduling/co... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-context/src/main/resources/org/springframework/scheduling/config/spring-task-4.1.xsd | @@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<xsd:schema xmlns="http://www.springframework.org/schema/task"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:tool="http://www.springframework.org/schema/tool"
+ targetNam... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-context/src/test/java/org/springframework/scheduling/annotation/AsyncAnnotationBeanPostProcessorTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,47 +16,47 @@
package org.springframew... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-context/src/test/java/org/springframework/scheduling/annotation/EnableAsyncTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
import java.lang.annotation.... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-context/src/test/java/org/springframework/scheduling/annotation/TestableAsyncUncaughtExceptionHandler.java | @@ -0,0 +1,86 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ ... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | spring-context/src/test/java/org/springframework/scheduling/annotation/taskNamespaceTests.xml | @@ -3,15 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:task="http://www.springframework.org/schema/task"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-bea... | true |
Other | spring-projects | spring-framework | db23ec733be832b0d86e7218aee9180f4263b16e.json | Add exception handling of asynchronous method
Prior to this commit, an exception thrown by an @Async void method
was not further processed as there is no way to transmit that
exception to the caller.
The AsyncUncaughtExceptionHandler is a new strategy interface that
can be implemented to handle unexpected exception t... | src/asciidoc/index.adoc | @@ -44652,6 +44652,28 @@ specified with the `<qualifier>` element or Spring's `@Qualifier` annotation.
+[[scheduling-annotation-support-exception]]
+==== Exception management with @Async
+When an `@Async` method has a `Future` typed return value, it is easy to manage
+an exception that was thrown during the metho... | true |
Other | spring-projects | spring-framework | 89a4c291c3feae04798d1fc234cdbd82bb7ad9a9.json | Remove trailing whitespace | spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/BufferingStompDecoderTests.java | @@ -52,7 +52,7 @@ public void basic() throws InterruptedException {
assertEquals(0, stompDecoder.getBufferSize());
assertNull(stompDecoder.getExpectedContentLength());
}
-
+
@Test
public void oneMessageInTwoChunks() throws InterruptedException {
| true |
Other | spring-projects | spring-framework | 89a4c291c3feae04798d1fc234cdbd82bb7ad9a9.json | Remove trailing whitespace | spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java | @@ -250,7 +250,7 @@ public static String readScript(LineNumberReader lineNumberReader) throws IOExce
* @param commentPrefix the prefix that identifies comments in the SQL script — typically "--"
* @return a {@code String} containing the script lines
* @deprecated as of Spring 4.0.3, in favor of using
- ... | true |
Other | spring-projects | spring-framework | 8edbdf4ddb144cc4abd5e8cdf14d99c9732f6d4d.json | Fix failing test | spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapterTests.java | @@ -17,8 +17,11 @@
package org.springframework.web.socket.adapter.jetty;
import org.eclipse.jetty.websocket.api.Session;
+import org.eclipse.jetty.websocket.api.UpgradeRequest;
+import org.eclipse.jetty.websocket.api.UpgradeResponse;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.Mockito;
im... | false |
Other | spring-projects | spring-framework | 8ab84481489c4357362984c16c14c2254c20e764.json | Move tests to packages where they belong | spring-websocket/src/test/java/org/springframework/web/socket/adapter/jetty/JettyWebSocketHandlerAdapterTests.java | @@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.web.socket.adapter;
+package org.springframework.web.socket.adapter.jetty;
import org.eclipse.jetty.websocket.api.Session;
import org.junit.Before; | true |
Other | spring-projects | spring-framework | 8ab84481489c4357362984c16c14c2254c20e764.json | Move tests to packages where they belong | spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/ConvertingEncoderDecoderSupportTests.java | @@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.web.socket.adapter;
+package org.springframework.web.socket.adapter.standard;
import java.nio.ByteBuffer;
import javax.websocket.DecodeException; | true |
Other | spring-projects | spring-framework | 8ab84481489c4357362984c16c14c2254c20e764.json | Move tests to packages where they belong | spring-websocket/src/test/java/org/springframework/web/socket/adapter/standard/StandardWebSocketHandlerAdapterTests.java | @@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.web.socket.adapter;
+package org.springframework.web.socket.adapter.standard;
import javax.websocket.CloseReason;
import javax.websocket.CloseReason.CloseCodes; | true |
Other | spring-projects | spring-framework | 6ec3de6029e61ea4b88889ca12ea3d19fe29a4c6.json | Fix issue with default executor for broker channel
The default for the broker channel should be "no executor".
Issue: SPR-11623 | spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java | @@ -176,11 +176,15 @@ private RuntimeBeanReference getMessageChannel(String channelName, Element chann
ParserContext parserCxt, Object source) {
RootBeanDefinition executorDef = null;
- Element executor = null;
-
- if (channelElement != null) {
- executor = DomUtils.getChildElementByTagName(channelElement,... | true |
Other | spring-projects | spring-framework | 6ec3de6029e61ea4b88889ca12ea3d19fe29a4c6.json | Fix issue with default executor for broker channel
The default for the broker channel should be "no executor".
Issue: SPR-11623 | spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java | @@ -298,8 +298,10 @@ public void customChannels() {
@Test
public void customChannelsWithDefaultExecutor() {
loadBeanDefinitions("websocket-config-broker-customchannels-default-executor.xml");
- List<Class<? extends MessageHandler>> subscriberTypes = Arrays.<Class<? extends MessageHandler>>asList(SubProtocolWebS... | true |
Other | spring-projects | spring-framework | 6ec3de6029e61ea4b88889ca12ea3d19fe29a4c6.json | Fix issue with default executor for broker channel
The default for the broker channel should be "no executor".
Issue: SPR-11623 | spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-customchannels-default-executor.xml | @@ -1,30 +1,30 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:websocket="http://www.springframework.org/schema/websocket"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/sch... | true |
Other | spring-projects | spring-framework | 119dfd9cf9215b2800d2d178913917103761fefd.json | Fix cache decoration
Prior to this commit, a cache that is added on-the-fly is not properly
decorated by the provided CacheManager implementation that supports
it (EhCache and JCache).
This commits adds an extra getMissingCache method to
the AbstractCacheManager that can be extended to provide a cache that
may exist ... | spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheCacheManager.java | @@ -31,6 +31,7 @@
*
* @author Costin Leau
* @author Juergen Hoeller
+ * @author Stephane Nicoll
* @since 3.1
*/
public class EhCacheCacheManager extends AbstractTransactionSupportingCacheManager {
@@ -86,17 +87,14 @@ protected Collection<Cache> loadCaches() {
}
@Override
- public Cache getCache(String ... | true |
Other | spring-projects | spring-framework | 119dfd9cf9215b2800d2d178913917103761fefd.json | Fix cache decoration
Prior to this commit, a cache that is added on-the-fly is not properly
decorated by the provided CacheManager implementation that supports
it (EhCache and JCache).
This commits adds an extra getMissingCache method to
the AbstractCacheManager that can be extended to provide a cache that
may exist ... | spring-context-support/src/main/java/org/springframework/cache/jcache/JCacheCacheManager.java | @@ -31,6 +31,7 @@
* <p>Note: This class has been updated for JCache 1.0, as of Spring 4.0.
*
* @author Juergen Hoeller
+ * @author Stephane Nicoll
* @since 3.2
*/
public class JCacheCacheManager extends AbstractTransactionSupportingCacheManager {
@@ -108,17 +109,13 @@ protected Collection<Cache> loadCaches()... | true |
Other | spring-projects | spring-framework | 119dfd9cf9215b2800d2d178913917103761fefd.json | Fix cache decoration
Prior to this commit, a cache that is added on-the-fly is not properly
decorated by the provided CacheManager implementation that supports
it (EhCache and JCache).
This commits adds an extra getMissingCache method to
the AbstractCacheManager that can be extended to provide a cache that
may exist ... | spring-context-support/src/test/java/org/springframework/cache/ehcache/EhCacheCacheManagerTests.java | @@ -0,0 +1,79 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ ... | true |
Other | spring-projects | spring-framework | 119dfd9cf9215b2800d2d178913917103761fefd.json | Fix cache decoration
Prior to this commit, a cache that is added on-the-fly is not properly
decorated by the provided CacheManager implementation that supports
it (EhCache and JCache).
This commits adds an extra getMissingCache method to
the AbstractCacheManager that can be extended to provide a cache that
may exist ... | spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheCacheManagerTests.java | @@ -0,0 +1,106 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+... | true |
Other | spring-projects | spring-framework | 119dfd9cf9215b2800d2d178913917103761fefd.json | Fix cache decoration
Prior to this commit, a cache that is added on-the-fly is not properly
decorated by the provided CacheManager implementation that supports
it (EhCache and JCache).
This commits adds an extra getMissingCache method to
the AbstractCacheManager that can be extended to provide a cache that
may exist ... | spring-context-support/src/test/java/org/springframework/cache/transaction/AbstractTransactionSupportingCacheManagerTests.java | @@ -0,0 +1,115 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+... | true |
Other | spring-projects | spring-framework | 119dfd9cf9215b2800d2d178913917103761fefd.json | Fix cache decoration
Prior to this commit, a cache that is added on-the-fly is not properly
decorated by the provided CacheManager implementation that supports
it (EhCache and JCache).
This commits adds an extra getMissingCache method to
the AbstractCacheManager that can be extended to provide a cache that
may exist ... | spring-context/src/main/java/org/springframework/cache/support/AbstractCacheManager.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
*
* @author Costin Leau
... | true |
Other | spring-projects | spring-framework | 5fe8f52c02e56f8704e5c00a8d17e4f32b5176c3.json | Add support for @Priority
This commit adds support for @Priority to filter multiple candidates
for autowiring. When multiple candidates are available for a given
bean, the bean annotated with @Primary is used. If none exists, the
one with the higher value for the @Priority annotation is used. If
two beans have the sam... | build.gradle | @@ -280,7 +280,8 @@ project("spring-beans") {
optional("javax.inject:javax.inject:1")
optional("javax.el:javax.el-api:2.2.4")
testCompile("log4j:log4j:1.2.17")
- }
+ testCompile("org.apache.tomcat.embed:tomcat-embed-core:8.0.0-RC10")
+ }
}
project("spring-beans-groovy") { | true |
Other | spring-projects | spring-framework | 5fe8f52c02e56f8704e5c00a8d17e4f32b5176c3.json | Add support for @Priority
This commit adds support for @Priority to filter multiple candidates
for autowiring. When multiple candidates are available for a given
bean, the bean annotated with @Primary is used. If none exists, the
one with the higher value for the @Priority annotation is used. If
two beans have the sam... | spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java | @@ -93,6 +93,7 @@
* @author Costin Leau
* @author Chris Beams
* @author Phillip Webb
+ * @author Stephane Nicoll
* @since 16 April 2001
* @see StaticListableBeanFactory
* @see PropertiesBeanDefinitionReader
@@ -296,21 +297,19 @@ public <T> T getBean(Class<T> requiredType) throws BeansException {
return ... | true |
Other | spring-projects | spring-framework | 5fe8f52c02e56f8704e5c00a8d17e4f32b5176c3.json | Add support for @Priority
This commit adds support for @Priority to filter multiple candidates
for autowiring. When multiple candidates are available for a given
bean, the bean annotated with @Primary is used. If none exists, the
one with the higher value for the @Priority annotation is used. If
two beans have the sam... | spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java | @@ -32,6 +32,7 @@
import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import javax.annotation.Priority;
import javax.security.auth.Subject;
import org.apache.commons.logging.Log;
@@ -99,6 +100,7 @@
* @author Sam Brannen
* @author Chris Beams
* @author Phillip Webb
+ * @author Stephane... | true |
Other | spring-projects | spring-framework | 3c28301ded03b7163c8450cb3cc4787cb79a8595.json | Provide common cache config
Prior to this commit, common cache operation settings had to be
repeated for every operation: cache name(s), custom cache manager
and custom key manager.
This commit introduces the @CacheConfig annotation to bet set at
class-level (either directly or as a meta-annotation). As the cache
nam... | spring-context/src/main/java/org/springframework/cache/annotation/AnnotationCacheOperationSource.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
package org.springframework.... | true |
Other | spring-projects | spring-framework | 3c28301ded03b7163c8450cb3cc4787cb79a8595.json | Provide common cache config
Prior to this commit, common cache operation settings had to be
repeated for every operation: cache name(s), custom cache manager
and custom key manager.
This commit introduces the @CacheConfig annotation to bet set at
class-level (either directly or as a meta-annotation). As the cache
nam... | spring-context/src/main/java/org/springframework/cache/annotation/CacheAnnotationParser.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
package org.springframewor... | true |
Other | spring-projects | spring-framework | 3c28301ded03b7163c8450cb3cc4787cb79a8595.json | Provide common cache config
Prior to this commit, common cache operation settings had to be
repeated for every operation: cache name(s), custom cache manager
and custom key manager.
This commit introduces the @CacheConfig annotation to bet set at
class-level (either directly or as a meta-annotation). As the cache
nam... | spring-context/src/main/java/org/springframework/cache/annotation/CacheConfig.java | @@ -0,0 +1,62 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ ... | true |
Other | spring-projects | spring-framework | 3c28301ded03b7163c8450cb3cc4787cb79a8595.json | Provide common cache config
Prior to this commit, common cache operation settings had to be
repeated for every operation: cache name(s), custom cache manager
and custom key manager.
This commit introduces the @CacheConfig annotation to bet set at
class-level (either directly or as a meta-annotation). As the cache
nam... | spring-context/src/main/java/org/springframework/cache/annotation/CacheEvict.java | @@ -30,6 +30,7 @@
* @author Costin Leau
* @author Stephane Nicoll
* @since 3.1
+ * @see CacheConfig
*/
@Target({ElementType.METHOD, ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@@ -42,7 +43,7 @@
* <p>May be used to determine the target cache (or caches), matching the qualifier
* value (or the ... | true |
Other | spring-projects | spring-framework | 3c28301ded03b7163c8450cb3cc4787cb79a8595.json | Provide common cache config
Prior to this commit, common cache operation settings had to be
repeated for every operation: cache name(s), custom cache manager
and custom key manager.
This commit introduces the @CacheConfig annotation to bet set at
class-level (either directly or as a meta-annotation). As the cache
nam... | spring-context/src/main/java/org/springframework/cache/annotation/CachePut.java | @@ -35,6 +35,7 @@
* @author Phillip Webb
* @author Stephane Nicoll
* @since 3.1
+ * @see CacheConfig
*/
@Target({ ElementType.METHOD, ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
@@ -47,7 +48,7 @@
* <p>May be used to determine the target cache (or caches), matching the
* qualifier value (or t... | true |
Other | spring-projects | spring-framework | 3c28301ded03b7163c8450cb3cc4787cb79a8595.json | Provide common cache config
Prior to this commit, common cache operation settings had to be
repeated for every operation: cache name(s), custom cache manager
and custom key manager.
This commit introduces the @CacheConfig annotation to bet set at
class-level (either directly or as a meta-annotation). As the cache
nam... | spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java | @@ -33,6 +33,7 @@
* @author Phillip Webb
* @author Stephane Nicoll
* @since 3.1
+ * @see CacheConfig
*/
@Target({ElementType.METHOD, ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@@ -45,7 +46,7 @@
* <p>May be used to determine the target cache (or caches), matching the
* qualifier value (or the... | true |
Other | spring-projects | spring-framework | 3c28301ded03b7163c8450cb3cc4787cb79a8595.json | Provide common cache config
Prior to this commit, common cache operation settings had to be
repeated for every operation: cache name(s), custom cache manager
and custom key manager.
This commit introduces the @CacheConfig annotation to bet set at
class-level (either directly or as a meta-annotation). As the cache
nam... | spring-context/src/main/java/org/springframework/cache/annotation/SpringCacheAnnotationParser.java | @@ -19,13 +19,15 @@
import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
import org.springframework.cache.interceptor.CacheEvictOperation;
import org.springframe... | true |
Other | spring-projects | spring-framework | 3c28301ded03b7163c8450cb3cc4787cb79a8595.json | Provide common cache config
Prior to this commit, common cache operation settings had to be
repeated for every operation: cache name(s), custom cache manager
and custom key manager.
This commit introduces the @CacheConfig annotation to bet set at
class-level (either directly or as a meta-annotation). As the cache
nam... | spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperation.java | @@ -73,10 +73,10 @@ public void setCacheName(String cacheName) {
}
public void setCacheNames(String[] cacheNames) {
- Assert.notEmpty(cacheNames);
this.cacheNames = new LinkedHashSet<String>(cacheNames.length);
- for (String string : cacheNames) {
- this.cacheNames.add(string);
+ for (String cacheName : c... | true |
Other | spring-projects | spring-framework | 3c28301ded03b7163c8450cb3cc4787cb79a8595.json | Provide common cache config
Prior to this commit, common cache operation settings had to be
repeated for every operation: cache name(s), custom cache manager
and custom key manager.
This commit introduces the @CacheConfig annotation to bet set at
class-level (either directly or as a meta-annotation). As the cache
nam... | spring-context/src/test/java/org/springframework/cache/annotation/AnnotationCacheOperationSourceTests.java | @@ -26,7 +26,9 @@
import java.util.Collection;
import java.util.Iterator;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.ExpectedException;
import org.springframework.cache.interceptor.CacheEvictOperation;
import org.springframework.cache.interceptor.CacheOperation;
import org.springfram... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-aspects/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java | @@ -117,6 +117,18 @@ public Object unknownCustomKeyGenerator(Object arg1) {
return counter.getAndIncrement();
}
+ @Override
+ @Cacheable(value = "default", cacheManager = "customCacheManager")
+ public Object customCacheManager(Object arg1) {
+ return counter.getAndIncrement();
+ }
+
+ @Override
+ @Cacheable(va... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-aspects/src/test/java/org/springframework/cache/config/CacheableService.java | @@ -62,6 +62,10 @@
T unknownCustomKeyGenerator(Object arg1);
+ T customCacheManager(Object arg1);
+
+ T unknownCustomCacheManager(Object arg1);
+
T throwChecked(Object arg1) throws Exception;
T throwUnchecked(Object arg1); | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-aspects/src/test/java/org/springframework/cache/config/DefaultCacheableService.java | @@ -121,6 +121,18 @@ public Long unknownCustomKeyGenerator(Object arg1) {
return counter.getAndIncrement();
}
+ @Override
+ @Cacheable(value = "default", cacheManager = "customCacheManager")
+ public Long customCacheManager(Object arg1) {
+ return counter.getAndIncrement();
+ }
+
+ @Override
+ @Cacheable(value ... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-aspects/src/test/java/org/springframework/cache/config/annotation-cache-aspectj.xml | @@ -1,13 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:cache="http://www.springframework.org/schema/cache"
- xmlns:context="http://www.sp... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-context/src/main/java/org/springframework/cache/annotation/CacheEvict.java | @@ -28,6 +28,7 @@
* a cache invalidate operation.
*
* @author Costin Leau
+ * @author Stephane Nicoll
* @since 3.1
*/
@Target({ElementType.METHOD, ElementType.TYPE})
@@ -56,6 +57,11 @@
*/
String keyGenerator() default "";
+ /**
+ * The bean name of the custom {@link org.springframework.cache.CacheMan... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-context/src/main/java/org/springframework/cache/annotation/CachePut.java | @@ -33,6 +33,7 @@
*
* @author Costin Leau
* @author Phillip Webb
+ * @author Stephane Nicoll
* @since 3.1
*/
@Target({ ElementType.METHOD, ElementType.TYPE })
@@ -61,6 +62,11 @@
*/
String keyGenerator() default "";
+ /**
+ * The bean name of the custom {@link org.springframework.cache.CacheManager} t... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-context/src/main/java/org/springframework/cache/annotation/Cacheable.java | @@ -31,6 +31,7 @@
*
* @author Costin Leau
* @author Phillip Webb
+ * @author Stephane Nicoll
* @since 3.1
*/
@Target({ElementType.METHOD, ElementType.TYPE})
@@ -59,6 +60,11 @@
*/
String keyGenerator() default "";
+ /**
+ * The bean name of the custom {@link org.springframework.cache.CacheManager} to ... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-context/src/main/java/org/springframework/cache/annotation/SpringCacheAnnotationParser.java | @@ -37,6 +37,7 @@
* @author Juergen Hoeller
* @author Chris Beams
* @author Phillip Webb
+ * @author Stephane Nicoll
* @since 3.1
*/
@SuppressWarnings("serial")
@@ -88,6 +89,7 @@ CacheableOperation parseCacheableAnnotation(AnnotatedElement ae, Cacheable cachi
cuo.setUnless(caching.unless());
cuo.setKey... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java | @@ -45,6 +45,7 @@
*
* @author Costin Leau
* @author Phillip Webb
+ * @author Stephane Nicoll
*/
class CacheAdviceParser extends AbstractSingleBeanDefinitionParser {
@@ -186,6 +187,8 @@ private static class Props {
private String keyGenerator;
+ private String cacheManager;
+
private String conditi... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java | @@ -88,14 +88,15 @@ public abstract class CacheAspectSupport implements InitializingBean, Applicatio
/**
- * Set the CacheManager that this cache aspect should delegate to.
+ * Set the default {@link CacheManager} that this cache aspect should delegate to
+ * if no specific cache manager has been set for the o... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-context/src/main/java/org/springframework/cache/interceptor/CacheOperation.java | @@ -26,6 +26,7 @@
* Base class for cache operations.
*
* @author Costin Leau
+ * @author Stephane Nicoll
*/
public abstract class CacheOperation {
@@ -37,6 +38,8 @@ public abstract class CacheOperation {
private String keyGenerator = "";
+ private String cacheManager = "";
+
private String name = "";... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-context/src/main/resources/org/springframework/cache/config/spring-cache-4.0.xsd | @@ -185,6 +185,12 @@
The name of the KeyGenerator bean responsible to compute the key, mutually exclusive with the key parameter.]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="cache-manager" type="xsd:string" use="optional">
+ <xsd:annotation>
+ <xsd:docu... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-context/src/test/java/org/springframework/cache/annotation/AnnotationCacheOperationSourceTests.java | @@ -34,6 +34,7 @@
/**
* @author Costin Leau
+ * @author Stephane Nicoll
*/
public class AnnotationCacheOperationSourceTests {
@@ -116,6 +117,22 @@ public void testKeyAndKeyGeneratorCannotBeSetTogether() {
}
}
+ @Test
+ public void testCustomCacheManager() {
+ Collection<CacheOperation> ops = getOps("c... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-context/src/test/java/org/springframework/cache/config/AbstractAnnotationTests.java | @@ -36,6 +36,7 @@
* @author Costin Leau
* @author Chris Beams
* @author Phillip Webb
+ * @author Stephane Nicoll
*/
public abstract class AbstractAnnotationTests {
@@ -47,6 +48,8 @@ public abstract class AbstractAnnotationTests {
protected CacheManager cm;
+ protected CacheManager customCm;
+
/** @re... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-context/src/test/java/org/springframework/cache/config/AnnotatedClassCacheableService.java | @@ -26,6 +26,7 @@
/**
* @author Costin Leau
* @author Phillip Webb
+ * @author Stephane Nicoll
*/
@Cacheable("default")
public class AnnotatedClassCacheableService implements CacheableService<Object> {
@@ -119,6 +120,18 @@ public Object unknownCustomKeyGenerator(Object arg1) {
return counter.getAndIncrement... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-context/src/test/java/org/springframework/cache/config/CacheableService.java | @@ -21,6 +21,7 @@
*
* @author Costin Leau
* @author Phillip Webb
+ * @author Stephane Nicoll
*/
public interface CacheableService<T> {
@@ -62,6 +63,10 @@
T unknownCustomKeyGenerator(Object arg1);
+ T customCacheManager(Object arg1);
+
+ T unknownCustomCacheManager(Object arg1);
+
T throwChecked(Objec... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-context/src/test/java/org/springframework/cache/config/DefaultCacheableService.java | @@ -28,6 +28,7 @@
*
* @author Costin Leau
* @author Phillip Webb
+ * @author Stephane Nicoll
*/
public class DefaultCacheableService implements CacheableService<Long> {
@@ -121,6 +122,18 @@ public Long unknownCustomKeyGenerator(Object arg1) {
return counter.getAndIncrement();
}
+ @Override
+ @Cacheabl... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-context/src/test/java/org/springframework/cache/config/EnableCachingTests.java | @@ -40,6 +40,7 @@
* Integration tests for @EnableCaching and its related @Configuration classes.
*
* @author Chris Beams
+ * @author Stephane Nicoll
*/
public class EnableCachingTests extends AbstractAnnotationTests {
@@ -145,6 +146,13 @@ public KeyGenerator keyGenerator() {
public KeyGenerator customKeyG... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheConfig.xml | @@ -2,27 +2,27 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/be... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-context/src/test/resources/org/springframework/cache/config/annotationDrivenCacheNamespace.xml | @@ -3,16 +3,16 @@
xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:cache="http://www.springframework.org/schema/cache"
xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/... | true |
Other | spring-projects | spring-framework | f06cad91c03c395177ee139539ac1dabfd4855da.json | Add custom cache manager per cache operation
It is now possible to specify the CacheManager to use per operation.
The related cache annotation now has an extra attribute that defines
the name of the CacheManager bean to use. The cache manager that
was previously used is therefore a 'default' cache manager (i.e. the
o... | spring-context/src/test/resources/org/springframework/cache/config/cache-advice.xml | @@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:aop="http://www.springframework.org/schema/aop"
- xmlns:cache="http://www.springframework.org/schema/cache"
- xmlns:p="http:... | true |
Other | spring-projects | spring-framework | 906321dcdd0939824cfc9b31fb769defc150756e.json | Fix broken tests in QuartzSupportTests
This commit ensures that QuartzSupportTests and its related
configuration are compatible with Quartz 2.1.7.
- Test jobs are now durable where required.
- Deleted legacy tests that attempted to use a Runnable instead of a
Job as a jobClass for a JobDetail.
- Replaced quar... | spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java | @@ -18,9 +18,11 @@
import java.util.HashMap;
import java.util.Map;
+
import javax.sql.DataSource;
import org.junit.Test;
+
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
@@ -56,7 +58,7 @@
public class QuartzSupportTests {
@Test
- public void testSc... | true |
Other | spring-projects | spring-framework | 906321dcdd0939824cfc9b31fb769defc150756e.json | Fix broken tests in QuartzSupportTests
This commit ensures that QuartzSupportTests and its related
configuration are compatible with Quartz 2.1.7.
- Test jobs are now durable where required.
- Deleted legacy tests that attempted to use a Runnable instead of a
Job as a jobClass for a JobDetail.
- Replaced quar... | spring-context-support/src/test/resources/org/springframework/scheduling/quartz/databasePersistence.xml | @@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jdbc="http://www.springframework.org/schema/jdbc"
- xsi:schemaLocation="http://www.springframework.org/schema/jdbc http://www.springframewor... | true |
Other | spring-projects | spring-framework | 906321dcdd0939824cfc9b31fb769defc150756e.json | Fix broken tests in QuartzSupportTests
This commit ensures that QuartzSupportTests and its related
configuration are compatible with Quartz 2.1.7.
- Test jobs are now durable where required.
- Deleted legacy tests that attempted to use a Runnable instead of a
Job as a jobClass for a JobDetail.
- Replaced quar... | spring-context-support/src/test/resources/org/springframework/scheduling/quartz/quartz-hsql.sql | @@ -1,47 +1,46 @@
+--
+-- In your Quartz properties file, you'll need to set
+-- org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.HSQLDBDelegate
+--
+-- Column lenghts are only suggestions. For names, groups, use at least 40 chars.
+-- for blobs (VARBINARY) use a size that is sure to meet the ne... | true |
Other | spring-projects | spring-framework | 5d049e0de898a12386282fa4f8df7ca1454923e9.json | Introduce execute(DataSource) in ResrcDbPopulator
To simplify common use cases, this commit introduces a new
execute(DataSource) method in ResourceDatabasePopulator that complements
the existing populate(Connection) method.
Issue: SPR-11629 | spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java | @@ -16,22 +16,28 @@
package org.springframework.jdbc.datasource.init;
+
import java.sql.Connection;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import javax.sql.DataSource;
+
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.EncodedReso... | true |
Other | spring-projects | spring-framework | 5d049e0de898a12386282fa4f8df7ca1454923e9.json | Introduce execute(DataSource) in ResrcDbPopulator
To simplify common use cases, this commit introduces a new
execute(DataSource) method in ResourceDatabasePopulator that complements
the existing populate(Connection) method.
Issue: SPR-11629 | spring-test/src/main/java/org/springframework/test/context/junit4/AbstractTransactionalJUnit4SpringContextTests.java | @@ -23,8 +23,6 @@
import org.springframework.core.io.Resource;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.init.DatabasePopulator;
-import org.springframework.jdbc.datasource.init.DatabasePopulatorUtils;
import or... | true |
Other | spring-projects | spring-framework | 5d049e0de898a12386282fa4f8df7ca1454923e9.json | Introduce execute(DataSource) in ResrcDbPopulator
To simplify common use cases, this commit introduces a new
execute(DataSource) method in ResourceDatabasePopulator that complements
the existing populate(Connection) method.
Issue: SPR-11629 | spring-test/src/main/java/org/springframework/test/context/testng/AbstractTransactionalTestNGSpringContextTests.java | @@ -23,8 +23,6 @@
import org.springframework.core.io.Resource;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.init.DatabasePopulator;
-import org.springframework.jdbc.datasource.init.DatabasePopulatorUtils;
import or... | true |
Other | spring-projects | spring-framework | 5d049e0de898a12386282fa4f8df7ca1454923e9.json | Introduce execute(DataSource) in ResrcDbPopulator
To simplify common use cases, this commit introduces a new
execute(DataSource) method in ResourceDatabasePopulator that complements
the existing populate(Connection) method.
Issue: SPR-11629 | spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java | @@ -29,8 +29,6 @@
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.SqlParameterValue;
-import org.springframework.jdbc.datasource.init.DatabasePopulator;
-import org.springframework.jdbc.datasource.init.DatabasePopulatorUtils;... | true |
Other | spring-projects | spring-framework | c38600762dd17c5b4f1dabeb42c2dff77b5a66d1.json | Reinject Servlet mocks between TestNG test methods
Prior to this commit, if multiple test methods were executed in a
subclass of AbstractTestNGSpringContextTests annotated with
@WebAppConfiguration, then injected Servlet API mocks would only
reference the mocks created for the first test method. Subsequent test
method... | spring-test/src/main/java/org/springframework/test/context/web/ServletTestExecutionListener.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
import org.springframework.t... | true |
Other | spring-projects | spring-framework | c38600762dd17c5b4f1dabeb42c2dff77b5a66d1.json | Reinject Servlet mocks between TestNG test methods
Prior to this commit, if multiple test methods were executed in a
subclass of AbstractTestNGSpringContextTests annotated with
@WebAppConfiguration, then injected Servlet API mocks would only
reference the mocks created for the first test method. Subsequent test
method... | spring-test/src/test/java/org/springframework/test/context/testng/web/ServletTestExecutionListenerTestNGIntegrationTests.java | @@ -0,0 +1,78 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ ... | true |
Other | spring-projects | spring-framework | c38600762dd17c5b4f1dabeb42c2dff77b5a66d1.json | Reinject Servlet mocks between TestNG test methods
Prior to this commit, if multiple test methods were executed in a
subclass of AbstractTestNGSpringContextTests annotated with
@WebAppConfiguration, then injected Servlet API mocks would only
reference the mocks created for the first test method. Subsequent test
method... | spring-test/src/test/java/org/springframework/test/context/web/ServletTestExecutionListenerJUnitIntegrationTests.java | @@ -0,0 +1,78 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ ... | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.