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
08f3a7982192e3f1aee9f31c61fb98022fc3b0ac.json
Fix broken test in EnableSchedulingTests Commit 65d163e changed the textual message of an exception thrown by ScheduledAnnotationBeanPostProcessor.afterSingletonsInstantiated(), and this in turn caused the withAmbiguousTaskSchedulers_andSingleTask() method in EnableSchedulingTests to start failing (albeit only during ...
spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 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. @@ -41,6 +41,7 @@ * Tests use of @EnableSched...
false
Other
spring-projects
spring-framework
f5201e3ca000acb44a318d3157b7628779fe5e6b.json
Remove link to forums in README
README.md
@@ -1,30 +1,29 @@ ## Spring Framework The Spring Framework provides a comprehensive programming and configuration -model for modern Java-based enterprise applications - on any kind of deployment +model for modern Java-based enterprise applications -- on any kind of deployment platform. A key element of Spring is inf...
false
Other
spring-projects
spring-framework
e9e5149001d813806a04d9e1a349bbc899fceba9.json
Fix cleanEclipseJdtUi task in the Gradle build
gradle/ide.gradle
@@ -85,8 +85,8 @@ task eclipseJdtPrepare(type: Copy) { } task cleanEclipseJdtUi(type: Delete) { + delete project.file(".settings/org.eclipse.jdt.core.prefs") delete project.file(".settings/org.eclipse.jdt.ui.prefs") - delete project.file("org.eclipse.jdt.core.prefs") delete project.file(".settings/org.eclipse.w...
false
Other
spring-projects
spring-framework
a79fe25917e38b0bf8ae1f11a80b22987e3be2df.json
Restore default transaction manager by name lookup Fix a regression introduced by 961574bd17b that prevents a proper lookup of the default transaction manager by name as the absence of a qualifier is represented by an empty string (passing the faulty null check). Issue: SPR-12577
spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
@@ -353,16 +353,12 @@ protected PlatformTransactionManager determineTransactionManager(TransactionAttr if (txAttr == null || this.beanFactory == null) { return getTransactionManager(); } - String qualifier = (txAttr.getQualifier() != null ? - txAttr.getQualifier() : this.transactionManagerBeanName); + St...
true
Other
spring-projects
spring-framework
a79fe25917e38b0bf8ae1f11a80b22987e3be2df.json
Restore default transaction manager by name lookup Fix a regression introduced by 961574bd17b that prevents a proper lookup of the default transaction manager by name as the absence of a qualifier is represented by an empty string (passing the faulty null check). Issue: SPR-12577
spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
@@ -126,31 +126,31 @@ public void serializableWithCompositeSource() throws Exception { @Test public void determineTransactionManagerWithNoBeanFactory() { PlatformTransactionManager transactionManager = mock(PlatformTransactionManager.class); - TransactionInterceptor ti = createTestTransactionInterceptor(null, t...
true
Other
spring-projects
spring-framework
3bfe4dcca7ec9e6b2bb2e21a5d5b7c6737f60216.json
Switch responseEncodedHtmlEscape default to true Issue: SPR-12369
spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java
@@ -265,6 +265,8 @@ else if (localeResolver != null) { // context-param in web.xml, if any. this.defaultHtmlEscape = WebUtils.getDefaultHtmlEscape(this.webApplicationContext.getServletContext()); + // Determine response-encoded HTML escape setting from the "responseEncodedHtmlEscape" + // context-param in web...
false
Other
spring-projects
spring-framework
51367dec052e9acad37bed52e95885a33a610984.json
Refine condition to send WebSocket binary messages The following two refinements have been added: 1) SockJS doesn't support binary messages so don't even try 2) don't bother if payload.length == 0 Issue: SPR-12475
spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
@@ -28,7 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; @@ -52,7 +51,6 @@ import ...
true
Other
spring-projects
spring-framework
51367dec052e9acad37bed52e95885a33a610984.json
Refine condition to send WebSocket binary messages The following two refinements have been added: 1) SockJS doesn't support binary messages so don't even try 2) don't bother if payload.length == 0 Issue: SPR-12475
spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java
@@ -16,6 +16,20 @@ package org.springframework.web.socket.messaging; +import static org.hamcrest.Matchers.is; +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 o...
true
Other
spring-projects
spring-framework
73c21fbac1d629a460dfc3292a0fb482e591142b.json
Define JCache aspect Align default aop.xml configuration to define the JCache aspect alongside the regular Spring cache aspect. Issue: SPR-12571
spring-aspects/src/main/resources/META-INF/aop.xml
@@ -14,6 +14,7 @@ <aspect name="org.springframework.scheduling.aspectj.AnnotationAsyncExecutionAspect"/> <aspect name="org.springframework.transaction.aspectj.AnnotationTransactionAspect"/> <aspect name="org.springframework.cache.aspectj.AnnotationCacheAspect"/> + <aspect name="org.springframework.cache.aspec...
false
Other
spring-projects
spring-framework
961574bd17b2fe30f171646f54667b5895f0dcbf.json
Fix regression in determineTransactionManager One more (and hopefully last) attempt at making sure determineTransactionManager does not break existing use cases. This commit prevents any lookup if no transaction attributes are set which is more compliant with the original version and prevents a lookup if a non existi...
spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
@@ -349,35 +349,30 @@ protected void clearTransactionManagerCache() { * Determine the specific transaction manager to use for the given transaction. */ protected PlatformTransactionManager determineTransactionManager(TransactionAttribute txAttr) { - if (this.beanFactory != null) { - String qualifier = txAttr...
false
Other
spring-projects
spring-framework
4a0ac97550c67c926e014903338f9c0e84fa9eee.json
Fix regression in determineTransactionManager The fix in cec26e9 for SPR-12541 actually introduced a regression when the interceptor is enabled on a method that does not require any transaction. In such a case we try to locate the default PlatformTransactionManager instead of just returning what we have (that is null)...
spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectSupport.java
@@ -352,23 +352,12 @@ protected PlatformTransactionManager determineTransactionManager(TransactionAttr if (this.beanFactory != null) { String qualifier = txAttr != null ? txAttr.getQualifier() : null; if (StringUtils.hasText(qualifier)) { - PlatformTransactionManager txManager = this.transactionManagerCac...
true
Other
spring-projects
spring-framework
4a0ac97550c67c926e014903338f9c0e84fa9eee.json
Fix regression in determineTransactionManager The fix in cec26e9 for SPR-12541 actually introduced a regression when the interceptor is enabled on a method that does not require any transaction. In such a case we try to locate the default PlatformTransactionManager instead of just returning what we have (that is null)...
spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionInterceptorTests.java
@@ -139,6 +139,14 @@ public void determineTransactionManagerWithNoBeanFactoryAndNoTransactionAttribut assertSame(transactionManager, ti.determineTransactionManager(null)); } + @Test + public void determineTransactionManagerWithNoTransactionAttribute() { + BeanFactory beanFactory = mock(BeanFactory.class); + Tr...
true
Other
spring-projects
spring-framework
ea05e0b1add86317c13997678aa01bfb73476487.json
Improve @SessionAttributes support during redirect Before this change attributes listed with @SessionAttributes would not be saved in the session when there was a redirect and the controller method declared a parameter of type RedirectAttributes. This change ensures it's the "default" model that is always the one che...
spring-web/src/main/java/org/springframework/web/method/annotation/ModelFactory.java
@@ -224,14 +224,15 @@ public static String getNameForReturnValue(Object returnValue, MethodParameter r * @throws Exception if creating BindingResult attributes fails */ public void updateModel(NativeWebRequest request, ModelAndViewContainer mavContainer) throws Exception { + ModelMap defaultModel = mavContaine...
true
Other
spring-projects
spring-framework
ea05e0b1add86317c13997678aa01bfb73476487.json
Improve @SessionAttributes support during redirect Before this change attributes listed with @SessionAttributes would not be saved in the session when there was a redirect and the controller method declared a parameter of type RedirectAttributes. This change ensures it's the "default" model that is always the one che...
spring-web/src/main/java/org/springframework/web/method/support/ModelAndViewContainer.java
@@ -137,6 +137,19 @@ private boolean useDefaultModel() { return (!this.redirectModelScenario || (this.redirectModel == null && !this.ignoreDefaultModelOnRedirect)); } + /** + * Return the "default" model created at instantiation. + * <p>In general it is recommended to use {@link #getModel()} instead which + *...
true
Other
spring-projects
spring-framework
ea05e0b1add86317c13997678aa01bfb73476487.json
Improve @SessionAttributes support during redirect Before this change attributes listed with @SessionAttributes would not be saved in the session when there was a redirect and the controller method declared a parameter of type RedirectAttributes. This change ensures it's the "default" model that is always the one che...
spring-web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java
@@ -215,6 +215,32 @@ public void updateModelSessionAttributesRemoved() throws Exception { assertNull(this.sessionAttributeStore.retrieveAttribute(this.webRequest, attributeName)); } + // SPR-12542 + + @Test + public void updateModelWhenRedirecting() throws Exception { + String attributeName = "sessionAttr"; + ...
true
Other
spring-projects
spring-framework
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/ConnectionHandlingStompSession.java
@@ -0,0 +1,40 @@ +/* + * 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
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/ConnectionLostException.java
@@ -0,0 +1,33 @@ +/* + * 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
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/DefaultStompSession.java
@@ -0,0 +1,656 @@ +/* + * 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
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/Reactor11TcpStompClient.java
@@ -0,0 +1,127 @@ +/* + * 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
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompClientSupport.java
@@ -0,0 +1,172 @@ +/* + * 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
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompEncoder.java
@@ -73,6 +73,9 @@ public byte[] encode(Map<String, Object> headers, byte[] payload) { DataOutputStream output = new DataOutputStream(baos); if (SimpMessageType.HEARTBEAT.equals(SimpMessageHeaderAccessor.getMessageType(headers))) { + if (logger.isTraceEnabled()) { + logger.trace("Encoding heartbeat"); +...
true
Other
spring-projects
spring-framework
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompFrameHandler.java
@@ -0,0 +1,45 @@ +/* + * 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
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java
@@ -162,7 +162,7 @@ else if (StompCommand.CONNECT.equals(command)) { } } - private void updateStompHeadersFromSimpMessageHeaders() { + void updateStompHeadersFromSimpMessageHeaders() { if (getDestination() != null) { setNativeHeader(STOMP_DESTINATION_HEADER, getDestination()); }
true
Other
spring-projects
spring-framework
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java
@@ -0,0 +1,528 @@ +/* + * 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
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompSession.java
@@ -0,0 +1,140 @@ +/* + * 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
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompSessionHandler.java
@@ -0,0 +1,71 @@ +/* + * 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
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompSessionHandlerAdapter.java
@@ -0,0 +1,68 @@ +/* + * 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
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-messaging/src/main/java/org/springframework/messaging/support/NativeMessageHeaderAccessor.java
@@ -25,6 +25,7 @@ import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; import org.springframework.util.ObjectUtils; /** @@ -186,6 +187,17 @@ public void addNativeHeader(String ...
true
Other
spring-projects
spring-framework
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/Reactor11TcpClient.java
@@ -196,7 +196,9 @@ protected Boolean adapt(Boolean result) { }; } finally { - this.environment.shutdown(); + if (this.environment != null) { + this.environment.shutdown(); + } } }
true
Other
spring-projects
spring-framework
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/DefaultStompSessionTests.java
@@ -0,0 +1,586 @@ +/* + * 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
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/Reactor11TcpStompClientTests.java
@@ -0,0 +1,236 @@ +/* + * 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
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompClientSupportTests.java
@@ -0,0 +1,92 @@ +/* + * 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
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-messaging/src/test/resources/log4j.properties
@@ -4,13 +4,10 @@ log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n log4j.rootCategory=WARN, console log4j.logger.org.springframework.messaging=DEBUG -log4j.logger.org.springframework.web=DEBUG log4j.logger.org.apache.activemq=TRACE + # Enable TRACE level to chase integration test issue...
true
Other
spring-projects
spring-framework
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java
@@ -0,0 +1,512 @@ +/* + * 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
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketStompClientIntegrationTests.java
@@ -0,0 +1,213 @@ +/* + * 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
d30b3eaf55463d05338b9d2492ed0ae0bce94623.json
Add STOMP client WebSocketStompClient can be used with any implementation of org.springframework.web.socket.client.WebSocketClient, which includes org.springframework.web.socket.sockjs.client.SockJsClient. Reactor11TcpStompClient can be used with reactor-net and provides STOMP over TCP. It's also possible to adapt ot...
spring-websocket/src/test/java/org/springframework/web/socket/messaging/WebSocketStompClientTests.java
@@ -0,0 +1,381 @@ +/* + * 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
a64532ede2546f5e4bdb470f6087d053201d2317.json
Add testConnection on JavaMailSender Add a way to test that a particular JavaMailSender instance can connect to the server that it is configured for. Issue: SPR-12799
spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.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. @@ -372,6 +372,21 @@ public void send(MimeMessa...
true
Other
spring-projects
spring-framework
a64532ede2546f5e4bdb470f6087d053201d2317.json
Add testConnection on JavaMailSender Add a way to test that a particular JavaMailSender instance can connect to the server that it is configured for. Issue: SPR-12799
spring-context-support/src/test/java/org/springframework/mail/javamail/JavaMailSenderTests.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. @@ -35,20 +35,29 @@ import javax.mail.internet...
true
Other
spring-projects
spring-framework
c746b10da94ad6ad0263af1f95f1abd2843e239b.json
Support @NumberFormat as a meta-annotation This commit ensures that @NumberFormat can be used as a meta-annotation, as was already the case for @DateTimeFormat. In addition, this commit polishes FormattingConversionServiceTests and MvcNamespaceTests. Issue: SPR-12743
spring-context/src/main/java/org/springframework/format/annotation/NumberFormat.java
@@ -24,7 +24,8 @@ /** * Declares that a field should be formatted as a number. - * Supports formatting by style or custom pattern string. + * + * <p>Supports formatting by style or custom pattern string. * Can be applied to any JDK {@code java.lang.Number} type. * * <p>For style-based formatting, set the {@l...
true
Other
spring-projects
spring-framework
c746b10da94ad6ad0263af1f95f1abd2843e239b.json
Support @NumberFormat as a meta-annotation This commit ensures that @NumberFormat can be used as a meta-annotation, as was already the case for @DateTimeFormat. In addition, this commit polishes FormattingConversionServiceTests and MvcNamespaceTests. Issue: SPR-12743
spring-context/src/test/java/org/springframework/format/support/FormattingConversionServiceTests.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. @@ -28,6 +28,7 @@ import org.joda.time.DateTim...
true
Other
spring-projects
spring-framework
c746b10da94ad6ad0263af1f95f1abd2843e239b.json
Support @NumberFormat as a meta-annotation This commit ensures that @NumberFormat can be used as a meta-annotation, as was already the case for @DateTimeFormat. In addition, this commit polishes FormattingConversionServiceTests and MvcNamespaceTests. Issue: SPR-12743
spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.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,14 +29,14 @@ import java.util.List; im...
true
Other
spring-projects
spring-framework
bd6d974561ad8ab8c31cd513d3816078c2b521ca.json
Fix Admonition syntax The upgrade to a more recent asciidoc format led to a bunch of of broken Admonition as the text block now requires four equal signs while previous versions tolerated only 3. Issue: SPR-12791
src/asciidoc/core-aop-api.adoc
@@ -87,11 +87,11 @@ Most MethodMatchers are static, meaning that their `isRuntime()` method returns In this case, the 3-argument matches method will never be invoked. [TIP] -=== +==== If possible, try to make pointcuts static, allowing the AOP framework to cache the results of pointcut evaluation when an AOP pr...
true
Other
spring-projects
spring-framework
bd6d974561ad8ab8c31cd513d3816078c2b521ca.json
Fix Admonition syntax The upgrade to a more recent asciidoc format led to a bunch of of broken Admonition as the text block now requires four equal signs while previous versions tolerated only 3. Issue: SPR-12791
src/asciidoc/core-aop.adoc
@@ -156,7 +156,7 @@ API: Spring AOP remains backward-compatible. See <<aop-api,the following chapter discussion of the Spring AOP APIs. [NOTE] -=== +==== One of the central tenets of the Spring Framework is that of __non-invasiveness__; this is the idea that you should not be forced to introduce framework-specifi...
true
Other
spring-projects
spring-framework
bd6d974561ad8ab8c31cd513d3816078c2b521ca.json
Fix Admonition syntax The upgrade to a more recent asciidoc format led to a bunch of of broken Admonition as the text block now requires four equal signs while previous versions tolerated only 3. Issue: SPR-12791
src/asciidoc/core-beans.adoc
@@ -2104,14 +2104,14 @@ as a <<beans-factory-scopes-singleton,singleton>>, the same instance of the `com bean is returned each time. [TIP] -=== +==== The interested reader may also find the `ServiceLocatorFactoryBean` (in the `org.springframework.beans.factory.config` package) to be of use. The approach used in ...
true
Other
spring-projects
spring-framework
bd6d974561ad8ab8c31cd513d3816078c2b521ca.json
Fix Admonition syntax The upgrade to a more recent asciidoc format led to a bunch of of broken Admonition as the text block now requires four equal signs while previous versions tolerated only 3. Issue: SPR-12791
src/asciidoc/core-expressions.adoc
@@ -1170,7 +1170,7 @@ safe navigation operator will simply return null instead of throwing an exceptio ---- [NOTE] -=== +==== The Elvis operator can be used to apply default values in expressions, e.g. in an `@Value` expression: @@ -1181,7 +1181,7 @@ The Elvis operator can be used to apply default values in exp...
true
Other
spring-projects
spring-framework
bd6d974561ad8ab8c31cd513d3816078c2b521ca.json
Fix Admonition syntax The upgrade to a more recent asciidoc format led to a bunch of of broken Admonition as the text block now requires four equal signs while previous versions tolerated only 3. Issue: SPR-12791
src/asciidoc/testing.adoc
@@ -111,14 +111,14 @@ dealing with Spring MVC `ModelAndView` objects. .Unit testing Spring MVC Controllers [TIP] -=== +==== To test your Spring MVC ++Controller++s, use `ModelAndViewAssert` combined with `MockHttpServletRequest`, `MockHttpSession`, and so on from the <<mock-objects-servlet, `org.springframework....
true
Other
spring-projects
spring-framework
bd6d974561ad8ab8c31cd513d3816078c2b521ca.json
Fix Admonition syntax The upgrade to a more recent asciidoc format led to a bunch of of broken Admonition as the text block now requires four equal signs while previous versions tolerated only 3. Issue: SPR-12791
src/asciidoc/web-mvc.adoc
@@ -449,13 +449,13 @@ on Servlet or Portlet APIs, although you can easily configure access to Servlet Portlet facilities. [TIP] -=== +==== Available in the https://github.com/spring-projects/[spring-projects Org on Github], a number of web applications leverage the annotation support described in this section ...
true
Other
spring-projects
spring-framework
bd6d974561ad8ab8c31cd513d3816078c2b521ca.json
Fix Admonition syntax The upgrade to a more recent asciidoc format led to a bunch of of broken Admonition as the text block now requires four equal signs while previous versions tolerated only 3. Issue: SPR-12791
src/asciidoc/web-portlet.adoc
@@ -1123,7 +1123,7 @@ method-level annotations 'narrowing' the primary mapping for specific portlet re parameters. [TIP] -=== +==== `@RequestMapping` at the type level may be used for plain implementations of the `Controller` interface as well. In this case, the request processing code would follow @@ -1133,7 +...
true
Other
spring-projects
spring-framework
5c9f09c2c778be2dc0def9c471ceb3061fc8472a.json
Register lazy @JmsListener components Support the creation and registration of message listener containers in a lazy manner, that is after the container initialization has completed. Such support brought an interesting brainstorming of the thread safety if JmsListenerEndpointRegistrar and JmsListenerEndpointRegistry ...
spring-jms/src/main/java/org/springframework/jms/config/JmsListenerEndpointRegistrar.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. @@ -22,6 +22,7 @@ import org.springframework.b...
true
Other
spring-projects
spring-framework
5c9f09c2c778be2dc0def9c471ceb3061fc8472a.json
Register lazy @JmsListener components Support the creation and registration of message listener containers in a lazy manner, that is after the container initialization has completed. Such support brought an interesting brainstorming of the thread safety if JmsListenerEndpointRegistrar and JmsListenerEndpointRegistry ...
spring-jms/src/main/java/org/springframework/jms/config/JmsListenerEndpointRegistry.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. @@ -18,8 +18,8 @@ import java.util.Collectio...
true
Other
spring-projects
spring-framework
5c9f09c2c778be2dc0def9c471ceb3061fc8472a.json
Register lazy @JmsListener components Support the creation and registration of message listener containers in a lazy manner, that is after the container initialization has completed. Such support brought an interesting brainstorming of the thread safety if JmsListenerEndpointRegistrar and JmsListenerEndpointRegistry ...
spring-jms/src/test/java/org/springframework/jms/annotation/EnableJmsTests.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,17 +29,22 @@ import org.springframework...
true
Other
spring-projects
spring-framework
e24a7ded620b74110141bc6d4a80ae86c74c157b.json
Simplify Groovy ContextLoaders in the TCF This commit simplifies the implementations of loadBeanDefinitions() in GenericGroovyXmlContextLoader and GenericGroovyXmlWebContextLoader. Due to the recent bug fix for GroovyBeanDefinitionReader regarding full support for XML config files, these Groovy context loaders can no...
spring-test/src/main/java/org/springframework/test/context/support/GenericGroovyXmlContextLoader.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,10 +17,8 @@ package org.springframework...
true
Other
spring-projects
spring-framework
e24a7ded620b74110141bc6d4a80ae86c74c157b.json
Simplify Groovy ContextLoaders in the TCF This commit simplifies the implementations of loadBeanDefinitions() in GenericGroovyXmlContextLoader and GenericGroovyXmlWebContextLoader. Due to the recent bug fix for GroovyBeanDefinitionReader regarding full support for XML config files, these Groovy context loaders can no...
spring-test/src/main/java/org/springframework/test/context/web/GenericGroovyXmlWebContextLoader.java
@@ -17,8 +17,6 @@ package org.springframework.test.context.web; import org.springframework.beans.factory.groovy.GroovyBeanDefinitionReader; -import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; -import org.springframework.util.StringUtils; import org.springframework.web.context.support.GenericWebA...
true
Other
spring-projects
spring-framework
fa5ea3821039db739918b335a6c06faa0ced3abc.json
Delete unused import in AsyncTests
spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java
@@ -18,7 +18,6 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; -import static org.springframework.test.web....
false
Other
spring-projects
spring-framework
4c00a3b4c850fb86943b760ba8a51fdb01a98344.json
fix javadoc typo
spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java
@@ -414,7 +414,7 @@ private boolean isNamedBeanAnAdvisorOrAdvice(String beanName) { } /** - * Create the advisor (interceptor) chain. Aadvisors that are sourced + * Create the advisor (interceptor) chain. Advisors that are sourced * from a BeanFactory will be refreshed each time a new prototype instance *...
false
Other
spring-projects
spring-framework
7a6a13201fd295a4b0fcf89cf9e5d85d6467b883.json
Fix Animal Sniffer Jasper Reports’ transitive dependency on spring-context (via castor-xml which is a new dependency in 6.0.3) was being mapped by Gradle to a dependency on the spring-context project. For reasons that I do not fully understand this was causing -source and -javadoc jars to be added to the project's com...
build.gradle
@@ -143,7 +143,6 @@ configure(allprojects) { project -> inputs.dir sourceSets.main.output.classesDir inputs.dir copyJavaApiSignature.to - outputs.upToDateWhen { true } doLast { ant.taskdef( @@ -625,6 +624,7 @@ project("spring-context-support") { exclude group: "com.fasterxml.jackson.core", module:...
false
Other
spring-projects
spring-framework
37c04bd9c8d7a1269d1088af935a5571cb6887bc.json
Fix usage of Java8 API
spring-context/src/main/java/org/springframework/context/event/ApplicationListenerMethodAdapter.java
@@ -288,8 +288,8 @@ private String getInvocationErrorMessage(Object bean, String message, Object[] r private ResolvableType resolveDeclaredEventType() { - Parameter[] parameters = this.method.getParameters(); - if (parameters.length != 1) { + int count = this.method.getParameterTypes().length; + if (count != ...
false
Other
spring-projects
spring-framework
78f3a3cb11536b5305555c70c867c9daf7c355ad.json
Update javadoc for MultipartFile.transferTo Issue: SPR-12650
spring-web/src/main/java/org/springframework/web/multipart/MultipartFile.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 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. @@ -94,6 +94,9 @@ public interface MultipartFil...
false
Other
spring-projects
spring-framework
fd426aaa4df5ae08b448d21541d375f9a9d5b3a6.json
Update Netty4ClientHttpRequestFactory buffer size Before this change, the maxRequestSize property was used (incorrectly) to limit both the size of the request and response. The change: - removes maxRequestSize and therefore no longer places limits on the size of the request thus matching to AbstractBufferingClientHtt...
spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequest.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. @@ -41,13 +41,15 @@ import org.springframework...
true
Other
spring-projects
spring-framework
fd426aaa4df5ae08b448d21541d375f9a9d5b3a6.json
Update Netty4ClientHttpRequestFactory buffer size Before this change, the maxRequestSize property was used (incorrectly) to limit both the size of the request and response. The change: - removes maxRequestSize and therefore no longer places limits on the size of the request thus matching to AbstractBufferingClientHtt...
spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequestFactory.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. @@ -35,6 +35,7 @@ import org.springframework.h...
true
Other
spring-projects
spring-framework
a32b5e61d0b5dff9c09cc3c7d7b8e5e68ac69ae5.json
Add support for Server-Sent Events This commit adds ResponseBodyEmitter and SseEmitter (and also ResponseEntity<ResponseBodyEmitter> and ResponseEntity<SseEmitter>) as new return value types supported on @RequestMapping controller methods. See Javadoc on respective types for more details. Issue: SPR-12212
spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java
@@ -213,6 +213,12 @@ * <li>A {@link org.springframework.util.concurrent.ListenableFuture} * which the application uses to produce a return value in a separate * thread of its own choosing, as an alternative to returning a Callable. + * <li>A {@link org.springframework.web.servlet.mvc.method.annotation.ResponseBod...
true
Other
spring-projects
spring-framework
a32b5e61d0b5dff9c09cc3c7d7b8e5e68ac69ae5.json
Add support for Server-Sent Events This commit adds ResponseBodyEmitter and SseEmitter (and also ResponseEntity<ResponseBodyEmitter> and ResponseEntity<SseEmitter>) as new return value types supported on @RequestMapping controller methods. See Javadoc on respective types for more details. Issue: SPR-12212
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
@@ -632,6 +632,7 @@ private List<HandlerMethodReturnValueHandler> getDefaultReturnValueHandlers() { handlers.add(new ModelAndViewMethodReturnValueHandler()); handlers.add(new ModelMethodProcessor()); handlers.add(new ViewMethodReturnValueHandler()); + handlers.add(new ResponseBodyEmitterReturnValueHandler(get...
true
Other
spring-projects
spring-framework
a32b5e61d0b5dff9c09cc3c7d7b8e5e68ac69ae5.json
Add support for Server-Sent Events This commit adds ResponseBodyEmitter and SseEmitter (and also ResponseEntity<ResponseBodyEmitter> and ResponseEntity<SseEmitter>) as new return value types supported on @RequestMapping controller methods. See Javadoc on respective types for more details. Issue: SPR-12212
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitter.java
@@ -0,0 +1,198 @@ +/* + * 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
a32b5e61d0b5dff9c09cc3c7d7b8e5e68ac69ae5.json
Add support for Server-Sent Events This commit adds ResponseBodyEmitter and SseEmitter (and also ResponseEntity<ResponseBodyEmitter> and ResponseEntity<SseEmitter>) as new return value types supported on @RequestMapping controller methods. See Javadoc on respective types for more details. Issue: SPR-12212
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandler.java
@@ -0,0 +1,211 @@ +/* + * 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
a32b5e61d0b5dff9c09cc3c7d7b8e5e68ac69ae5.json
Add support for Server-Sent Events This commit adds ResponseBodyEmitter and SseEmitter (and also ResponseEntity<ResponseBodyEmitter> and ResponseEntity<SseEmitter>) as new return value types supported on @RequestMapping controller methods. See Javadoc on respective types for more details. Issue: SPR-12212
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethod.java
@@ -25,6 +25,7 @@ import org.springframework.core.MethodParameter; import org.springframework.core.ResolvableType; import org.springframework.http.HttpStatus; +import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; import org.springframewor...
true
Other
spring-projects
spring-framework
a32b5e61d0b5dff9c09cc3c7d7b8e5e68ac69ae5.json
Add support for Server-Sent Events This commit adds ResponseBodyEmitter and SseEmitter (and also ResponseEntity<ResponseBodyEmitter> and ResponseEntity<SseEmitter>) as new return value types supported on @RequestMapping controller methods. See Javadoc on respective types for more details. Issue: SPR-12212
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitter.java
@@ -0,0 +1,233 @@ +/* + * 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
a32b5e61d0b5dff9c09cc3c7d7b8e5e68ac69ae5.json
Add support for Server-Sent Events This commit adds ResponseBodyEmitter and SseEmitter (and also ResponseEntity<ResponseBodyEmitter> and ResponseEntity<SseEmitter>) as new return value types supported on @RequestMapping controller methods. See Javadoc on respective types for more details. Issue: SPR-12212
spring-webmvc/src/main/java/org/springframework/web/servlet/support/ServletUriComponentsBuilder.java
@@ -79,7 +79,7 @@ public static ServletUriComponentsBuilder fromContextPath(HttpServletRequest req * {@code "/"} or {@code "*.do"}, the result will be the same as * if calling {@link #fromContextPath(HttpServletRequest)}. */ - public static ServletUriComponentsBuilder fromServletMapping(HttpServletRequest requ...
true
Other
spring-projects
spring-framework
a32b5e61d0b5dff9c09cc3c7d7b8e5e68ac69ae5.json
Add support for Server-Sent Events This commit adds ResponseBodyEmitter and SseEmitter (and also ResponseEntity<ResponseBodyEmitter> and ResponseEntity<SseEmitter>) as new return value types supported on @RequestMapping controller methods. See Javadoc on respective types for more details. Issue: SPR-12212
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterReturnValueHandlerTests.java
@@ -0,0 +1,235 @@ +/* + * 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
a32b5e61d0b5dff9c09cc3c7d7b8e5e68ac69ae5.json
Add support for Server-Sent Events This commit adds ResponseBodyEmitter and SseEmitter (and also ResponseEntity<ResponseBodyEmitter> and ResponseEntity<SseEmitter>) as new return value types supported on @RequestMapping controller methods. See Javadoc on respective types for more details. Issue: SPR-12212
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitterTests.java
@@ -0,0 +1,137 @@ +/* + * 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
a32b5e61d0b5dff9c09cc3c7d7b8e5e68ac69ae5.json
Add support for Server-Sent Events This commit adds ResponseBodyEmitter and SseEmitter (and also ResponseEntity<ResponseBodyEmitter> and ResponseEntity<SseEmitter>) as new return value types supported on @RequestMapping controller methods. See Javadoc on respective types for more details. Issue: SPR-12212
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitterTests.java
@@ -0,0 +1,152 @@ +/* + * 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
a32b5e61d0b5dff9c09cc3c7d7b8e5e68ac69ae5.json
Add support for Server-Sent Events This commit adds ResponseBodyEmitter and SseEmitter (and also ResponseEntity<ResponseBodyEmitter> and ResponseEntity<SseEmitter>) as new return value types supported on @RequestMapping controller methods. See Javadoc on respective types for more details. Issue: SPR-12212
src/asciidoc/index.adoc
@@ -31063,6 +31063,10 @@ The following are the supported return types: value from a thread of its own choosing. * A `ListenableFuture<?>` can be returned when the application wants to produce the return value from a thread of its own choosing. +* A `ResponseBodyEmitter` can be returned to write multiple objects ...
true
Other
spring-projects
spring-framework
6e10f7c8cf8c3edf573e9f04541f691c499b1a43.json
Update TODOs for SPR-11598
spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.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. @@ -105,7 +105,7 @@ public void getAnnotationAt...
false
Other
spring-projects
spring-framework
e97712b95b8878fec0f40f9141ad29de42f18610.json
Update copyright headers in IdGenerators
spring-core/src/main/java/org/springframework/util/AlternativeJdkIdGenerator.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.
true
Other
spring-projects
spring-framework
e97712b95b8878fec0f40f9141ad29de42f18610.json
Update copyright headers in IdGenerators
spring-core/src/main/java/org/springframework/util/IdGenerator.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,7 +19,7 @@ import java.util.UUID; /*...
true
Other
spring-projects
spring-framework
e97712b95b8878fec0f40f9141ad29de42f18610.json
Update copyright headers in IdGenerators
spring-core/src/main/java/org/springframework/util/JdkIdGenerator.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,7 +19,8 @@ import java.util.UUID; /*...
true
Other
spring-projects
spring-framework
e97712b95b8878fec0f40f9141ad29de42f18610.json
Update copyright headers in IdGenerators
spring-core/src/main/java/org/springframework/util/SimpleIdGenerator.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. @@ -20,7 +20,8 @@ import java.util.concurrent....
true
Other
spring-projects
spring-framework
52b8f34468330372f448ee13475b0a6982ee0809.json
Add JdkIdGenerator and use it in SockJS client Issue: SPR-12658
spring-core/src/main/java/org/springframework/util/AlternativeJdkIdGenerator.java
@@ -22,9 +22,11 @@ import java.util.UUID; /** - * A variation of {@link UUID#randomUUID()} that uses {@link SecureRandom} only for the - * initial seed and {@link Random} thereafter. This provides better performance in - * exchange for less securely random id's. + * An {@link org.springframework.util.IdGenerator Id...
true
Other
spring-projects
spring-framework
52b8f34468330372f448ee13475b0a6982ee0809.json
Add JdkIdGenerator and use it in SockJS client Issue: SPR-12658
spring-core/src/main/java/org/springframework/util/JdkIdGenerator.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
52b8f34468330372f448ee13475b0a6982ee0809.json
Add JdkIdGenerator and use it in SockJS client Issue: SPR-12658
spring-core/src/main/java/org/springframework/util/SimpleIdGenerator.java
@@ -0,0 +1,44 @@ +/* + * 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
52b8f34468330372f448ee13475b0a6982ee0809.json
Add JdkIdGenerator and use it in SockJS client Issue: SPR-12658
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/SockJsUrlInfo.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. @@ -19,8 +19,8 @@ import java.net.URI; import...
true
Other
spring-projects
spring-framework
0bfa124a1ed241501e8a14fd9d92d360139d7c5c.json
Remove ISE in ResourceUrlProvider Issue: SPR-12630
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.java
@@ -211,7 +211,7 @@ public final String getForLookupPath(String lookupPath) { ResourceResolverChain chain = new DefaultResourceResolverChain(handler.getResourceResolvers()); String resolved = chain.resolveUrlPath(pathWithinMapping, handler.getLocations()); if (resolved == null) { - throw new IllegalState...
false
Other
spring-projects
spring-framework
9b24cc503552cf8d51292df81c0bb0c274762930.json
Fix method documentation typo Issue: SPR-12639
src/asciidoc/index.adoc
@@ -26196,7 +26196,7 @@ of the generated key column with the `usingGeneratedKeyColumns` method. ---- The main difference when executing the insert by this second approach is that you do not -add the id to the Map and you call the `executeReturningKey` method. This returns a +add the id to the Map and you call the `...
false
Other
spring-projects
spring-framework
a4fe49e6ff03296e0f3a7c3524f0b42f73b8b269.json
Update Jetty version to 9.2.7.v20150116
build.gradle
@@ -40,7 +40,7 @@ configure(allprojects) { project -> ext.hsqldbVersion = "2.3.2" ext.jackson2Version = "2.5.0" ext.jasperReportsVersion = "6.0.0" - ext.jettyVersion = "9.2.6.v20141205" + ext.jettyVersion = "9.2.7.v20150116" ext.jodaVersion = "2.6" ext.junitVersion ...
false
Other
spring-projects
spring-framework
2bf6b41bcc02ac137d2fc4b2731057c55157d16f.json
Initialize ResourceUrlProvider only once Prior to this change, the ResourceUrlProvider would listen to ContextRefreshedEvents and autodetect resource handlers each time. This can cause issues when multiple contexts are involved and the last one has no resource handler, thus clearing the previously detected ones. This...
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlProvider.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. @@ -129,6 +129,9 @@ public void onApplicationEv...
true
Other
spring-projects
spring-framework
2bf6b41bcc02ac137d2fc4b2731057c55157d16f.json
Initialize ResourceUrlProvider only once Prior to this change, the ResourceUrlProvider would listen to ContextRefreshedEvents and autodetect resource handlers each time. This can cause issues when multiple contexts are involved and the last one has no resource handler, thus clearing the previously detected ones. This...
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.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. @@ -21,11 +21,17 @@ import java.util.List; im...
true
Other
spring-projects
spring-framework
497944f0dd9a9cb49b5f41397cb41a07a67eaf25.json
Fix minor test issues Issue: SPR-12615
spring-messaging/src/test/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistryTests.java
@@ -266,7 +266,7 @@ public void unregisterSubscription() { MultiValueMap<String, String> actual = this.registry.findSubscriptions(message(dest)); - assertEquals("Expected three elements " + actual, 2, actual.size()); + assertEquals("Expected two elements: " + actual, 2, actual.size()); assertEquals(subscrip...
true
Other
spring-projects
spring-framework
497944f0dd9a9cb49b5f41397cb41a07a67eaf25.json
Fix minor test issues Issue: SPR-12615
spring-messaging/src/test/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandlerTests.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,7 @@ package org.springframework....
true
Other
spring-projects
spring-framework
bb78c76b8c9d6e46376d3a92b4c1c8db4e54c493.json
Allow relative paths within resource location path Prior to this change, location paths used for resource handling would not allow "non-cleaned, relative paths" such as `file://home/user/static/../static/`. When checking if the resolved resource's path starts with the location path, a mismatch would happen when compar...
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.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. @@ -25,6 +25,7 @@ import org.springframework.c...
true
Other
spring-projects
spring-framework
bb78c76b8c9d6e46376d3a92b4c1c8db4e54c493.json
Allow relative paths within resource location path Prior to this change, location paths used for resource handling would not allow "non-cleaned, relative paths" such as `file://home/user/static/../static/`. When checking if the resolved resource's path starts with the location path, a mismatch would happen when compar...
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PathResourceResolverTests.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,4 +108,13 @@ public void checkServletCo...
true
Other
spring-projects
spring-framework
81c750fb1c1d54a706f256e3dc0239e10ee4fdef.json
Fix Javadoc examples
spring-test/src/main/java/org/springframework/test/web/servlet/ResultActions.java
@@ -35,12 +35,12 @@ public interface ResultActions { * static imports: MockMvcRequestBuilders.*, MockMvcResultMatchers.* * * mockMvc.perform(get("/person/1")) - * .andExpect(status.isOk()) + * .andExpect(status().isOk()) * .andExpect(content().contentType(MediaType.APPLICATION_JSON)) * .andExpe...
false
Other
spring-projects
spring-framework
1aad4da6b64e26557d98b8ddde58037a2db32303.json
Remove compiler warning
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
@@ -370,6 +370,7 @@ public void handle() { @ResponseStatus(value = HttpStatus.BAD_REQUEST, reason = "exception.user.exists") + @SuppressWarnings("serial") public static class UserAlreadyExistsException extends RuntimeException { }
false
Other
spring-projects
spring-framework
b3bfa95e2bff2a1e06b37c327a70aac54d727a1c.json
Fix ResourceUrlEncodingFilter with context mapping Prior to this change, the ResourceUrlEncodingFilter would work well when the application is mapped to "/". But when mapped to a non-empty servlet context, this filter would not properly encode URLs and apply ResourceResolver URL resolution for resources. This commit ...
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilter.java
@@ -88,7 +88,7 @@ private void initIndexLookupPath(ResourceUrlProvider urlProvider) { if (this.indexLookupPath == null) { String requestUri = urlProvider.getPathHelper().getRequestUri(this.request); String lookupPath = urlProvider.getPathHelper().getLookupPathForRequest(this.request); - this.indexLooku...
true
Other
spring-projects
spring-framework
b3bfa95e2bff2a1e06b37c327a70aac54d727a1c.json
Fix ResourceUrlEncodingFilter with context mapping Prior to this change, the ResourceUrlEncodingFilter would work well when the application is mapped to "/". But when mapped to a non-empty servlet context, this filter would not properly encode URLs and apply ResourceResolver URL resolution for resources. This commit ...
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlEncodingFilterTests.java
@@ -0,0 +1,101 @@ +/* + * Copyright 2002-2014 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 +...
true
Other
spring-projects
spring-framework
24834f6d2fd8f47100b904036249187c1e2444f6.json
Add extendMessageConverters to WebMvcConfigurer Issue: SPR-12450
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java
@@ -105,6 +105,11 @@ protected void configureMessageConverters(List<HttpMessageConverter<?>> converte this.configurers.configureMessageConverters(converters); } + @Override + protected void extendMessageConverters(List<HttpMessageConverter<?>> converters) { + this.configurers.extendMessageConverters(converters)...
true
Other
spring-projects
spring-framework
24834f6d2fd8f47100b904036249187c1e2444f6.json
Add extendMessageConverters to WebMvcConfigurer Issue: SPR-12450
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
@@ -629,6 +629,7 @@ protected final List<HttpMessageConverter<?>> getMessageConverters() { if (this.messageConverters.isEmpty()) { addDefaultHttpMessageConverters(this.messageConverters); } + extendMessageConverters(this.messageConverters); } return this.messageConverters; } @@ -646,6 +647,9 @@ p...
true
Other
spring-projects
spring-framework
24834f6d2fd8f47100b904036249187c1e2444f6.json
Add extendMessageConverters to WebMvcConfigurer Issue: SPR-12450
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java
@@ -53,14 +53,26 @@ public interface WebMvcConfigurer { void addFormatters(FormatterRegistry registry); /** - * Configure the {@link HttpMessageConverter}s to use in argument resolvers - * and return value handlers that support reading and/or writing to the - * body of the request and response. If no message c...
true
Other
spring-projects
spring-framework
24834f6d2fd8f47100b904036249187c1e2444f6.json
Add extendMessageConverters to WebMvcConfigurer Issue: SPR-12450
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java
@@ -51,6 +51,14 @@ public void addFormatters(FormatterRegistry registry) { public void configureMessageConverters(List<HttpMessageConverter<?>> converters) { } + /** + * {@inheritDoc} + * <p>This implementation is empty. + */ + @Override + public void extendMessageConverters(List<HttpMessageConverter<?>> conve...
true
Other
spring-projects
spring-framework
24834f6d2fd8f47100b904036249187c1e2444f6.json
Add extendMessageConverters to WebMvcConfigurer Issue: SPR-12450
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerComposite.java
@@ -78,6 +78,13 @@ public void configureMessageConverters(List<HttpMessageConverter<?>> converters) } } + @Override + public void extendMessageConverters(List<HttpMessageConverter<?>> converters) { + for (WebMvcConfigurer delegate : this.delegates) { + delegate.extendMessageConverters(converters); + } + } + ...
true
Other
spring-projects
spring-framework
24834f6d2fd8f47100b904036249187c1e2444f6.json
Add extendMessageConverters to WebMvcConfigurer Issue: SPR-12450
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java
@@ -29,6 +29,7 @@ import org.springframework.core.convert.ConversionService; import org.springframework.format.support.FormattingConversionService; +import org.springframework.http.HttpMessage; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.StringHttpMess...
true
Other
spring-projects
spring-framework
24834f6d2fd8f47100b904036249187c1e2444f6.json
Add extendMessageConverters to WebMvcConfigurer Issue: SPR-12450
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
@@ -33,6 +33,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageCon...
true