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
044f51283b92609e0a17c90adcaf0dc57201477c.json
Introduce ActiveProfilesResolver in the TCF Prior to this commit, the active bean definition profiles to use when loading an ApplicationContext for tests could only be configured declaratively (i.e., via hard-coded values supplied to the 'value' or 'profiles' attribute of @ActiveProfiles). This commit makes it possib...
spring-test/src/test/java/org/springframework/test/context/junit4/profile/resolver/ClassNameActiveProfilesResolver.java
@@ -0,0 +1,31 @@ +/* + * Copyright 2002-2013 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
044f51283b92609e0a17c90adcaf0dc57201477c.json
Introduce ActiveProfilesResolver in the TCF Prior to this commit, the active bean definition profiles to use when loading an ApplicationContext for tests could only be configured declaratively (i.e., via hard-coded values supplied to the 'value' or 'profiles' attribute of @ActiveProfiles). This commit makes it possib...
spring-test/src/test/java/org/springframework/test/context/junit4/profile/resolver/ClassNameActiveProfilesResolverTest.java
@@ -0,0 +1,57 @@ +/* + * Copyright 2002-2013 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
044f51283b92609e0a17c90adcaf0dc57201477c.json
Introduce ActiveProfilesResolver in the TCF Prior to this commit, the active bean definition profiles to use when loading an ApplicationContext for tests could only be configured declaratively (i.e., via hard-coded values supplied to the 'value' or 'profiles' attribute of @ActiveProfiles). This commit makes it possib...
spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/DevProfileResolverXmlConfigTests.java
@@ -0,0 +1,34 @@ +/* + * Copyright 2002-2013 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
044f51283b92609e0a17c90adcaf0dc57201477c.json
Introduce ActiveProfilesResolver in the TCF Prior to this commit, the active bean definition profiles to use when loading an ApplicationContext for tests could only be configured declaratively (i.e., via hard-coded values supplied to the 'value' or 'profiles' attribute of @ActiveProfiles). This commit makes it possib...
spring-test/src/test/java/org/springframework/test/context/junit4/profile/xml/ProfileXmlConfigTestSuite.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2013 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,7 +31,8 @@ // Note: the following 'mult...
true
Other
spring-projects
spring-framework
044f51283b92609e0a17c90adcaf0dc57201477c.json
Introduce ActiveProfilesResolver in the TCF Prior to this commit, the active bean definition profiles to use when loading an ApplicationContext for tests could only be configured declaratively (i.e., via hard-coded values supplied to the 'value' or 'profiles' attribute of @ActiveProfiles). This commit makes it possib...
src/reference/docbook/testing.xml
@@ -197,7 +197,6 @@ TestContext framework is agnostic of the actual testing framework in use, thus allowing instrumentation of tests in various environments including JUnit, TestNG, and so on.</para> - </section> <section xml:id="integration-testing-goals"> @@ -444,13 +443,13 @@ ...
true
Other
spring-projects
spring-framework
f311bf3daf2fb359e96e213420c55a39f1c71d4a.json
Introduce TCP & UDP server port scanning utility Prior to this commit the Spring Framework did not provide a public means for scanning for available server ports. However, the Spring Framework internally used a FreePortScanner in integration tests within its own test suite. Furthermore, Spring Integration 2.2 provides...
spring-core/src/main/java/org/springframework/util/SocketUtils.java
@@ -0,0 +1,323 @@ +/* + * Copyright 2002-2013 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
f311bf3daf2fb359e96e213420c55a39f1c71d4a.json
Introduce TCP & UDP server port scanning utility Prior to this commit the Spring Framework did not provide a public means for scanning for available server ports. However, the Spring Framework internally used a FreePortScanner in integration tests within its own test suite. Furthermore, Spring Integration 2.2 provides...
spring-core/src/test/java/org/springframework/util/SocketUtilsTests.java
@@ -0,0 +1,180 @@ +/* + * Copyright 2002-2013 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
f311bf3daf2fb359e96e213420c55a39f1c71d4a.json
Introduce TCP & UDP server port scanning utility Prior to this commit the Spring Framework did not provide a public means for scanning for available server ports. However, the Spring Framework internally used a FreePortScanner in integration tests within its own test suite. Furthermore, Spring Integration 2.2 provides...
spring-web/src/test/java/org/springframework/http/client/AbstractHttpRequestFactoryTestCase.java
@@ -16,9 +16,6 @@ package org.springframework.http.client; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.io.InputStream; import java.net.URI; @@ -43,8 +40,10 @@ import org.junit.Test; import org.springframework.http.HttpMeth...
true
Other
spring-projects
spring-framework
f311bf3daf2fb359e96e213420c55a39f1c71d4a.json
Introduce TCP & UDP server port scanning utility Prior to this commit the Spring Framework did not provide a public means for scanning for available server ports. However, the Spring Framework internally used a FreePortScanner in integration tests within its own test suite. Furthermore, Spring Integration 2.2 provides...
spring-web/src/test/java/org/springframework/tests/web/FreePortScanner.java
@@ -1,99 +0,0 @@ -/* - * Copyright 2002-2012 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
f311bf3daf2fb359e96e213420c55a39f1c71d4a.json
Introduce TCP & UDP server port scanning utility Prior to this commit the Spring Framework did not provide a public means for scanning for available server ports. However, the Spring Framework internally used a FreePortScanner in integration tests within its own test suite. Furthermore, Spring Integration 2.2 provides...
spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
@@ -16,14 +16,6 @@ package org.springframework.web.client; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.juni...
true
Other
spring-projects
spring-framework
f311bf3daf2fb359e96e213420c55a39f1c71d4a.json
Introduce TCP & UDP server port scanning utility Prior to this commit the Spring Framework did not provide a public means for scanning for available server ports. However, the Spring Framework internally used a FreePortScanner in integration tests within its own test suite. Furthermore, Spring Integration 2.2 provides...
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java
@@ -16,8 +16,6 @@ package org.springframework.web.servlet.mvc.method.annotation; -import static org.junit.Assert.assertEquals; - import java.net.URI; import java.util.Arrays; @@ -42,9 +40,9 @@ import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter; import org.springframework.http.c...
true
Other
spring-projects
spring-framework
641aaf4b6ac3c810b2ed515293e9561bdd5609ab.json
Use tcp-reactor in StompRelayMessageHandler
build.gradle
@@ -482,13 +482,15 @@ project("spring-websocket") { } optional("org.eclipse.jetty.websocket:websocket-server:9.0.3.v20130506") optional("org.eclipse.jetty.websocket:websocket-client:9.0.3.v20130506") - optional("com.fasterxml.jackson.core:jackson-databind:2.2.0") // required for SockJS support currently - op...
true
Other
spring-projects
spring-framework
641aaf4b6ac3c810b2ed515293e9561bdd5609ab.json
Use tcp-reactor in StompRelayMessageHandler
spring-websocket/src/main/java/org/springframework/web/messaging/converter/ContentTypeNotSupportedException.java
@@ -25,6 +25,8 @@ */ public class ContentTypeNotSupportedException extends Exception { + private static final long serialVersionUID = -3597879520747071896L; + private final MediaType mediaType; private final Class<?> sourceOrTargetType;
true
Other
spring-projects
spring-framework
641aaf4b6ac3c810b2ed515293e9561bdd5609ab.json
Use tcp-reactor in StompRelayMessageHandler
spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/StompRelayPubSubMessageHandler.java
@@ -16,21 +16,12 @@ package org.springframework.web.messaging.stomp.support; -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.Socket; +import jav...
true
Other
spring-projects
spring-framework
78d1063e37874b7ef0ed70d14f503aa3ab75ade6.json
Replace use of PubSub header name literals
spring-websocket/src/main/java/org/springframework/web/messaging/service/method/MessageBodyArgumentResolver.java
@@ -21,6 +21,7 @@ import org.springframework.core.MethodParameter; import org.springframework.http.MediaType; import org.springframework.messaging.Message; +import org.springframework.web.messaging.PubSubHeaders; import org.springframework.web.messaging.annotation.MessageBody; import org.springframework.web.messag...
true
Other
spring-projects
spring-framework
78d1063e37874b7ef0ed70d14f503aa3ab75ade6.json
Replace use of PubSub header name literals
spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/StompRelayPubSubMessageHandler.java
@@ -38,6 +38,7 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.util.Assert; import org.springframework.web.messaging.MessageType; +import org.springframework.web.messaging.PubSubHeaders; import org.springframework.web.messaging.converter.CompositeMessageConverter; import org...
true
Other
spring-projects
spring-framework
d136d06eda586ea7a80f8495397987959f0bb702.json
Add method to create MessageHeaders in Message
spring-context/src/main/java/org/springframework/messaging/GenericMessage.java
@@ -64,11 +64,15 @@ public GenericMessage(T payload, Map<String, Object> headers) { else { headers = new HashMap<String, Object>(headers); } - this.headers = new MessageHeaders(headers); + this.headers = createMessageHeaders(headers); this.payload = payload; } + protected MessageHeaders createMessa...
false
Other
spring-projects
spring-framework
8cea9ca96213aaa1c35bd755cb82b6265cda79ad.json
Correct the Assert imports Import org.springframework.util.Assert rather than reactor.util.Assert
spring-websocket/src/main/java/org/springframework/web/messaging/service/method/MessageChannelArgumentResolver.java
@@ -20,10 +20,9 @@ import org.springframework.messaging.GenericMessage; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; +import org.springframework.util.Assert; import org.springframework.web.messaging.PubSubHeaders; -import reactor.util.Assert; - /** * @aut...
true
Other
spring-projects
spring-framework
8cea9ca96213aaa1c35bd755cb82b6265cda79ad.json
Correct the Assert imports Import org.springframework.util.Assert rather than reactor.util.Assert
spring-websocket/src/main/java/org/springframework/web/messaging/service/method/MessageReturnValueHandler.java
@@ -20,10 +20,9 @@ import org.springframework.messaging.GenericMessage; import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; +import org.springframework.util.Assert; import org.springframework.web.messaging.PubSubHeaders; -import reactor.util.Assert; - /** * @aut...
true
Other
spring-projects
spring-framework
8cea9ca96213aaa1c35bd755cb82b6265cda79ad.json
Correct the Assert imports Import org.springframework.util.Assert rather than reactor.util.Assert
spring-websocket/src/main/java/org/springframework/web/messaging/stomp/StompHeaders.java
@@ -26,14 +26,13 @@ import org.springframework.http.MediaType; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; +import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.LinkedMultiValueMap; import or...
true
Other
spring-projects
spring-framework
8cea9ca96213aaa1c35bd755cb82b6265cda79ad.json
Correct the Assert imports Import org.springframework.util.Assert rather than reactor.util.Assert
spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/StompRelayPubSubMessageHandler.java
@@ -36,15 +36,14 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.SubscribableChannel; +import org.springframework.util.Assert; import org.springframework.web.messaging.MessageType; import org.springframework.web.messaging.co...
true
Other
spring-projects
spring-framework
3e0aac08dc137748aa2ac2637aac029edaffab08.json
Add SubscribableChannel and ReactorMessageChannel
spring-context/src/main/java/org/springframework/messaging/MessageHandler.java
@@ -0,0 +1,51 @@ +/* + * Copyright 2002-2013 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
3e0aac08dc137748aa2ac2637aac029edaffab08.json
Add SubscribableChannel and ReactorMessageChannel
spring-context/src/main/java/org/springframework/messaging/SubscribableChannel.java
@@ -0,0 +1,40 @@ +/* + * Copyright 2002-2013 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
3e0aac08dc137748aa2ac2637aac029edaffab08.json
Add SubscribableChannel and ReactorMessageChannel
spring-websocket/src/main/java/org/springframework/web/messaging/service/AbstractPubSubMessageHandler.java
@@ -18,37 +18,35 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel;...
true
Other
spring-projects
spring-framework
3e0aac08dc137748aa2ac2637aac029edaffab08.json
Add SubscribableChannel and ReactorMessageChannel
spring-websocket/src/main/java/org/springframework/web/messaging/service/ReactorPubSubMessageHandler.java
@@ -17,34 +17,47 @@ package org.springframework.web.messaging.service; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.springframework.messaging.GenericMessage; import or...
true
Other
spring-projects
spring-framework
3e0aac08dc137748aa2ac2637aac029edaffab08.json
Add SubscribableChannel and ReactorMessageChannel
spring-websocket/src/main/java/org/springframework/web/messaging/service/method/AnnotationPubSubMessageHandler.java
@@ -19,6 +19,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.Arrays; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,16 +32,18 @@ import org.springframework.core.MethodParameter; import org.springframework...
true
Other
spring-projects
spring-framework
3e0aac08dc137748aa2ac2637aac029edaffab08.json
Add SubscribableChannel and ReactorMessageChannel
spring-websocket/src/main/java/org/springframework/web/messaging/service/method/MessageChannelArgumentResolver.java
@@ -21,8 +21,6 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.web.messaging.PubSubHeaders; -import org.springframework.web.messaging.event.EventBus; -import org.springframework.web.messaging.service.AbstractMessageService; import re...
true
Other
spring-projects
spring-framework
3e0aac08dc137748aa2ac2637aac029edaffab08.json
Add SubscribableChannel and ReactorMessageChannel
spring-websocket/src/main/java/org/springframework/web/messaging/service/method/MessageReturnValueHandler.java
@@ -19,9 +19,8 @@ import org.springframework.core.MethodParameter; import org.springframework.messaging.GenericMessage; import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.web.messaging.PubSubHeaders; -import org.springframework.web.messagin...
true
Other
spring-projects
spring-framework
3e0aac08dc137748aa2ac2637aac029edaffab08.json
Add SubscribableChannel and ReactorMessageChannel
spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/StompRelayPubSubMessageHandler.java
@@ -23,6 +23,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.Socket; +import java.util.Collection; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -33,10 +34,12 @@ import org.springframework.http.MediaType; import org.springframework.m...
true
Other
spring-projects
spring-framework
3e0aac08dc137748aa2ac2637aac029edaffab08.json
Add SubscribableChannel and ReactorMessageChannel
spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/StompWebSocketHandler.java
@@ -27,12 +27,13 @@ import org.springframework.http.MediaType; import org.springframework.messaging.GenericMessage; import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.Subscriba...
true
Other
spring-projects
spring-framework
3e0aac08dc137748aa2ac2637aac029edaffab08.json
Add SubscribableChannel and ReactorMessageChannel
spring-websocket/src/main/java/org/springframework/web/messaging/support/ReactorMessageChannel.java
@@ -0,0 +1,141 @@ +/* + * Copyright 2002-2013 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
b78dcc59fe0a2f9937c65df1134cc87e0350cb9b.json
Make ConfClassPostPro Ordered.HIGHEST_PRECEDENCE Make ConfigurationClassPostProcessor Ordered.HIGHEST_PRECEDENCE in case several BeanDefinitionRegistryPostProcessors are registered. Issue: SPR-10645
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
@@ -87,7 +87,8 @@ * @since 3.0 */ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPostProcessor, - ResourceLoaderAware, BeanClassLoaderAware, EnvironmentAware, ApplicationContextAware { + ResourceLoaderAware, BeanClassLoaderAware, EnvironmentAware, ApplicationContextAware, + Ordere...
false
Other
spring-projects
spring-framework
2e2e9b8dd0ecb113c86ec3a5d0cf87d4f6f72fd6.json
Improve support for @Conditional on @Configuration Introduce new ConfigurationCondition interface allowing more fine-grained control for @Conditional when used with @Configuration beans. Primarily added so that the evaluation of conditions that inspect bean definitions can be deferred until all @Configuration classes...
spring-context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java
@@ -45,12 +45,12 @@ public class AnnotatedBeanDefinitionReader { private final BeanDefinitionRegistry registry; - private Environment environment; - private BeanNameGenerator beanNameGenerator = new AnnotationBeanNameGenerator(); private ScopeMetadataResolver scopeMetadataResolver = new AnnotationScopeMetad...
true
Other
spring-projects
spring-framework
2e2e9b8dd0ecb113c86ec3a5d0cf87d4f6f72fd6.json
Improve support for @Conditional on @Configuration Introduce new ConfigurationCondition interface allowing more fine-grained control for @Conditional when used with @Configuration beans. Primarily added so that the evaluation of conditions that inspect bean definitions can be deferred until all @Configuration classes...
spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java
@@ -262,12 +262,6 @@ protected Set<BeanDefinitionHolder> doScan(String... basePackages) { return beanDefinitions; } - @Override - protected boolean isConditionMatch(MetadataReader metadataReader) { - return !ConditionEvaluator.get(metadataReader.getAnnotationMetadata(), true).shouldSkip( - getRegistry(), get...
true
Other
spring-projects
spring-framework
2e2e9b8dd0ecb113c86ec3a5d0cf87d4f6f72fd6.json
Improve support for @Conditional on @Configuration Introduce new ConfigurationCondition interface allowing more fine-grained control for @Conditional when used with @Configuration beans. Primarily added so that the evaluation of conditions that inspect bean definitions can be deferred until all @Configuration classes...
spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
@@ -28,6 +28,7 @@ import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.s...
true
Other
spring-projects
spring-framework
2e2e9b8dd0ecb113c86ec3a5d0cf87d4f6f72fd6.json
Improve support for @Conditional on @Configuration Introduce new ConfigurationCondition interface allowing more fine-grained control for @Conditional when used with @Configuration beans. Primarily added so that the evaluation of conditions that inspect bean definitions can be deferred until all @Configuration classes...
spring-context/src/main/java/org/springframework/context/annotation/Condition.java
@@ -25,15 +25,18 @@ * A single {@code condition} that must be {@linkplain #matches matched} in order * for a component to be registered. * - * <p>Conditions are checked immediately before a component bean-definition is due to be - * registered and are free to veto registration based on any criteria that can be - ...
true
Other
spring-projects
spring-framework
2e2e9b8dd0ecb113c86ec3a5d0cf87d4f6f72fd6.json
Improve support for @Conditional on @Configuration Introduce new ConfigurationCondition interface allowing more fine-grained control for @Conditional when used with @Configuration beans. Primarily added so that the evaluation of conditions that inspect bean definitions can be deferred until all @Configuration classes...
spring-context/src/main/java/org/springframework/context/annotation/ConditionContext.java
@@ -18,6 +18,7 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.BeanDefinitionRegistry; +import org.springframework.context.ApplicationContext; import org.springframework.core.env.Environment; import org.springframework.core.io.Re...
true
Other
spring-projects
spring-framework
2e2e9b8dd0ecb113c86ec3a5d0cf87d4f6f72fd6.json
Improve support for @Conditional on @Configuration Introduce new ConfigurationCondition interface allowing more fine-grained control for @Conditional when used with @Configuration beans. Primarily added so that the evaluation of conditions that inspect bean definitions can be deferred until all @Configuration classes...
spring-context/src/main/java/org/springframework/context/annotation/ConditionEvaluator.java
@@ -22,7 +22,9 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.BeanDefinitionRegistry; +import org.springframework.context.ApplicationContext; import org.springframework.context.Configura...
true
Other
spring-projects
spring-framework
2e2e9b8dd0ecb113c86ec3a5d0cf87d4f6f72fd6.json
Improve support for @Conditional on @Configuration Introduce new ConfigurationCondition interface allowing more fine-grained control for @Conditional when used with @Configuration beans. Primarily added so that the evaluation of conditions that inspect bean definitions can be deferred until all @Configuration classes...
spring-context/src/main/java/org/springframework/context/annotation/Conditional.java
@@ -26,7 +26,7 @@ * {@linkplain #value() specified conditions} match. * * <p>A <em>condition</em> is any state that can be determined programmatically - * immediately before the bean is due to be created (see {@link Condition} for details). + * before the bean definition is due to be registered (see {@link Condit...
true
Other
spring-projects
spring-framework
2e2e9b8dd0ecb113c86ec3a5d0cf87d4f6f72fd6.json
Improve support for @Conditional on @Configuration Introduce new ConfigurationCondition interface allowing more fine-grained control for @Conditional when used with @Configuration beans. Primarily added so that the evaluation of conditions that inspect bean definitions can be deferred until all @Configuration classes...
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
@@ -219,7 +219,6 @@ public void validate(ProblemReporter problemReporter) { } } - @Override public boolean equals(Object other) { return (this == other || (other instanceof ConfigurationClass &&
true
Other
spring-projects
spring-framework
2e2e9b8dd0ecb113c86ec3a5d0cf87d4f6f72fd6.json
Improve support for @Conditional on @Configuration Introduce new ConfigurationCondition interface allowing more fine-grained control for @Conditional when used with @Configuration beans. Primarily added so that the evaluation of conditions that inspect bean definitions can be deferred until all @Configuration classes...
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
@@ -42,6 +42,8 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanNameGenerator; import org.springframework.beans.factory.support.RootBeanDefinition; +import org.springframework.context.ApplicationContext; +import org.springframework.conte...
true
Other
spring-projects
spring-framework
2e2e9b8dd0ecb113c86ec3a5d0cf87d4f6f72fd6.json
Improve support for @Conditional on @Configuration Introduce new ConfigurationCondition interface allowing more fine-grained control for @Conditional when used with @Configuration beans. Primarily added so that the evaluation of conditions that inspect bean definitions can be deferred until all @Configuration classes...
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
@@ -46,8 +46,10 @@ import org.springframework.beans.factory.support.BeanDefinitionReader; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanNameGenerator; +import org.springframework.context.ApplicationContext; import org.springframework.co...
true
Other
spring-projects
spring-framework
2e2e9b8dd0ecb113c86ec3a5d0cf87d4f6f72fd6.json
Improve support for @Conditional on @Configuration Introduce new ConfigurationCondition interface allowing more fine-grained control for @Conditional when used with @Configuration beans. Primarily added so that the evaluation of conditions that inspect bean definitions can be deferred until all @Configuration classes...
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
@@ -46,6 +46,8 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor; import org.springframework.beans.factory.support.BeanNameGenerator; import org.springframework.beans.factory.support.RootBeanDefinition; +import org.springframework.context.ApplicationContext; +import org.springfr...
true
Other
spring-projects
spring-framework
2e2e9b8dd0ecb113c86ec3a5d0cf87d4f6f72fd6.json
Improve support for @Conditional on @Configuration Introduce new ConfigurationCondition interface allowing more fine-grained control for @Conditional when used with @Configuration beans. Primarily added so that the evaluation of conditions that inspect bean definitions can be deferred until all @Configuration classes...
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationCondition.java
@@ -0,0 +1,60 @@ +/* + * Copyright 2002-2013 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
2e2e9b8dd0ecb113c86ec3a5d0cf87d4f6f72fd6.json
Improve support for @Conditional on @Configuration Introduce new ConfigurationCondition interface allowing more fine-grained control for @Conditional when used with @Configuration beans. Primarily added so that the evaluation of conditions that inspect bean definitions can be deferred until all @Configuration classes...
spring-context/src/test/java/org/springframework/context/annotation/AsmCircularImportDetectionTests.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -41,7 +41,8 @@ protected ConfigurationClassP...
true
Other
spring-projects
spring-framework
2e2e9b8dd0ecb113c86ec3a5d0cf87d4f6f72fd6.json
Improve support for @Conditional on @Configuration Introduce new ConfigurationCondition interface allowing more fine-grained control for @Conditional when used with @Configuration beans. Primarily added so that the evaluation of conditions that inspect bean definitions can be deferred until all @Configuration classes...
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassWithConditionTests.java
@@ -16,12 +16,6 @@ package org.springframework.context.annotation; -import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; - import java.lang.annot...
true
Other
spring-projects
spring-framework
e7dde941b7d9af04bb4a8dd5d68e9ccf4ad92b6e.json
Update STOMP MESSAGE frames with messageId
spring-websocket/src/main/java/org/springframework/web/messaging/PubSubHeaders.java
@@ -17,6 +17,7 @@ package org.springframework.web.messaging; import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -85,7 +86,7 @@ public PubSubHeaders(MessageHeaders messageHeaders, boolean readOnly) { this.messageHeaders = readOnly...
true
Other
spring-projects
spring-framework
e7dde941b7d9af04bb4a8dd5d68e9ccf4ad92b6e.json
Update STOMP MESSAGE frames with messageId
spring-websocket/src/main/java/org/springframework/web/messaging/service/AbstractMessageService.java
@@ -75,7 +75,8 @@ public void accept(Message<?> message) { logger.trace("Processing notification: " + message); } - MessageType messageType = (MessageType) message.getHeaders().get("messageType"); + PubSubHeaders headers = new PubSubHeaders(message.getHeaders(), true); + MessageType messageType = ...
true
Other
spring-projects
spring-framework
e7dde941b7d9af04bb4a8dd5d68e9ccf4ad92b6e.json
Update STOMP MESSAGE frames with messageId
spring-websocket/src/main/java/org/springframework/web/messaging/stomp/StompHeaders.java
@@ -224,6 +224,9 @@ public void updateRawHeaders() { if (subscriptionId != null) { getRawHeaders().put(SUBSCRIPTION, subscriptionId); } + if (StompCommand.MESSAGE.equals(getStompCommand()) && (getMessageId() == null)) { + getRawHeaders().put(MESSAGE_ID, getMessageHeaders().get(ID).toString()); + } } ...
true
Other
spring-projects
spring-framework
547167e8b440feea5a71cd31df28224b171cf9d3.json
Remove remaining Reactor event wrapping
spring-websocket/src/main/java/org/springframework/web/messaging/service/PubSubMessageService.java
@@ -31,8 +31,6 @@ import org.springframework.web.messaging.event.EventConsumer; import org.springframework.web.messaging.event.EventRegistration; -import reactor.fn.Event; - /** * @author Rossen Stoyanchev @@ -74,7 +72,7 @@ protected void processMessage(Message<?> message) { byte[] payload = payloadConvert...
true
Other
spring-projects
spring-framework
547167e8b440feea5a71cd31df28224b171cf9d3.json
Remove remaining Reactor event wrapping
spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/RelayStompService.java
@@ -40,7 +40,6 @@ import org.springframework.web.messaging.stomp.StompHeaders; import org.springframework.web.messaging.stomp.StompMessage; -import reactor.fn.Event; import reactor.util.Assert; @@ -243,7 +242,7 @@ private void sendErrorMessage(String message) { StompHeaders headers = new StompHeaders(); ...
true
Other
spring-projects
spring-framework
51d828816d3a50004863964d8b9c92b2a32fdc33.json
Throw ISEs in MockHttpSession for invalid session The Javadoc for several methods in HttpSession specifies that an IllegalStateException must be thrown if the method is called on an invalidated session; however, Spring's MockHttpSession did not implement this behavior consistently prior to this commit. This commit th...
spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java
@@ -102,6 +102,7 @@ public MockHttpSession(ServletContext servletContext, String id) { @Override public long getCreationTime() { + assertIsValid(); return this.creationTime; } @@ -117,6 +118,7 @@ public void access() { @Override public long getLastAccessedTime() { + assertIsValid(); return this....
true
Other
spring-projects
spring-framework
51d828816d3a50004863964d8b9c92b2a32fdc33.json
Throw ISEs in MockHttpSession for invalid session The Javadoc for several methods in HttpSession specifies that an IllegalStateException must be thrown if the method is called on an invalidated session; however, Spring's MockHttpSession did not implement this behavior consistently prior to this commit. This commit th...
spring-test/src/test/java/org/springframework/mock/web/MockHttpSessionTests.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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,7 @@ */ public class MockHttpSe...
true
Other
spring-projects
spring-framework
86591e5e5aeb7eead1798069d8b6f9c1790f4b9d.json
Support implicit ports in MHSR.getRequestURL() Prior to this commit, MockHttpServletRequest.getRequestURL() always included the server port number in the reconstructed request URL, even for implicit ports (i.e., 80 and 443) and negative ports. MockHttpServletRequest.getRequestURL() now omits the port number when reco...
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
@@ -36,6 +36,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; + import javax.servlet.AsyncContext; import javax.servlet.DispatcherType; import javax.servlet.RequestDispatcher; @@ -946,8 +947,13 @@ public String getRequestURI() { @Override public StringBuffer getRequestURL() { - Str...
true
Other
spring-projects
spring-framework
86591e5e5aeb7eead1798069d8b6f9c1790f4b9d.json
Support implicit ports in MHSR.getRequestURL() Prior to this commit, MockHttpServletRequest.getRequestURL() always included the server port number in the reconstructed request URL, even for implicit ports (i.e., 80 and 443) and negative ports. MockHttpServletRequest.getRequestURL() now omits the port number when reco...
spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
@@ -193,6 +193,39 @@ public void setPreferredLocales() { assertEqualEnumerations(Collections.enumeration(preferredLocales), request.getLocales()); } + @Test + public void getRequestURL() { + request.setServerPort(8080); + request.setRequestURI("/path"); + assertEquals("http://localhost:8080/path", request.get...
true
Other
spring-projects
spring-framework
b305f0005b2836faf49da234015cc1f9f83ffb85.json
Add test to assess claims in SPR-10411 This commit verifies that the return type of a parameterized instance factory method is properly resolved. Issue: SPR-10411
spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java
@@ -16,13 +16,9 @@ package org.springframework.beans.factory.support; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.j...
false
Other
spring-projects
spring-framework
b3a693e356302222e1844efa92fa7cb4f450bca7.json
Add test to assess claim in SPR-10330 This commit verifies that JdbcTestUtils.readScript() properly handles SQL comments prefixed by tab characters. Issue: SPR-10330
spring-test/src/test/java/org/springframework/test/jdbc/JdbcTestUtilsTests.java
@@ -48,6 +48,7 @@ public class JdbcTestUtilsTests { @Mock private JdbcTemplate jdbcTemplate; + @Test public void containsDelimiters() { assertTrue("test with ';' is wrong", !JdbcTestUtils.containsSqlScriptDelimiters("select 1\n select ';'", ';')); @@ -117,6 +118,33 @@ public void readAndSplitScriptContaini...
true
Other
spring-projects
spring-framework
b3a693e356302222e1844efa92fa7cb4f450bca7.json
Add test to assess claim in SPR-10330 This commit verifies that JdbcTestUtils.readScript() properly handles SQL comments prefixed by tab characters. Issue: SPR-10330
spring-test/src/test/resources/org/springframework/test/jdbc/test-data-with-comments-and-leading-tabs.sql
@@ -0,0 +1,9 @@ +-- The next comment line starts with a tab. + -- x, y, z... + +insert into customer (id, name) +values (1, 'Sam Brannen'); + -- This is also a comment with a leading tab. +insert into orders(id, order_date, customer_id) values (1, '2013-06-08', 1); + -- This is also a comment with a leading tab, a sp...
true
Other
spring-projects
spring-framework
239ce1466ce118294f5c7b8e842a80815fd813de.json
Update @Conditional processing logic Defer @Conditional processing on @Configuration classes until the bean definitions are loaded, rather than when the @Configuration class is parsed. This provides better support for @Conditional implementations that inspect bean definitions. This commit also fixes some minor proble...
spring-context/src/main/java/org/springframework/context/annotation/AnnotatedBeanDefinitionReader.java
@@ -92,7 +92,7 @@ public final BeanDefinitionRegistry getRegistry() { /** * Set the Environment to use when evaluating whether - * {@link Profile @Profile}-annotated component classes should be registered. + * {@link Conditional @Conditional}-annotated component classes should be registered. * <p>The defaul...
true
Other
spring-projects
spring-framework
239ce1466ce118294f5c7b8e842a80815fd813de.json
Update @Conditional processing logic Defer @Conditional processing on @Configuration classes until the bean definitions are loaded, rather than when the @Configuration class is parsed. This provides better support for @Conditional implementations that inspect bean definitions. This commit also fixes some minor proble...
spring-context/src/main/java/org/springframework/context/annotation/ClassPathBeanDefinitionScanner.java
@@ -31,6 +31,7 @@ import org.springframework.core.env.EnvironmentCapable; import org.springframework.core.env.StandardEnvironment; import org.springframework.core.io.ResourceLoader; +import org.springframework.core.type.classreading.MetadataReader; import org.springframework.util.Assert; import org.springframework...
true
Other
spring-projects
spring-framework
239ce1466ce118294f5c7b8e842a80815fd813de.json
Update @Conditional processing logic Defer @Conditional processing on @Configuration classes until the bean definitions are loaded, rather than when the @Configuration class is parsed. This provides better support for @Conditional implementations that inspect bean definitions. This commit also fixes some minor proble...
spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
@@ -25,12 +25,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; import org.springframework.beans.factory.config.BeanDefini...
true
Other
spring-projects
spring-framework
239ce1466ce118294f5c7b8e842a80815fd813de.json
Update @Conditional processing logic Defer @Conditional processing on @Configuration classes until the bean definitions are loaded, rather than when the @Configuration class is parsed. This provides better support for @Conditional implementations that inspect bean definitions. This commit also fixes some minor proble...
spring-context/src/main/java/org/springframework/context/annotation/ConditionContext.java
@@ -31,8 +31,8 @@ public interface ConditionContext { /** * Returns the {@link BeanDefinitionRegistry} that will hold the bean definition - * should the condition match. - * @return the registry (never {@code null}) + * should the condition match or {@code null} if the registry is not available. + * @return ...
true
Other
spring-projects
spring-framework
239ce1466ce118294f5c7b8e842a80815fd813de.json
Update @Conditional processing logic Defer @Conditional processing on @Configuration classes until the bean definitions are loaded, rather than when the @Configuration class is parsed. This provides better support for @Conditional implementations that inspect bean definitions. This commit also fixes some minor proble...
spring-context/src/main/java/org/springframework/context/annotation/ConditionEvaluator.java
@@ -0,0 +1,213 @@ +/* + * Copyright 2002-2013 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
239ce1466ce118294f5c7b8e842a80815fd813de.json
Update @Conditional processing logic Defer @Conditional processing on @Configuration classes until the bean definitions are loaded, rather than when the @Configuration class is parsed. This provides better support for @Conditional implementations that inspect bean definitions. This commit also fixes some minor proble...
spring-context/src/main/java/org/springframework/context/annotation/ConditionalAnnotationHelper.java
@@ -1,217 +0,0 @@ -/* - * Copyright 2002-2013 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
239ce1466ce118294f5c7b8e842a80815fd813de.json
Update @Conditional processing logic Defer @Conditional processing on @Configuration classes until the bean definitions are loaded, rather than when the @Configuration class is parsed. This provides better support for @Conditional implementations that inspect bean definitions. This commit also fixes some minor proble...
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java
@@ -16,6 +16,7 @@ package org.springframework.context.annotation; +import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; @@ -61,6 +62,9 @@ final class ConfigurationClass { private final Map<String, Class<? extends BeanDefinitionReader>> importe...
true
Other
spring-projects
spring-framework
239ce1466ce118294f5c7b8e842a80815fd813de.json
Update @Conditional processing logic Defer @Conditional processing on @Configuration classes until the bean definitions are loaded, rather than when the @Configuration class is parsed. This provides better support for @Conditional implementations that inspect bean definitions. This commit also fixes some minor proble...
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
@@ -16,8 +16,6 @@ package org.springframework.context.annotation; -import static org.springframework.context.annotation.MetadataUtils.attributesFor; - import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; @@ -28,6 +26,7 @@ import org.apache.commons.logging.Log; import org.apa...
true
Other
spring-projects
spring-framework
239ce1466ce118294f5c7b8e842a80815fd813de.json
Update @Conditional processing logic Defer @Conditional processing on @Configuration classes until the bean definitions are loaded, rather than when the @Configuration class is parsed. This provides better support for @Conditional implementations that inspect bean definitions. This commit also fixes some minor proble...
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
@@ -76,7 +76,8 @@ * * <p>This class helps separate the concern of parsing the structure of a Configuration * class from the concern of registering BeanDefinition objects based on the - * content of that model. + * content of that model (with the exception of {@code @ComponentScan} annotations which + * need to be...
true
Other
spring-projects
spring-framework
239ce1466ce118294f5c7b8e842a80815fd813de.json
Update @Conditional processing logic Defer @Conditional processing on @Configuration classes until the bean definitions are loaded, rather than when the @Configuration class is parsed. This provides better support for @Conditional implementations that inspect bean definitions. This commit also fixes some minor proble...
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
@@ -26,7 +26,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.BeanDefinitionStoreException; @@ -305,12 +304,8 @@ publ...
true
Other
spring-projects
spring-framework
239ce1466ce118294f5c7b8e842a80815fd813de.json
Update @Conditional processing logic Defer @Conditional processing on @Configuration classes until the bean definitions are loaded, rather than when the @Configuration class is parsed. This provides better support for @Conditional implementations that inspect bean definitions. This commit also fixes some minor proble...
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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.
true
Other
spring-projects
spring-framework
239ce1466ce118294f5c7b8e842a80815fd813de.json
Update @Conditional processing logic Defer @Conditional processing on @Configuration classes until the bean definitions are loaded, rather than when the @Configuration class is parsed. This provides better support for @Conditional implementations that inspect bean definitions. This commit also fixes some minor proble...
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassWithConditionTests.java
@@ -46,20 +46,41 @@ public class ConfigurationClassWithConditionTests { public ExpectedException thrown = ExpectedException.none(); @Test - public void conditionalOnBeanMatch() throws Exception { + public void conditionalOnMissingBeanMatch() throws Exception { AnnotationConfigApplicationContext ctx = new Annot...
true
Other
spring-projects
spring-framework
239ce1466ce118294f5c7b8e842a80815fd813de.json
Update @Conditional processing logic Defer @Conditional processing on @Configuration classes until the bean definitions are loaded, rather than when the @Configuration class is parsed. This provides better support for @Conditional implementations that inspect bean definitions. This commit also fixes some minor proble...
spring-context/src/test/java/org/springframework/context/annotation/componentscan/simple/SimpleComponent.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2013 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.
true
Other
spring-projects
spring-framework
a8fd832818af60140ac3e4660d1a26bd3944ab8b.json
Support meta @Component with non-string value Update AnnotationBeanNameGenerator to only use the value attribute of a @Component meta-annotated annotation when it is a String. Issue: SPR-10580
spring-context/src/main/java/org/springframework/context/annotation/AnnotationBeanNameGenerator.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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. @@ -117,7 +117,10 @@ protected boolean isStereo...
true
Other
spring-projects
spring-framework
a8fd832818af60140ac3e4660d1a26bd3944ab8b.json
Support meta @Component with non-string value Update AnnotationBeanNameGenerator to only use the value attribute of a @Component meta-annotated annotation when it is a String. Issue: SPR-10580
spring-context/src/test/java/org/springframework/context/annotation/AnnotationBeanNameGeneratorTests.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2013 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,16 +16,21 @@ package org.springframew...
true
Other
spring-projects
spring-framework
8ae88c20d1e8808d852e37908da2a5fc6b5e077a.json
Add support for resolving message headers This change adds support for @Header and @Headers annotated method arguments to spring-messaging. Also supported are arguments of type MessageHeaders, and MessageHeaderAccessor (including sub-types of MessageHeaderAccessort as long as they provide a wrap(Message<?>) static fac...
spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolutionException.java
@@ -19,9 +19,10 @@ import org.springframework.messaging.MessagingException; /** - * Thrown by a ChannelResolver when it cannot resolve a channel name. + * Thrown by a {@link DestinationResolver} when it cannot resolve a destination. * * @author Mark Fisher + * @author Rossen Stoyanchev * @since 4.0 */ @Sup...
true
Other
spring-projects
spring-framework
8ae88c20d1e8808d852e37908da2a5fc6b5e077a.json
Add support for resolving message headers This change adds support for @Header and @Headers annotated method arguments to spring-messaging. Also supported are arguments of type MessageHeaders, and MessageHeaderAccessor (including sub-types of MessageHeaderAccessort as long as they provide a wrap(Message<?>) static fac...
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/Header.java
@@ -0,0 +1,56 @@ +/* + * Copyright 2002-2012 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
8ae88c20d1e8808d852e37908da2a5fc6b5e077a.json
Add support for resolving message headers This change adds support for @Header and @Headers annotated method arguments to spring-messaging. Also supported are arguments of type MessageHeaders, and MessageHeaderAccessor (including sub-types of MessageHeaderAccessort as long as they provide a wrap(Message<?>) static fac...
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/Headers.java
@@ -22,27 +22,18 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.messaging.Message; - /** - * Annotation indicating a method parameter should be bound to the body of a - * {@link Message}. + * Annotation which indicates that a method parameter shoul...
true
Other
spring-projects
spring-framework
8ae88c20d1e8808d852e37908da2a5fc6b5e077a.json
Add support for resolving message headers This change adds support for @Header and @Headers annotated method arguments to spring-messaging. Also supported are arguments of type MessageHeaders, and MessageHeaderAccessor (including sub-types of MessageHeaderAccessort as long as they provide a wrap(Message<?>) static fac...
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/Payload.java
@@ -0,0 +1,49 @@ +/* + * Copyright 2002-2012 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
8ae88c20d1e8808d852e37908da2a5fc6b5e077a.json
Add support for resolving message headers This change adds support for @Header and @Headers annotated method arguments to spring-messaging. Also supported are arguments of type MessageHeaders, and MessageHeaderAccessor (including sub-types of MessageHeaderAccessort as long as they provide a wrap(Message<?>) static fac...
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/ValueConstants.java
@@ -0,0 +1,38 @@ +/* + * Copyright 2002-2012 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
8ae88c20d1e8808d852e37908da2a5fc6b5e077a.json
Add support for resolving message headers This change adds support for @Header and @Headers annotated method arguments to spring-messaging. Also supported are arguments of type MessageHeaders, and MessageHeaderAccessor (including sub-types of MessageHeaderAccessort as long as they provide a wrap(Message<?>) static fac...
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java
@@ -0,0 +1,240 @@ +/* + * Copyright 2002-2013 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
8ae88c20d1e8808d852e37908da2a5fc6b5e077a.json
Add support for resolving message headers This change adds support for @Header and @Headers annotated method arguments to spring-messaging. Also supported are arguments of type MessageHeaders, and MessageHeaderAccessor (including sub-types of MessageHeaderAccessort as long as they provide a wrap(Message<?>) static fac...
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolver.java
@@ -0,0 +1,71 @@ +/* + * Copyright 2002-2013 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
8ae88c20d1e8808d852e37908da2a5fc6b5e077a.json
Add support for resolving message headers This change adds support for @Header and @Headers annotated method arguments to spring-messaging. Also supported are arguments of type MessageHeaders, and MessageHeaderAccessor (including sub-types of MessageHeaderAccessort as long as they provide a wrap(Message<?>) static fac...
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolver.java
@@ -0,0 +1,77 @@ +/* + * Copyright 2002-2013 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
8ae88c20d1e8808d852e37908da2a5fc6b5e077a.json
Add support for resolving message headers This change adds support for @Header and @Headers annotated method arguments to spring-messaging. Also supported are arguments of type MessageHeaders, and MessageHeaderAccessor (including sub-types of MessageHeaderAccessort as long as they provide a wrap(Message<?>) static fac...
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/MessageBodyMethodArgumentResolver.java
@@ -1,72 +0,0 @@ -/* - * Copyright 2002-2013 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
8ae88c20d1e8808d852e37908da2a5fc6b5e077a.json
Add support for resolving message headers This change adds support for @Header and @Headers annotated method arguments to spring-messaging. Also supported are arguments of type MessageHeaders, and MessageHeaderAccessor (including sub-types of MessageHeaderAccessort as long as they provide a wrap(Message<?>) static fac...
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/MessageHandlingException.java
@@ -0,0 +1,40 @@ +/* + * Copyright 2002-2013 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
8ae88c20d1e8808d852e37908da2a5fc6b5e077a.json
Add support for resolving message headers This change adds support for @Header and @Headers annotated method arguments to spring-messaging. Also supported are arguments of type MessageHeaders, and MessageHeaderAccessor (including sub-types of MessageHeaderAccessort as long as they provide a wrap(Message<?>) static fac...
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolver.java
@@ -0,0 +1,88 @@ +/* + * Copyright 2002-2013 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
8ae88c20d1e8808d852e37908da2a5fc6b5e077a.json
Add support for resolving message headers This change adds support for @Header and @Headers annotated method arguments to spring-messaging. Also supported are arguments of type MessageHeaders, and MessageHeaderAccessor (including sub-types of MessageHeaderAccessort as long as they provide a wrap(Message<?>) static fac...
spring-messaging/src/main/java/org/springframework/messaging/simp/handler/AnnotationMethodMessageHandler.java
@@ -31,19 +31,25 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeansException; import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.ApplicationContext; import org.s...
true
Other
spring-projects
spring-framework
8ae88c20d1e8808d852e37908da2a5fc6b5e077a.json
Add support for resolving message headers This change adds support for @Header and @Headers annotated method arguments to spring-messaging. Also supported are arguments of type MessageHeaders, and MessageHeaderAccessor (including sub-types of MessageHeaderAccessort as long as they provide a wrap(Message<?>) static fac...
spring-messaging/src/main/java/org/springframework/messaging/support/NativeMessageHeaderAccessor.java
@@ -49,19 +49,18 @@ public class NativeMessageHeaderAccessor extends MessageHeaderAccessor { /** * A constructor for creating new headers, accepting an optional native header map. */ - public NativeMessageHeaderAccessor(Map<String, List<String>> nativeHeaders) { + protected NativeMessageHeaderAccessor(Map<Strin...
true
Other
spring-projects
spring-framework
8ae88c20d1e8808d852e37908da2a5fc6b5e077a.json
Add support for resolving message headers This change adds support for @Header and @Headers annotated method arguments to spring-messaging. Also supported are arguments of type MessageHeaders, and MessageHeaderAccessor (including sub-types of MessageHeaderAccessort as long as they provide a wrap(Message<?>) static fac...
spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolverTests.java
@@ -0,0 +1,117 @@ +/* + * Copyright 2002-2013 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
8ae88c20d1e8808d852e37908da2a5fc6b5e077a.json
Add support for resolving message headers This change adds support for @Header and @Headers annotated method arguments to spring-messaging. Also supported are arguments of type MessageHeaders, and MessageHeaderAccessor (including sub-types of MessageHeaderAccessort as long as they provide a wrap(Message<?>) static fac...
spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolverTests.java
@@ -0,0 +1,146 @@ +/* + * Copyright 2002-2013 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
8ae88c20d1e8808d852e37908da2a5fc6b5e077a.json
Add support for resolving message headers This change adds support for @Header and @Headers annotated method arguments to spring-messaging. Also supported are arguments of type MessageHeaders, and MessageHeaderAccessor (including sub-types of MessageHeaderAccessort as long as they provide a wrap(Message<?>) static fac...
spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolverTests.java
@@ -0,0 +1,85 @@ +/* + * Copyright 2002-2013 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
8ae88c20d1e8808d852e37908da2a5fc6b5e077a.json
Add support for resolving message headers This change adds support for @Header and @Headers annotated method arguments to spring-messaging. Also supported are arguments of type MessageHeaders, and MessageHeaderAccessor (including sub-types of MessageHeaderAccessort as long as they provide a wrap(Message<?>) static fac...
spring-messaging/src/test/java/org/springframework/messaging/simp/handler/AnnotationMethodMessageHandlerTests.java
@@ -16,40 +16,103 @@ package org.springframework.messaging.simp.handler; +import java.util.LinkedHashMap; +import java.util.Map; + +import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; import org.springframework.context.support.StaticApplicationContext; +import org.springframework.messagi...
true
Other
spring-projects
spring-framework
8ae88c20d1e8808d852e37908da2a5fc6b5e077a.json
Add support for resolving message headers This change adds support for @Header and @Headers annotated method arguments to spring-messaging. Also supported are arguments of type MessageHeaders, and MessageHeaderAccessor (including sub-types of MessageHeaderAccessort as long as they provide a wrap(Message<?>) static fac...
spring-web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolverTests.java
@@ -16,12 +16,6 @@ package org.springframework.web.method.annotation; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.lang.r...
true
Other
spring-projects
spring-framework
0e7769b5bb92ef62f7abb36954e0434b58d9334b.json
Add Reference to Spring AMQP Remoting in docs Beginning with 1.2.0, Spring AMQP now supports remoting over AMQP with a proxy factory bean an invoker service exporter. Add documentation to the Spring Framework remoting section with a link to the Spring AMQP documentation. Issue: SPR-10501
src/reference/docbook/remoting.xml
@@ -63,6 +63,11 @@ <classname>JmsInvokerServiceExporter</classname> and <classname>JmsInvokerProxyFactoryBean</classname> classes.</para> </listitem> + + <listitem> + <para><emphasis>AMQP</emphasis>. Remoting using AMQP as the underlying + protocol is supported by...
false
Other
spring-projects
spring-framework
03daf593b264a009632ccb94efd29ce540f78388.json
Fix Cache documentation Fixed malformed code snippets, formatted whitespace and changed invalid external link.
src/reference/docbook/cache.xml
@@ -113,7 +113,7 @@ public Book findBook(ISBN isbn) {...}]]></programlisting> obvious when the target method has multiple arguments out of which only some are suitable for caching (while the rest are used only by the method logic). For example:</para> <programlisting language="java"><![CDATA...
false
Other
spring-projects
spring-framework
7d3b6497b5e95eaa212cf2dd985d6a7e686e2940.json
Add support for MIME-based message conversion The MessageConverter interface in spring-messaging is now explicitly designed to support conversion of the payload of a Message<?> to and from serialized form based on MIME type message header. By default, the MessageHeaders.CONTENT_HEADER header is used but a custom Conte...
spring-messaging/src/main/java/org/springframework/messaging/core/AbstractDestinationResolvingMessagingTemplate.java
@@ -15,16 +15,22 @@ */ package org.springframework.messaging.core; +import java.util.Map; + import org.springframework.messaging.Message; import org.springframework.util.Assert; /** + * Base class for a messaging template that can resolve String-based destinations. + * * @author Mark Fisher + * @author Ro...
true
Other
spring-projects
spring-framework
7d3b6497b5e95eaa212cf2dd985d6a7e686e2940.json
Add support for MIME-based message conversion The MessageConverter interface in spring-messaging is now explicitly designed to support conversion of the payload of a Message<?> to and from serialized form based on MIME type message header. By default, the MessageHeaders.CONTENT_HEADER header is used but a custom Conte...
spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessageSendingTemplate.java
@@ -15,17 +15,27 @@ */ package org.springframework.messaging.core; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Map; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.messaging.Message; +import org.springframework.me...
true
Other
spring-projects
spring-framework
7d3b6497b5e95eaa212cf2dd985d6a7e686e2940.json
Add support for MIME-based message conversion The MessageConverter interface in spring-messaging is now explicitly designed to support conversion of the payload of a Message<?> to and from serialized form based on MIME type message header. By default, the MessageHeaders.CONTENT_HEADER header is used but a custom Conte...
spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessagingTemplate.java
@@ -15,11 +15,17 @@ */ package org.springframework.messaging.core; +import java.util.Map; + import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; /** + * Base class for a messaging template that send and receive messages. + * * @author Mark Fisher + * @author R...
true
Other
spring-projects
spring-framework
7d3b6497b5e95eaa212cf2dd985d6a7e686e2940.json
Add support for MIME-based message conversion The MessageConverter interface in spring-messaging is now explicitly designed to support conversion of the payload of a Message<?> to and from serialized form based on MIME type message header. By default, the MessageHeaders.CONTENT_HEADER header is used but a custom Conte...
spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageReceivingOperations.java
@@ -20,13 +20,16 @@ /** + * A {@link MessageReceivingOperations} that can resolve a String-based destinations. + * * @author Mark Fisher + * @author Rossen Stoyanchev * @since 4.0 */ public interface DestinationResolvingMessageReceivingOperations<D> extends MessageReceivingOperations<D> { <P> Message<P>...
true
Other
spring-projects
spring-framework
7d3b6497b5e95eaa212cf2dd985d6a7e686e2940.json
Add support for MIME-based message conversion The MessageConverter interface in spring-messaging is now explicitly designed to support conversion of the payload of a Message<?> to and from serialized form based on MIME type message header. By default, the MessageHeaders.CONTENT_HEADER header is used but a custom Conte...
spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageRequestReplyOperations.java
@@ -15,19 +15,33 @@ */ package org.springframework.messaging.core; +import java.util.Map; + import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; /** + * A {@link MessageRequestReplyOperations} that can resolve a String-based destinations. + * * @author Mar...
true
Other
spring-projects
spring-framework
7d3b6497b5e95eaa212cf2dd985d6a7e686e2940.json
Add support for MIME-based message conversion The MessageConverter interface in spring-messaging is now explicitly designed to support conversion of the payload of a Message<?> to and from serialized form based on MIME type message header. By default, the MessageHeaders.CONTENT_HEADER header is used but a custom Conte...
spring-messaging/src/main/java/org/springframework/messaging/core/DestinationResolvingMessageSendingOperations.java
@@ -15,12 +15,17 @@ */ package org.springframework.messaging.core; +import java.util.Map; + import org.springframework.messaging.Message; import org.springframework.messaging.MessagingException; /** + * A {@link MessageSendingOperations} that can resolve a String-based destinations. + * * @author Mark Fis...
true
Other
spring-projects
spring-framework
7d3b6497b5e95eaa212cf2dd985d6a7e686e2940.json
Add support for MIME-based message conversion The MessageConverter interface in spring-messaging is now explicitly designed to support conversion of the payload of a Message<?> to and from serialized form based on MIME type message header. By default, the MessageHeaders.CONTENT_HEADER header is used but a custom Conte...
spring-messaging/src/main/java/org/springframework/messaging/core/GenericMessagingTemplate.java
@@ -33,6 +33,9 @@ /** + * A messaging template for sending to and/or receiving messages from a + * {@link MessageChannel}. + * * @author Mark Fisher * @since 4.0 */
true