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 | 76beb36e4bd1162bed6ff91f4ba5df6f9e47b528.json | Remove duplicate separators when combining paths
Prior to this commit, AntPathMatcher would not correctly combine a path
that ends with a separator with a path that starts with a separator.
For example, `/foo/` + `/bar` combined into `/foo//bar`.
Specifically, this commit:
- Removes the duplicated separator in comb... | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfo.java | @@ -326,12 +326,24 @@ public int hashCode() {
public String toString() {
StringBuilder builder = new StringBuilder("{");
builder.append(this.patternsCondition);
- builder.append(",methods=").append(this.methodsCondition);
- builder.append(",params=").append(this.paramsCondition);
- builder.append(",headers="... | true |
Other | spring-projects | spring-framework | a36319e91ccf4624e2dcdba529496f0dc1633920.json | Introduce Marshalling MessageConverter
This commit introduces a messaging.converter.MessageConverter that
marshals to/from XML using the abstractions provided in the OXM module.
Issue: SPR-12726 | build.gradle | @@ -486,6 +486,7 @@ project("spring-messaging") {
compile(project(":spring-beans"))
compile(project(":spring-core"))
compile(project(":spring-context"))
+ optional(project(":spring-oxm"))
optional("io.projectreactor:reactor-core:${reactorVersion}")
optional("io.projectreactor:reactor-net:${reactorVersio... | true |
Other | spring-projects | spring-framework | a36319e91ccf4624e2dcdba529496f0dc1633920.json | Introduce Marshalling MessageConverter
This commit introduces a messaging.converter.MessageConverter that
marshals to/from XML using the abstractions provided in the OXM module.
Issue: SPR-12726 | spring-messaging/src/main/java/org/springframework/messaging/converter/MarshallingMessageConverter.java | @@ -0,0 +1,209 @@
+/*
+ * Copyright 2002-2015 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 | a36319e91ccf4624e2dcdba529496f0dc1633920.json | Introduce Marshalling MessageConverter
This commit introduces a messaging.converter.MessageConverter that
marshals to/from XML using the abstractions provided in the OXM module.
Issue: SPR-12726 | spring-messaging/src/test/java/org/springframework/messaging/converter/MarshallingMessageConverterTests.java | @@ -0,0 +1,101 @@
+/*
+ * Copyright 2002-2015 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 | db80378dbef4bba302a3f1248f7315ae1ef8f614.json | Avoid infinite loop in PatternMatchUtils
Issue: SPR-12971 | spring-core/src/main/java/org/springframework/util/PatternMatchUtils.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -50,6 +50,9 @@ public static boolean simpleM... | true |
Other | spring-projects | spring-framework | db80378dbef4bba302a3f1248f7315ae1ef8f614.json | Avoid infinite loop in PatternMatchUtils
Issue: SPR-12971 | spring-core/src/test/java/org/springframework/util/PatternMatchUtilsTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2015 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,31 +16,37 @@
package org.springframew... | true |
Other | spring-projects | spring-framework | a89c0ecf5de18b5e45b2b55e9f8680a126a09e1b.json | Fix broken cross-references in reference manual | src/asciidoc/core-aop.adoc | @@ -185,13 +185,13 @@ style.
Spring AOP defaults to using standard JDK __dynamic proxies__ for AOP proxies. This
enables any interface (or set of interfaces) to be proxied.
-Spring AOP can also use CGLIB proxies. This is necessary to proxy classes, rather than
+Spring AOP can also use CGLIB proxies. This is necessa... | true |
Other | spring-projects | spring-framework | a89c0ecf5de18b5e45b2b55e9f8680a126a09e1b.json | Fix broken cross-references in reference manual | src/asciidoc/core-beans.adoc | @@ -1591,7 +1591,7 @@ The above configuration is equivalent to the following Java code:
The p-namespace enables you to use the `bean` element's attributes, instead of nested
`<property/>` elements, to describe your property values and/or collaborating beans.
-Spring supports extensible configuration formats <<xsd-c... | true |
Other | spring-projects | spring-framework | a89c0ecf5de18b5e45b2b55e9f8680a126a09e1b.json | Fix broken cross-references in reference manual | src/asciidoc/data-access.adoc | @@ -306,7 +306,7 @@ infrastructure.
[NOTE]
====
The above definition of the `dataSource` bean uses the `<jndi-lookup/>` tag from the
-`jee` namespace. For more information on schema-based configuration, see <<xsd-config>>,
+`jee` namespace. For more information on schema-based configuration, see <<xsd-configuration>... | true |
Other | spring-projects | spring-framework | a89c0ecf5de18b5e45b2b55e9f8680a126a09e1b.json | Fix broken cross-references in reference manual | src/asciidoc/integration.adoc | @@ -6172,26 +6172,27 @@ Spring distribution. In all likelihood, you shouldn't ever need to implement you
This implementation does not reuse any threads, rather it starts up a new thread
for each invocation. However, it does support a concurrency limit which will block
any invocations that are over the limit un... | true |
Other | spring-projects | spring-framework | a89c0ecf5de18b5e45b2b55e9f8680a126a09e1b.json | Fix broken cross-references in reference manual | src/asciidoc/web-websocket.adoc | @@ -263,7 +263,7 @@ XML configuration equivalent:
----
The above is for use in Spring MVC applications and should be included in the
-configuration of a <<mvc-serlvet,DispatcherServlet>>. However, Spring's WebSocket
+configuration of a <<mvc-servlet,DispatcherServlet>>. However, Spring's WebSocket
support does not... | true |
Other | spring-projects | spring-framework | 7a690df92522a2e8bf0aad1b27c6238fbe489339.json | Remove trailing whitespace from Java source code | spring-context/src/test/java/org/springframework/context/annotation/AutoProxyLazyInitTests.java | @@ -41,7 +41,7 @@ public void withStaticBeanMethod() {
ApplicationContext ctx = new AnnotationConfigApplicationContext(ConfigWithStatic.class);
MyBean bean = ctx.getBean("myBean", MyBean.class);
-
+
assertFalse(MyBeanImpl.initialized);
bean.doIt();
assertTrue(MyBeanImpl.initialized); | true |
Other | spring-projects | spring-framework | 7a690df92522a2e8bf0aad1b27c6238fbe489339.json | Remove trailing whitespace from Java source code | spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java | @@ -67,7 +67,7 @@
* <li>Searching on methods in interfaces, if the annotated element is a method
* <li>Searching on methods in superclasses, if the annotated element is a method
* </ul>
- *
+ *
* <h3>Support for {@code @Inherited}</h3>
* <p>Methods following <em>get semantics</em> will honor the contract of
... | true |
Other | spring-projects | spring-framework | 7a690df92522a2e8bf0aad1b27c6238fbe489339.json | Remove trailing whitespace from Java source code | spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java | @@ -56,7 +56,7 @@
/**
* Unit tests for the {@link GenericConversionService}.
*
- * <p>For tests involving the {@link DefaultConversionService}, see
+ * <p>For tests involving the {@link DefaultConversionService}, see
* {@link DefaultConversionServiceTests}.
*
* @author Keith Donald | true |
Other | spring-projects | spring-framework | 7a690df92522a2e8bf0aad1b27c6238fbe489339.json | Remove trailing whitespace from Java source code | spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java | @@ -320,12 +320,12 @@ public void cancelDoesNotNotifyCallbacksOnSetException() {
private static class InterruptableSettableListenableFuture extends SettableListenableFuture<String> {
private boolean interrupted = false;
-
+
@Override
protected void interruptTask() {
interrupted = true;
}
-
+
bo... | true |
Other | spring-projects | spring-framework | 7a690df92522a2e8bf0aad1b27c6238fbe489339.json | Remove trailing whitespace from Java source code | spring-expression/src/main/java/org/springframework/expression/spel/CodeFlow.java | @@ -222,7 +222,7 @@ public static void insertUnboxNumberInsns(MethodVisitor mv, char targetDescripto
mv.visitTypeInsn(CHECKCAST, "java/lang/Number");
}
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Number", "doubleValue", "()D", false);
- break;
+ break;
case 'F':
if (stackDescriptor.eq... | true |
Other | spring-projects | spring-framework | 7a690df92522a2e8bf0aad1b27c6238fbe489339.json | Remove trailing whitespace from Java source code | spring-expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java | @@ -628,7 +628,7 @@ else if (peekToken(TokenKind.COLON,true)) {
// '}' - end of list
// ',' - more expressions in this list
// ':' - this is a map!
-
+
if (peekToken(TokenKind.RCURLY)) { // list with one item in it
List<SpelNodeImpl> listElements = new ArrayList<SpelNodeImpl>();
listElements.... | true |
Other | spring-projects | spring-framework | 7a690df92522a2e8bf0aad1b27c6238fbe489339.json | Remove trailing whitespace from Java source code | spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java | @@ -81,7 +81,7 @@ private Class<?> discoverPublicClass(Method method, Class<?> clazz) {
clazz.getDeclaredMethod(method.getName(), method.getParameterTypes());
return clazz;
} catch (NoSuchMethodException nsme) {
-
+
}
}
Class<?>[] intfaces = clazz.getInterfaces(); | true |
Other | spring-projects | spring-framework | 7a690df92522a2e8bf0aad1b27c6238fbe489339.json | Remove trailing whitespace from Java source code | spring-expression/src/test/java/org/springframework/expression/spel/MapTests.java | @@ -136,7 +136,7 @@ public void testInlineMapWriting() {
// list should be unmodifiable
evaluate("{a:1, b:2, c:3, d:4, e:5}[a]=6", "[a:1,b: 2,c: 3,d: 4,e: 5]", unmodifiableClass);
}
-
+
@Test
public void testMapKeysThatAreAlsoSpELKeywords() {
SpelExpressionParser parser = new SpelExpressionParser();
@@ ... | true |
Other | spring-projects | spring-framework | 7a690df92522a2e8bf0aad1b27c6238fbe489339.json | Remove trailing whitespace from Java source code | spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java | @@ -123,7 +123,7 @@ public void typeReference() throws Exception {
assertEquals(String.class,expression.getValue());
assertCanCompile(expression);
assertEquals(String.class,expression.getValue());
-
+
expression = parse("T(java.io.IOException)");
assertEquals(IOException.class,expression.getValue());
... | true |
Other | spring-projects | spring-framework | 7a690df92522a2e8bf0aad1b27c6238fbe489339.json | Remove trailing whitespace from Java source code | spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java | @@ -104,9 +104,9 @@ public class StompHeaders implements MultiValueMap<String, String>, Serializable
* Create a new instance to be populated with new header values.
*/
public StompHeaders() {
- this(new LinkedMultiValueMap<String, String>(4), false);
+ this(new LinkedMultiValueMap<String, String>(4), false);... | true |
Other | spring-projects | spring-framework | 7a690df92522a2e8bf0aad1b27c6238fbe489339.json | Remove trailing whitespace from Java source code | spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java | @@ -36,7 +36,7 @@
*
* <p>{@code @DirtiesContext} may be used as a class-level and method-level
* annotation within the same class or class hierarchy. In such scenarios, the
- * {@code ApplicationContext} will be marked as <em>dirty</em> before or
+ * {@code ApplicationContext} will be marked as <em>dirty</em> be... | true |
Other | spring-projects | spring-framework | 7a690df92522a2e8bf0aad1b27c6238fbe489339.json | Remove trailing whitespace from Java source code | spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTestNGTests.java | @@ -45,7 +45,7 @@
* JUnit 4 based integration test which verifies correct {@linkplain ContextCache
* application context caching} in conjunction with Spring's TestNG support
* and {@link DirtiesContext @DirtiesContext} at the class level.
- *
+ *
* <p>This class is a direct copy of {@link ClassLevelDirtiesCont... | true |
Other | spring-projects | spring-framework | 8b545f47bd625aba2cd7d4d4877498d5a28f4f28.json | Fix remote context handling in UrlTag
Prior to this change, the `UrlTag` would simply append the remote
context and the path value in case of a context relative URL.
The following code snippet would output "//foo":
```
<spring:url value="/foo" context="/" />
```
This change now removes trailing slashes in remote co... | spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -209,7 +209,12 @@ private String createUrl()... | true |
Other | spring-projects | spring-framework | 8b545f47bd625aba2cd7d4d4877498d5a28f4f28.json | Fix remote context handling in UrlTag
Prior to this change, the `UrlTag` would simply append the remote
context and the path value in case of a context relative URL.
The following code snippet would output "//foo":
```
<spring:url value="/foo" context="/" />
```
This change now removes trailing slashes in remote co... | spring-webmvc/src/test/java/org/springframework/web/servlet/tags/UrlTagTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -528,6 +528,20 @@ public void testCreateUrlR... | true |
Other | spring-projects | spring-framework | 69b0791926b44ba59b32077b8574fe7db92e895e.json | Favor local, composed annotations in the TCF
Prior to this commit, AnnotationAttributes retrieved from
MetaAnnotationUtils's AnnotationDescriptor could contain attributes
from the wrong annotation if an inherited annotation shadowed a locally
declared composed annotation.
This commit addresses this issue by invoking ... | spring-test/src/main/java/org/springframework/test/util/MetaAnnotationUtils.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -286,8 +286,8 @@ public AnnotationDescriptor... | true |
Other | spring-projects | spring-framework | 69b0791926b44ba59b32077b8574fe7db92e895e.json | Favor local, composed annotations in the TCF
Prior to this commit, AnnotationAttributes retrieved from
MetaAnnotationUtils's AnnotationDescriptor could contain attributes
from the wrong annotation if an inherited annotation shadowed a locally
declared composed annotation.
This commit addresses this issue by invoking ... | spring-test/src/test/java/org/springframework/test/util/MetaAnnotationUtilsTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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,8 @@
import org.springframework.s... | true |
Other | spring-projects | spring-framework | 666d1cecc8e1e347e69bc9b58333893dbe63c0be.json | Fix broken test in AnnotationUtilsTests | spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.java | @@ -85,7 +85,8 @@ public void findMethodAnnotationOnBridgeMethod() throws Exception {
assertNull(m.getAnnotation(Order.class));
assertNull(getAnnotation(m, Order.class));
assertNotNull(findAnnotation(m, Order.class));
- assertNull(m.getAnnotation(Transactional.class));
+ // TODO: actually found on OpenJDK 8 ... | false |
Other | spring-projects | spring-framework | 8a1f9f8aa37370868ea12be6e2feed8049f97e2b.json | Fix typo in exception message | spring-tx/src/main/java/org/springframework/transaction/event/ApplicationListenerMethodTransactionalAdapter.java | @@ -83,7 +83,7 @@ static TransactionalEventListener findAnnotation(Method method) {
TransactionalEventListener annotation = AnnotationUtils
.findAnnotation(method, TransactionalEventListener.class);
if (annotation == null) {
- throw new IllegalStateException("No TransactionalEventListener annotation found ... | false |
Other | spring-projects | spring-framework | 5cbe4b948d15fceb98ba2800d7309a632db163d6.json | Introduce dedicated 'cache' subpackage in the TCF
Since the ContextCache is now a published SPI, it and its collaborators
have been moved to a dedicated 'org.sfw.test.context.cache' subpackage.
Issue: SPR-12683 | spring-test/src/main/java/org/springframework/test/context/BootstrapUtils.java | @@ -40,7 +40,7 @@ abstract class BootstrapUtils {
private static final String DEFAULT_BOOTSTRAP_CONTEXT_CLASS_NAME = "org.springframework.test.context.support.DefaultBootstrapContext";
- private static final String DEFAULT_CACHE_AWARE_CONTEXT_LOADER_DELEGATE_CLASS_NAME = "org.springframework.test.context.support.... | true |
Other | spring-projects | spring-framework | 5cbe4b948d15fceb98ba2800d7309a632db163d6.json | Introduce dedicated 'cache' subpackage in the TCF
Since the ContextCache is now a published SPI, it and its collaborators
have been moved to a dedicated 'org.sfw.test.context.cache' subpackage.
Issue: SPR-12683 | spring-test/src/main/java/org/springframework/test/context/CacheAwareContextLoaderDelegate.java | @@ -23,8 +23,9 @@
/**
* A {@code CacheAwareContextLoaderDelegate} is responsible for {@linkplain
* #loadContext loading} and {@linkplain #closeContext closing} application
- * contexts, interacting transparently with a {@link ContextCache} behind
- * the scenes.
+ * contexts, interacting transparently with a
+ * {... | true |
Other | spring-projects | spring-framework | 5cbe4b948d15fceb98ba2800d7309a632db163d6.json | Introduce dedicated 'cache' subpackage in the TCF
Since the ContextCache is now a published SPI, it and its collaborators
have been moved to a dedicated 'org.sfw.test.context.cache' subpackage.
Issue: SPR-12683 | spring-test/src/main/java/org/springframework/test/context/cache/ContextCache.java | @@ -14,10 +14,11 @@
* limitations under the License.
*/
-package org.springframework.test.context;
+package org.springframework.test.context.cache;
import org.springframework.context.ApplicationContext;
import org.springframework.test.annotation.DirtiesContext.HierarchyMode;
+import org.springframework.test.c... | true |
Other | spring-projects | spring-framework | 5cbe4b948d15fceb98ba2800d7309a632db163d6.json | Introduce dedicated 'cache' subpackage in the TCF
Since the ContextCache is now a published SPI, it and its collaborators
have been moved to a dedicated 'org.sfw.test.context.cache' subpackage.
Issue: SPR-12683 | spring-test/src/main/java/org/springframework/test/context/cache/DefaultCacheAwareContextLoaderDelegate.java | @@ -14,15 +14,14 @@
* limitations under the License.
*/
-package org.springframework.test.context.support;
+package org.springframework.test.context.cache;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.context.ApplicationContext;
import org... | true |
Other | spring-projects | spring-framework | 5cbe4b948d15fceb98ba2800d7309a632db163d6.json | Introduce dedicated 'cache' subpackage in the TCF
Since the ContextCache is now a published SPI, it and its collaborators
have been moved to a dedicated 'org.sfw.test.context.cache' subpackage.
Issue: SPR-12683 | spring-test/src/main/java/org/springframework/test/context/cache/DefaultContextCache.java | @@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.test.context.support;
+package org.springframework.test.context.cache;
import java.util.ArrayList;
import java.util.HashSet;
@@ -31,7 +31,6 @@
import org.springframework.context.ConfigurableApplicationContext;
import org.spri... | true |
Other | spring-projects | spring-framework | 5cbe4b948d15fceb98ba2800d7309a632db163d6.json | Introduce dedicated 'cache' subpackage in the TCF
Since the ContextCache is now a published SPI, it and its collaborators
have been moved to a dedicated 'org.sfw.test.context.cache' subpackage.
Issue: SPR-12683 | spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java | @@ -38,7 +38,6 @@
import org.springframework.core.io.support.SpringFactoriesLoader;
import org.springframework.test.context.BootstrapContext;
import org.springframework.test.context.CacheAwareContextLoaderDelegate;
-import org.springframework.test.context.ContextCache;
import org.springframework.test.context.Contex... | true |
Other | spring-projects | spring-framework | 5cbe4b948d15fceb98ba2800d7309a632db163d6.json | Introduce dedicated 'cache' subpackage in the TCF
Since the ContextCache is now a published SPI, it and its collaborators
have been moved to a dedicated 'org.sfw.test.context.cache' subpackage.
Issue: SPR-12683 | spring-test/src/test/java/org/springframework/test/context/MergedContextConfigurationTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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,7 +33,8 @@
* Unit tests for {@link Mer... | true |
Other | spring-projects | spring-framework | 5cbe4b948d15fceb98ba2800d7309a632db163d6.json | Introduce dedicated 'cache' subpackage in the TCF
Since the ContextCache is now a published SPI, it and its collaborators
have been moved to a dedicated 'org.sfw.test.context.cache' subpackage.
Issue: SPR-12683 | spring-test/src/test/java/org/springframework/test/context/TestContextTestUtils.java | @@ -16,8 +16,9 @@
package org.springframework.test.context;
+import org.springframework.test.context.cache.ContextCache;
+import org.springframework.test.context.cache.DefaultCacheAwareContextLoaderDelegate;
import org.springframework.test.context.support.DefaultBootstrapContext;
-import org.springframework.test.... | true |
Other | spring-projects | spring-framework | 5cbe4b948d15fceb98ba2800d7309a632db163d6.json | Introduce dedicated 'cache' subpackage in the TCF
Since the ContextCache is now a published SPI, it and its collaborators
have been moved to a dedicated 'org.sfw.test.context.cache' subpackage.
Issue: SPR-12683 | spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTestNGTests.java | @@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.test.context;
+package org.springframework.test.context.cache;
import java.util.concurrent.atomic.AtomicInteger;
@@ -29,6 +29,8 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.test.... | true |
Other | spring-projects | spring-framework | 5cbe4b948d15fceb98ba2800d7309a632db163d6.json | Introduce dedicated 'cache' subpackage in the TCF
Since the ContextCache is now a published SPI, it and its collaborators
have been moved to a dedicated 'org.sfw.test.context.cache' subpackage.
Issue: SPR-12683 | spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTests.java | @@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.test.context;
+package org.springframework.test.context.cache;
import java.util.concurrent.atomic.AtomicInteger;
@@ -30,13 +30,15 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.tes... | true |
Other | spring-projects | spring-framework | 5cbe4b948d15fceb98ba2800d7309a632db163d6.json | Introduce dedicated 'cache' subpackage in the TCF
Since the ContextCache is now a published SPI, it and its collaborators
have been moved to a dedicated 'org.sfw.test.context.cache' subpackage.
Issue: SPR-12683 | spring-test/src/test/java/org/springframework/test/context/cache/ContextCacheTestUtils.java | @@ -14,9 +14,7 @@
* limitations under the License.
*/
-package org.springframework.test.context.support;
-
-import org.springframework.test.context.ContextCache;
+package org.springframework.test.context.cache;
import static org.junit.Assert.*;
| true |
Other | spring-projects | spring-framework | 5cbe4b948d15fceb98ba2800d7309a632db163d6.json | Introduce dedicated 'cache' subpackage in the TCF
Since the ContextCache is now a published SPI, it and its collaborators
have been moved to a dedicated 'org.sfw.test.context.cache' subpackage.
Issue: SPR-12683 | spring-test/src/test/java/org/springframework/test/context/cache/ContextCacheTests.java | @@ -14,20 +14,26 @@
* limitations under the License.
*/
-package org.springframework.test.context;
+package org.springframework.test.context.cache;
import org.junit.Before;
import org.junit.Test;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Configura... | true |
Other | spring-projects | spring-framework | 5cbe4b948d15fceb98ba2800d7309a632db163d6.json | Introduce dedicated 'cache' subpackage in the TCF
Since the ContextCache is now a published SPI, it and its collaborators
have been moved to a dedicated 'org.sfw.test.context.cache' subpackage.
Issue: SPR-12683 | spring-test/src/test/java/org/springframework/test/context/cache/SpringRunnerContextCacheTests.java | @@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.test.context;
+package org.springframework.test.context.cache;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -26,12 +26,14 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springfra... | true |
Other | spring-projects | spring-framework | 5cbe4b948d15fceb98ba2800d7309a632db163d6.json | Introduce dedicated 'cache' subpackage in the TCF
Since the ContextCache is now a published SPI, it and its collaborators
have been moved to a dedicated 'org.sfw.test.context.cache' subpackage.
Issue: SPR-12683 | spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4TestSuite.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 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,9 +19,8 @@
import org.junit.runner.RunW... | true |
Other | spring-projects | spring-framework | 72894b26c24b1ea31c6dda4634cfde67e7dc3050.json | Fix conversion of Message<?> payload for replies
If a custom MessageConverter is set, it is not used for replies defined
via the Message abstraction. This commit harmonizes the behaviour of the
`MessagingMessageConverter` so that the conversion of the payload can
be converted for both incoming and outgoing messages.
... | spring-jms/src/main/java/org/springframework/jms/listener/adapter/AbstractAdaptableMessageListener.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -396,6 +396,15 @@ private class MessagingMes... | true |
Other | spring-projects | spring-framework | 72894b26c24b1ea31c6dda4634cfde67e7dc3050.json | Fix conversion of Message<?> payload for replies
If a custom MessageConverter is set, it is not used for replies defined
via the Message abstraction. This commit harmonizes the behaviour of the
`MessagingMessageConverter` so that the conversion of the payload can
be converted for both incoming and outgoing messages.
... | spring-jms/src/main/java/org/springframework/jms/support/converter/MessagingMessageConverter.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -93,7 +93,7 @@ public javax.jms.Message toMe... | true |
Other | spring-projects | spring-framework | 72894b26c24b1ea31c6dda4634cfde67e7dc3050.json | Fix conversion of Message<?> payload for replies
If a custom MessageConverter is set, it is not used for replies defined
via the Message abstraction. This commit harmonizes the behaviour of the
`MessagingMessageConverter` so that the conversion of the payload can
be converted for both incoming and outgoing messages.
... | spring-jms/src/test/java/org/springframework/jms/listener/adapter/MessagingMessageListenerAdapterTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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,6 +17,8 @@
package org.springframework.... | true |
Other | spring-projects | spring-framework | 444b9032be7fa73d12103cbf351f82751b08a95b.json | Apply DestinationResolver to listener container
Previously, a custom `DestinationResolver` was not made available
to the underlying `MessageListener`: if a reply needs to be sent, the
default `DestinationResolver` was used.
This commit ensures that if a custom `DestinationResolver` has been set,
it is also configured... | spring-jms/src/main/java/org/springframework/jms/config/MethodJmsListenerEndpoint.java | @@ -27,6 +27,7 @@
import org.springframework.jms.listener.MessageListenerContainer;
import org.springframework.jms.listener.adapter.MessagingMessageListenerAdapter;
import org.springframework.jms.support.converter.MessageConverter;
+import org.springframework.jms.support.destination.DestinationResolver;
import org.... | true |
Other | spring-projects | spring-framework | 444b9032be7fa73d12103cbf351f82751b08a95b.json | Apply DestinationResolver to listener container
Previously, a custom `DestinationResolver` was not made available
to the underlying `MessageListener`: if a reply needs to be sent, the
default `DestinationResolver` was used.
This commit ensures that if a custom `DestinationResolver` has been set,
it is also configured... | spring-jms/src/main/java/org/springframework/jms/listener/MessageListenerContainer.java | @@ -18,6 +18,7 @@
import org.springframework.context.SmartLifecycle;
import org.springframework.jms.support.converter.MessageConverter;
+import org.springframework.jms.support.destination.DestinationResolver;
/**
* Internal abstraction used by the framework representing a message
@@ -41,6 +42,12 @@ public inte... | true |
Other | spring-projects | spring-framework | 444b9032be7fa73d12103cbf351f82751b08a95b.json | Apply DestinationResolver to listener container
Previously, a custom `DestinationResolver` was not made available
to the underlying `MessageListener`: if a reply needs to be sent, the
default `DestinationResolver` was used.
This commit ensures that if a custom `DestinationResolver` has been set,
it is also configured... | spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java | @@ -191,6 +191,14 @@ public MessageConverter getMessageConverter() {
return null;
}
+ @Override
+ public DestinationResolver getDestinationResolver() {
+ if (this.activationSpecFactory instanceof StandardJmsActivationSpecFactory) {
+ return ((StandardJmsActivationSpecFactory) this.activationSpecFactory).getDe... | true |
Other | spring-projects | spring-framework | 444b9032be7fa73d12103cbf351f82751b08a95b.json | Apply DestinationResolver to listener container
Previously, a custom `DestinationResolver` was not made available
to the underlying `MessageListener`: if a reply needs to be sent, the
default `DestinationResolver` was used.
This commit ensures that if a custom `DestinationResolver` has been set,
it is also configured... | spring-jms/src/main/java/org/springframework/jms/listener/endpoint/StandardJmsActivationSpecFactory.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -90,6 +90,12 @@ public void setDestinationRe... | true |
Other | spring-projects | spring-framework | 444b9032be7fa73d12103cbf351f82751b08a95b.json | Apply DestinationResolver to listener container
Previously, a custom `DestinationResolver` was not made available
to the underlying `MessageListener`: if a reply needs to be sent, the
default `DestinationResolver` was used.
This commit ensures that if a custom `DestinationResolver` has been set,
it is also configured... | spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java | @@ -186,6 +186,7 @@ private void setDefaultJcaConfig(DefaultJcaListenerContainerFactory factory) {
private void assertDefaultJcaConfig(JmsMessageEndpointManager container) {
assertEquals(messageConverter, container.getMessageConverter());
+ assertEquals(destinationResolver, container.getDestinationResolver());
... | true |
Other | spring-projects | spring-framework | 444b9032be7fa73d12103cbf351f82751b08a95b.json | Apply DestinationResolver to listener container
Previously, a custom `DestinationResolver` was not made available
to the underlying `MessageListener`: if a reply needs to be sent, the
default `DestinationResolver` was used.
This commit ensures that if a custom `DestinationResolver` has been set,
it is also configured... | spring-jms/src/test/java/org/springframework/jms/config/MessageListenerTestContainer.java | @@ -21,6 +21,7 @@
import org.springframework.jms.JmsException;
import org.springframework.jms.listener.MessageListenerContainer;
import org.springframework.jms.support.converter.MessageConverter;
+import org.springframework.jms.support.destination.DestinationResolver;
/**
* @author Stephane Nicoll
@@ -103,6 +10... | true |
Other | spring-projects | spring-framework | 444b9032be7fa73d12103cbf351f82751b08a95b.json | Apply DestinationResolver to listener container
Previously, a custom `DestinationResolver` was not made available
to the underlying `MessageListener`: if a reply needs to be sent, the
default `DestinationResolver` was used.
This commit ensures that if a custom `DestinationResolver` has been set,
it is also configured... | spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java | @@ -36,6 +36,7 @@
import org.junit.rules.ExpectedException;
import org.junit.rules.TestName;
+import org.springframework.beans.DirectFieldAccessor;
import org.springframework.beans.factory.support.StaticListableBeanFactory;
import org.springframework.jms.StubTextMessage;
import org.springframework.jms.listener.D... | true |
Other | spring-projects | spring-framework | 444b9032be7fa73d12103cbf351f82751b08a95b.json | Apply DestinationResolver to listener container
Previously, a custom `DestinationResolver` was not made available
to the underlying `MessageListener`: if a reply needs to be sent, the
default `DestinationResolver` was used.
This commit ensures that if a custom `DestinationResolver` has been set,
it is also configured... | spring-jms/src/test/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManagerTests.java | @@ -82,4 +82,10 @@ public void getMessageConverterNoConfig() {
JmsMessageEndpointManager endpoint = new JmsMessageEndpointManager();
assertNull(endpoint.getMessageConverter());
}
+
+ @Test
+ public void getDestinationResolverNoConfig() {
+ JmsMessageEndpointManager endpoint = new JmsMessageEndpointManager();
+... | true |
Other | spring-projects | spring-framework | d66d1605430c73444082d219214edb74327d3c13.json | Use ConcurrentHashMaps in DefaultContextCache
The changes made in 0cb22fc8f34a29c42313056671a947444b60050b would
result in contexts not being properly closed if evicted from the
ConcurrentReferenceHashMap by the Garbage Collector.
This commit reverts those changes and returns to using standard
ConcurrentHashMaps for ... | spring-test/src/main/java/org/springframework/test/context/support/DefaultContextCache.java | @@ -21,30 +21,29 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.springframework.context.Appl... | false |
Other | spring-projects | spring-framework | 0b054f9fbd1e0fd818e62fcc8de05b2150814ee2.json | Improve Javadoc for TestContextBootstrapper | spring-test/src/main/java/org/springframework/test/context/TestContextBootstrapper.java | @@ -19,19 +19,28 @@
import java.util.List;
/**
- * {@code TestContextBootstrapper} defines a strategy SPI for bootstrapping the
+ * {@code TestContextBootstrapper} defines the SPI for bootstrapping the
* <em>Spring TestContext Framework</em>.
*
- * <p>A custom bootstrapping strategy can be configured for a test... | false |
Other | spring-projects | spring-framework | 0cb22fc8f34a29c42313056671a947444b60050b.json | Use SoftReferences for context caching in the TCF
Prior to this commit, the ContextCache in the Spring TestContext
Framework (TCF) cached ApplicationContexts in a ConcurrentHashMap using
strong references. This practice can occasionally lead to
OutOfMemoryErrors when running a large number of tests in a test suite
wit... | spring-test/src/main/java/org/springframework/test/context/ContextCache.java | @@ -21,40 +21,46 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
impo... | false |
Other | spring-projects | spring-framework | 2a4f4cd258967494ba41fba1ef48d98fedaf1e85.json | Introduce reset() method in ContextCache | spring-test/src/main/java/org/springframework/test/context/ContextCache.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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,16 +31,18 @@
import org.springframework... | true |
Other | spring-projects | spring-framework | 2a4f4cd258967494ba41fba1ef48d98fedaf1e85.json | Introduce reset() method in ContextCache | spring-test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTestNGTests.java | @@ -80,8 +80,7 @@ private static final void runTestClassAndAssertStats(Class<?> testClass, int exp
@BeforeClass
public static void verifyInitialCacheState() {
ContextCache contextCache = TestContextManager.contextCache;
- contextCache.clear();
- contextCache.clearStatistics();
+ contextCache.reset();
cache... | true |
Other | spring-projects | spring-framework | 2a4f4cd258967494ba41fba1ef48d98fedaf1e85.json | Introduce reset() method in ContextCache | spring-test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTests.java | @@ -75,8 +75,7 @@ private static final void runTestClassAndAssertStats(Class<?> testClass, int exp
@BeforeClass
public static void verifyInitialCacheState() {
ContextCache contextCache = TestContextManager.contextCache;
- contextCache.clear();
- contextCache.clearStatistics();
+ contextCache.reset();
cache... | true |
Other | spring-projects | spring-framework | 2a4f4cd258967494ba41fba1ef48d98fedaf1e85.json | Introduce reset() method in ContextCache | spring-test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java | @@ -59,8 +59,7 @@ public class SpringRunnerContextCacheTests {
public static void verifyInitialCacheState() {
dirtiedApplicationContext = null;
ContextCache contextCache = TestContextManager.contextCache;
- contextCache.clear();
- contextCache.clearStatistics();
+ contextCache.reset();
assertContextCacheS... | true |
Other | spring-projects | spring-framework | 2c7d2d38a9a3499947e7a83d9f0a81e8b4c45dc3.json | Support custom resolution of response destination
Previously, the "pubSubDomain" drove the resolution of both the
destination of the listener and the default response destination.
A new "replyPubSubDomain" attribute has been added on the base listener
and can be used to listen on a topic and reply to a queue (or vic... | spring-jms/src/main/java/org/springframework/jms/config/AbstractJmsListenerContainerFactory.java | @@ -52,6 +52,8 @@
private Boolean pubSubDomain;
+ private Boolean replyPubSubDomain;
+
private Boolean subscriptionDurable;
private Boolean subscriptionShared;
@@ -112,6 +114,13 @@ public void setPubSubDomain(Boolean pubSubDomain) {
this.pubSubDomain = pubSubDomain;
}
+ /**
+ * @see AbstractMessageL... | true |
Other | spring-projects | spring-framework | 2c7d2d38a9a3499947e7a83d9f0a81e8b4c45dc3.json | Support custom resolution of response destination
Previously, the "pubSubDomain" drove the resolution of both the
destination of the listener and the default response destination.
A new "replyPubSubDomain" attribute has been added on the base listener
and can be used to listen on a topic and reply to a queue (or vic... | spring-jms/src/main/java/org/springframework/jms/config/AbstractListenerContainerParser.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -78,6 +78,8 @@ abstract class AbstractListen... | true |
Other | spring-projects | spring-framework | 2c7d2d38a9a3499947e7a83d9f0a81e8b4c45dc3.json | Support custom resolution of response destination
Previously, the "pubSubDomain" drove the resolution of both the
destination of the listener and the default response destination.
A new "replyPubSubDomain" attribute has been added on the base listener
and can be used to listen on a topic and reply to a queue (or vic... | spring-jms/src/main/java/org/springframework/jms/config/MethodJmsListenerEndpoint.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -89,7 +89,7 @@ protected MessagingMessageLis... | true |
Other | spring-projects | spring-framework | 2c7d2d38a9a3499947e7a83d9f0a81e8b4c45dc3.json | Support custom resolution of response destination
Previously, the "pubSubDomain" drove the resolution of both the
destination of the listener and the default response destination.
A new "replyPubSubDomain" attribute has been added on the base listener
and can be used to listen on a topic and reply to a queue (or vic... | spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java | @@ -153,6 +153,8 @@ public abstract class AbstractMessageListenerContainer extends AbstractJmsListen
private String subscriptionName;
+ private Boolean replyPubSubDomain;
+
private boolean pubSubNoLocal = false;
private MessageConverter messageConverter;
@@ -445,6 +447,34 @@ public boolean isPubSubNoLocal()... | true |
Other | spring-projects | spring-framework | 2c7d2d38a9a3499947e7a83d9f0a81e8b4c45dc3.json | Support custom resolution of response destination
Previously, the "pubSubDomain" drove the resolution of both the
destination of the listener and the default response destination.
A new "replyPubSubDomain" attribute has been added on the base listener
and can be used to listen on a topic and reply to a queue (or vic... | spring-jms/src/main/java/org/springframework/jms/listener/MessageListenerContainer.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -47,4 +47,12 @@ public interface MessageList... | true |
Other | spring-projects | spring-framework | 2c7d2d38a9a3499947e7a83d9f0a81e8b4c45dc3.json | Support custom resolution of response destination
Previously, the "pubSubDomain" drove the resolution of both the
destination of the listener and the default response destination.
A new "replyPubSubDomain" attribute has been added on the base listener
and can be used to listen on a topic and reply to a queue (or vic... | spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsActivationSpecConfig.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -46,6 +46,8 @@ public class JmsActivationSpe... | true |
Other | spring-projects | spring-framework | 2c7d2d38a9a3499947e7a83d9f0a81e8b4c45dc3.json | Support custom resolution of response destination
Previously, the "pubSubDomain" drove the resolution of both the
destination of the listener and the default response destination.
A new "replyPubSubDomain" attribute has been added on the base listener
and can be used to listen on a topic and reply to a queue (or vic... | spring-jms/src/main/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManager.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -200,4 +200,13 @@ public boolean isPubSubDom... | true |
Other | spring-projects | spring-framework | 2c7d2d38a9a3499947e7a83d9f0a81e8b4c45dc3.json | Support custom resolution of response destination
Previously, the "pubSubDomain" drove the resolution of both the
destination of the listener and the default response destination.
A new "replyPubSubDomain" attribute has been added on the base listener
and can be used to listen on a topic and reply to a queue (or vic... | spring-jms/src/main/resources/META-INF/spring.schemas | @@ -4,4 +4,5 @@ http\://www.springframework.org/schema/jms/spring-jms-3.1.xsd=org/springframewor
http\://www.springframework.org/schema/jms/spring-jms-3.2.xsd=org/springframework/jms/config/spring-jms-3.2.xsd
http\://www.springframework.org/schema/jms/spring-jms-4.0.xsd=org/springframework/jms/config/spring-jms-4.0.x... | true |
Other | spring-projects | spring-framework | 2c7d2d38a9a3499947e7a83d9f0a81e8b4c45dc3.json | Support custom resolution of response destination
Previously, the "pubSubDomain" drove the resolution of both the
destination of the listener and the default response destination.
A new "replyPubSubDomain" attribute has been added on the base listener
and can be used to listen on a topic and reply to a queue (or vic... | spring-jms/src/main/resources/org/springframework/jms/config/spring-jms-4.2.xsd | @@ -0,0 +1,638 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xsd:schema xmlns="http://www.springframework.org/schema/jms"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:tool="http://www.springframework.org/schema/tool"
+ targetNamespace="http://www.springframework.org/schema/jms"
+ elementFormDefault="qual... | true |
Other | spring-projects | spring-framework | 2c7d2d38a9a3499947e7a83d9f0a81e8b4c45dc3.json | Support custom resolution of response destination
Previously, the "pubSubDomain" drove the resolution of both the
destination of the listener and the default response destination.
A new "replyPubSubDomain" attribute has been added on the base listener
and can be used to listen on a topic and reply to a queue (or vic... | spring-jms/src/test/java/org/springframework/jms/config/JmsListenerContainerFactoryTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -155,6 +155,7 @@ private void setDefaultJmsC... | true |
Other | spring-projects | spring-framework | 2c7d2d38a9a3499947e7a83d9f0a81e8b4c45dc3.json | Support custom resolution of response destination
Previously, the "pubSubDomain" drove the resolution of both the
destination of the listener and the default response destination.
A new "replyPubSubDomain" attribute has been added on the base listener
and can be used to listen on a topic and reply to a queue (or vic... | spring-jms/src/test/java/org/springframework/jms/config/JmsNamespaceHandlerTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -152,6 +152,8 @@ public void testJmsContaine... | true |
Other | spring-projects | spring-framework | 2c7d2d38a9a3499947e7a83d9f0a81e8b4c45dc3.json | Support custom resolution of response destination
Previously, the "pubSubDomain" drove the resolution of both the
destination of the listener and the default response destination.
A new "replyPubSubDomain" attribute has been added on the base listener
and can be used to listen on a topic and reply to a queue (or vic... | spring-jms/src/test/java/org/springframework/jms/config/MessageListenerTestContainer.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -108,6 +108,11 @@ public boolean isPubSubDom... | true |
Other | spring-projects | spring-framework | 2c7d2d38a9a3499947e7a83d9f0a81e8b4c45dc3.json | Support custom resolution of response destination
Previously, the "pubSubDomain" drove the resolution of both the
destination of the listener and the default response destination.
A new "replyPubSubDomain" attribute has been added on the base listener
and can be used to listen on a topic and reply to a queue (or vic... | spring-jms/src/test/java/org/springframework/jms/config/MethodJmsListenerEndpointTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -241,6 +241,18 @@ public void processAndRepl... | true |
Other | spring-projects | spring-framework | 2c7d2d38a9a3499947e7a83d9f0a81e8b4c45dc3.json | Support custom resolution of response destination
Previously, the "pubSubDomain" drove the resolution of both the
destination of the listener and the default response destination.
A new "replyPubSubDomain" attribute has been added on the base listener
and can be used to listen on a topic and reply to a queue (or vic... | spring-jms/src/test/java/org/springframework/jms/listener/endpoint/JmsMessageEndpointManagerTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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 @@ public void isPubSubDomainWit... | true |
Other | spring-projects | spring-framework | 2c7d2d38a9a3499947e7a83d9f0a81e8b4c45dc3.json | Support custom resolution of response destination
Previously, the "pubSubDomain" drove the resolution of both the
destination of the listener and the default response destination.
A new "replyPubSubDomain" attribute has been added on the base listener
and can be used to listen on a topic and reply to a queue (or vic... | spring-jms/src/test/resources/org/springframework/jms/config/jmsNamespaceHandlerTests.xml | @@ -3,12 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jms="http://www.springframework.org/schema/jms"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/jms http://www.sp... | true |
Other | spring-projects | spring-framework | 2c7d2d38a9a3499947e7a83d9f0a81e8b4c45dc3.json | Support custom resolution of response destination
Previously, the "pubSubDomain" drove the resolution of both the
destination of the listener and the default response destination.
A new "replyPubSubDomain" attribute has been added on the base listener
and can be used to listen on a topic and reply to a queue (or vic... | src/asciidoc/integration.adoc | @@ -2869,7 +2869,7 @@ describes all available attributes:
| The name of the default response destination to send response messages to. This will
be applied in case of a request message that does not carry a "JMSReplyTo" field. The
type of this destination will be determined by the listener-container's
- "destin... | true |
Other | spring-projects | spring-framework | dba48a1ff5eef94504a129902d59788c4dfd0c6b.json | Isolate thrown exception in AssertTests | spring-core/src/test/java/org/springframework/util/AssertTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -35,17 +35,22 @@
* @author Erwin Vervaet
... | false |
Other | spring-projects | spring-framework | 47f8d435e621163f56727891bb2e874e76e1f9b8.json | Introduce isNotEmpty() aliases in StringUtils
This commit introduces isNotEmpty() aliases for the existing hasLength()
methods in StringUtils.
Issue: SPR-12909 | spring-core/src/main/java/org/springframework/util/StringUtils.java | @@ -50,6 +50,7 @@
* @author Rob Harrop
* @author Rick Evans
* @author Arjen Poutsma
+ * @author Sam Brannen
* @since 16 April 2001
*/
public abstract class StringUtils {
@@ -79,14 +80,48 @@ public abstract class StringUtils {
* Objects since attributes may e.g. be primitive value objects as well.
* @pa... | false |
Other | spring-projects | spring-framework | e9dee82a8daaa0cadbf16540b795b63cd9559a6f.json | Add descriptions to Gradle tasks in spring-test | build.gradle | @@ -992,6 +992,7 @@ project("spring-test") {
}
task testNG(type: Test) {
+ description = 'Runs TestNG tests.'
useTestNG()
scanForTestClasses = false
include(["**/testng/**/*Tests.class", "**/testng/**/*Test.class"])
@@ -1001,12 +1002,14 @@ project("spring-test") {
}
test {
+ description = 'Runs J... | false |
Other | spring-projects | spring-framework | da04362a5e52fae46ff817f8167a2f55a25eac78.json | Log context cache statistics in the TCF
Prior to this commit, finding out how many application contexts had
been loaded within a test suite required the use of reflection and a
bit of hacking.
This commit addresses this issue by logging ContextCache statistics
whenever an application context is loaded by the Spring T... | spring-test/src/main/java/org/springframework/test/context/ContextCache.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.
@@ -22,6 +22,7 @@
import java.util.Map;
impor... | true |
Other | spring-projects | spring-framework | da04362a5e52fae46ff817f8167a2f55a25eac78.json | Log context cache statistics in the TCF
Prior to this commit, finding out how many application contexts had
been loaded within a test suite required the use of reflection and a
bit of hacking.
This commit addresses this issue by logging ContextCache statistics
whenever an application context is loaded by the Spring T... | spring-test/src/main/java/org/springframework/test/context/DefaultCacheAwareContextLoaderDelegate.java | @@ -38,6 +38,8 @@ class DefaultCacheAwareContextLoaderDelegate implements CacheAwareContextLoaderD
private static final Log logger = LogFactory.getLog(DefaultCacheAwareContextLoaderDelegate.class);
+ private static final Log statsLogger = LogFactory.getLog("org.springframework.test.context.cache");
+
private fi... | true |
Other | spring-projects | spring-framework | da04362a5e52fae46ff817f8167a2f55a25eac78.json | Log context cache statistics in the TCF
Prior to this commit, finding out how many application contexts had
been loaded within a test suite required the use of reflection and a
bit of hacking.
This commit addresses this issue by logging ContextCache statistics
whenever an application context is loaded by the Spring T... | spring-test/src/test/resources/log4j.properties | @@ -15,6 +15,7 @@ log4j.logger.org.springframework.test.context.ContextLoaderUtils=WARN
log4j.logger.org.springframework.test.context.transaction.TransactionalTestExecutionListener=WARN
log4j.logger.org.springframework.test.context.web=WARN
log4j.logger.org.springframework.test.context=WARN
+log4j.logger.org.springf... | true |
Other | spring-projects | spring-framework | da04362a5e52fae46ff817f8167a2f55a25eac78.json | Log context cache statistics in the TCF
Prior to this commit, finding out how many application contexts had
been loaded within a test suite required the use of reflection and a
bit of hacking.
This commit addresses this issue by logging ContextCache statistics
whenever an application context is loaded by the Spring T... | src/asciidoc/index.adoc | @@ -20851,6 +20851,12 @@ framework will not be able to cache application contexts between test classes an
build process will run significantly slower as a result.
====
+Since having a large number of application contexts loaded within a given test suite can
+cause the suite to take an unnecessarily long time to exe... | true |
Other | spring-projects | spring-framework | 8b5fda5ad97ea75fcad075e94cf1c791100c2079.json | Use unversioned XSD links in code examples | src/asciidoc/index.adoc | @@ -39046,7 +39046,7 @@ XML configuration equivalent:
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/websocket
- http://www.springframework.org/schema/websocket/spring-websocket-4.0.xsd">
+ http://www.springf... | false |
Other | spring-projects | spring-framework | 6534d0035db3c64eedbc35ee47e8f3aaf522791b.json | Add documentation for the keep-alive flag
This commit updates the documentation of the task:executor element to
reference the keep-alive flag.
Issue: SPR-12407 | src/asciidoc/index.adoc | @@ -47654,6 +47654,20 @@ element.
----
+Finally, the `keep-alive` setting determines the time limit (in seconds) for which threads
+may remain idle before being terminated. If there are more than the core number of threads
+currently in the pool, after waiting this amount of time without processing a task, excess
... | false |
Other | spring-projects | spring-framework | 1fff631daa65c228a1e2caeb387d1b8cd6b6e2e8.json | Fix SubProtocolHandler duplicate registration
Prior to this change, duplicate SubProtocolHandlers could be registered
when configuring STOMP with several registrations:
public void registerStompEndpoints
(final StompEndpointRegistry registry) {
this.endpointRegistry.addEndpoint("/stompOverWebSocke... | spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandler.java | @@ -19,8 +19,10 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInt... | true |
Other | spring-projects | spring-framework | 1fff631daa65c228a1e2caeb387d1b8cd6b6e2e8.json | Fix SubProtocolHandler duplicate registration
Prior to this change, duplicate SubProtocolHandlers could be registered
when configuring STOMP with several registrations:
public void registerStompEndpoints
(final StompEndpointRegistry registry) {
this.endpointRegistry.addEndpoint("/stompOverWebSocke... | spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompEndpointRegistryTests.java | @@ -84,6 +84,9 @@ public void handlerMapping() {
this.endpointRegistry.addEndpoint("/stompOverWebSocket");
this.endpointRegistry.addEndpoint("/stompOverSockJS").withSockJS();
+ //SPR-12403
+ assertEquals(1, this.webSocketHandler.getProtocolHandlers().size());
+
hm = (SimpleUrlHandlerMapping) this.endpointR... | true |
Other | spring-projects | spring-framework | cfa3d358d5836bcfaad1f6ce9287ccf78ad7740f.json | Add an alwaysInclude property to TilesViewResolver
Issue: SPR-12374 | spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesView.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.
@@ -48,12 +48,27 @@
* {@link TilesConfigurer}... | true |
Other | spring-projects | spring-framework | cfa3d358d5836bcfaad1f6ce9287ccf78ad7740f.json | Add an alwaysInclude property to TilesViewResolver
Issue: SPR-12374 | spring-webmvc-tiles2/src/main/java/org/springframework/web/servlet/view/tiles2/TilesViewResolver.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2009 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,6 +16,7 @@
package org.springframewor... | true |
Other | spring-projects | spring-framework | cfa3d358d5836bcfaad1f6ce9287ccf78ad7740f.json | Add an alwaysInclude property to TilesViewResolver
Issue: SPR-12374 | spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesView.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.
@@ -24,6 +24,7 @@
import org.apache.tiles.Tile... | true |
Other | spring-projects | spring-framework | cfa3d358d5836bcfaad1f6ce9287ccf78ad7740f.json | Add an alwaysInclude property to TilesViewResolver
Issue: SPR-12374 | spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/TilesViewResolver.java | @@ -27,26 +27,20 @@
* @author Nicolas Le Bas
* @author Rossen Stoyanchev
* @author Juergen Hoeller
+ * @author Sebastien Deleuze
* @since 3.2
*/
public class TilesViewResolver extends UrlBasedViewResolver {
private Renderer renderer;
+ private Boolean alwaysInclude;
+
public TilesViewResolver() {
... | true |
Other | spring-projects | spring-framework | cfa3d358d5836bcfaad1f6ce9287ccf78ad7740f.json | Add an alwaysInclude property to TilesViewResolver
Issue: SPR-12374 | spring-webmvc/src/test/java/org/springframework/web/servlet/view/tiles3/TilesViewTests.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.
@@ -18,6 +18,7 @@
import java.util.HashMap;
i... | true |
Other | spring-projects | spring-framework | 2f039454107ad0ed67f31a38d7b11a4f9318a5b1.json | Delete unused imports in spring-test | spring-test/src/test/java/org/springframework/test/context/testng/transaction/programmatic/ProgrammaticTxMgmtTestNGTests.java | @@ -19,11 +19,8 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import javax.sql.DataSource;
-import org.testng.IHookCallBack;
-import org.testng.ITestResult;
-import org.testng.annotations.Test;
+import javax.sql.DataSource;
import org.springframework.context.annotation.Bean;
... | true |
Other | spring-projects | spring-framework | 2f039454107ad0ed67f31a38d7b11a4f9318a5b1.json | Delete unused imports in spring-test | spring-test/src/test/java/org/springframework/test/context/transaction/programmatic/ProgrammaticTxMgmtTests.java | @@ -19,12 +19,12 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+
import javax.sql.DataSource;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;
-
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.C... | true |
Other | spring-projects | spring-framework | 2f039454107ad0ed67f31a38d7b11a4f9318a5b1.json | Delete unused imports in spring-test | spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java | @@ -36,7 +36,6 @@
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.request;
import static org.springframework.test.... | true |
Other | spring-projects | spring-framework | d8941ca098b14e53b7786a66fd268d3459791336.json | Normalize 2+ '/' in path in UriComponentsBuilder
Issue: SPR-12398 | spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java | @@ -720,7 +720,14 @@ public PathComponent build() {
if (this.path.length() == 0) {
return null;
}
- String path = this.path.toString().replace("//", "/");
+ String path = this.path.toString();
+ while (true) {
+ int index = path.indexOf("//");
+ if (index == -1) {
+ break;
+ }
+ path ... | true |
Other | spring-projects | spring-framework | d8941ca098b14e53b7786a66fd268d3459791336.json | Normalize 2+ '/' in path in UriComponentsBuilder
Issue: SPR-12398 | spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java | @@ -291,6 +291,14 @@ public void pathSegmentsSomeEmpty() {
assertEquals(Arrays.asList("foo", "bar"), result.getPathSegments());
}
+ // SPR-12398
+
+ @Test
+ public void pathWithDuplicateSlashes() throws URISyntaxException {
+ UriComponents uriComponents = UriComponentsBuilder.fromPath("/foo/////////bar").build(... | true |
Other | spring-projects | spring-framework | fc7e60678cf8e63037f4163c4d77013a2f088104.json | Fix Javadoc in MockHttpServletRequestBuilder
Class-level Javadoc for MockHttpServletRequestBuilder now correctly
refers to MockMvcRequestBuilders instead of MockMvcBuilders.
Issue: SPR-12393 | spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java | @@ -60,7 +60,7 @@
* requests in {@link MockMvc}.
*
* <p>Application tests will typically access this builder through the static factory
- * methods in {@link org.springframework.test.web.servlet.setup.MockMvcBuilders}.
+ * methods in {@link MockMvcRequestBuilders}.
*
* @author Rossen Stoyanchev
* @author Ar... | false |
Other | spring-projects | spring-framework | 584b831bb9390a49c791d180d023e3a585203215.json | Allow HTTP delete with request entity
Issue: SPR-12361 | spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java | @@ -22,7 +22,7 @@
import org.apache.http.client.HttpClient;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.Configurable;
-import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
import org.apache.http.client.... | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.