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
4c0490a070f1b70755384472a13a6bca9e210ca1.json
Remove Cookie support from ServerHttpRequest Although ServletHttpRequest provides access to Cookies, other implementations may not. At the moment this was only needed for SockJS to check the value of the JSESSIONID cookie. This is now down by parsing the raw cookie values locally. If comprehensive cookie support is t...
spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
@@ -29,7 +29,6 @@ import java.nio.charset.Charset; import java.security.Principal; import java.util.Arrays; -import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; @@ -40,7 +39,6 @@ import javax.servlet.http.HttpServletRequest; -import org.springframe...
true
Other
spring-projects
spring-framework
4c0490a070f1b70755384472a13a6bca9e210ca1.json
Remove Cookie support from ServerHttpRequest Although ServletHttpRequest provides access to Cookies, other implementations may not. At the moment this was only needed for SockJS to check the value of the JSESSIONID cookie. This is now down by parsing the raw cookie values locally. If comprehensive cookie support is t...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java
@@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; -import org.springframework.http.Cookie; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.h...
true
Other
spring-projects
spring-framework
9925d8385ff9e80bb3ec3bfbe2d4224538fed6a9.json
Fix configuration issues in DefaultSockJsService
spring-websocket/src/main/java/org/springframework/web/socket/server/support/WebSocketHttpRequestHandler.java
@@ -87,13 +87,8 @@ public void handleRequest(HttpServletRequest request, HttpServletResponse respon ServerHttpRequest httpRequest = new ServletServerHttpRequest(request); ServerHttpResponse httpResponse = new ServletServerHttpResponse(response); - try { - this.handshakeHandler.doHandshake(httpRequest, httpRe...
true
Other
spring-projects
spring-framework
9925d8385ff9e80bb3ec3bfbe2d4224538fed6a9.json
Fix configuration issues in DefaultSockJsService
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsService.java
@@ -46,6 +46,7 @@ import org.springframework.web.socket.sockjs.SockJsService; import org.springframework.web.socket.sockjs.support.AbstractSockJsService; import org.springframework.web.socket.sockjs.support.frame.Jackson2SockJsMessageCodec; +import org.springframework.web.socket.sockjs.support.frame.JacksonSockJsMes...
true
Other
spring-projects
spring-framework
9925d8385ff9e80bb3ec3bfbe2d4224538fed6a9.json
Fix configuration issues in DefaultSockJsService
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/JsonpReceivingTransportHandler.java
@@ -37,7 +37,7 @@ * * @author Rossen Stoyanchev */ -public class JsonpTransportHandler extends AbstractHttpReceivingTransportHandler { +public class JsonpReceivingTransportHandler extends AbstractHttpReceivingTransportHandler { private final FormHttpMessageConverter formConverter = new FormHttpMessageConverte...
true
Other
spring-projects
spring-framework
9925d8385ff9e80bb3ec3bfbe2d4224538fed6a9.json
Fix configuration issues in DefaultSockJsService
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/XhrReceivingTransportHandler.java
@@ -28,7 +28,7 @@ * * @author Rossen Stoyanchev */ -public class XhrTransportHandler extends AbstractHttpReceivingTransportHandler { +public class XhrReceivingTransportHandler extends AbstractHttpReceivingTransportHandler { @Override
true
Other
spring-projects
spring-framework
9925d8385ff9e80bb3ec3bfbe2d4224538fed6a9.json
Fix configuration issues in DefaultSockJsService
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java
@@ -17,6 +17,7 @@ package org.springframework.web.socket.sockjs.transport.handler; import java.util.Arrays; +import java.util.List; import java.util.Map; import org.junit.Before; @@ -97,6 +98,30 @@ public void defaultTransportHandlers() { assertNotNull(handlers.get(TransportType.EVENT_SOURCE)); } + @Test...
true
Other
spring-projects
spring-framework
9925d8385ff9e80bb3ec3bfbe2d4224538fed6a9.json
Fix configuration issues in DefaultSockJsService
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpReceivingTransportHandlerTests.java
@@ -32,7 +32,7 @@ /** * Test fixture for {@link AbstractHttpReceivingTransportHandler} and sub-classes - * {@link XhrTransportHandler} and {@link JsonpTransportHandler}. + * {@link XhrReceivingTransportHandler} and {@link JsonpReceivingTransportHandler}. * * @author Rossen Stoyanchev */ @@ -48,15 +48,15 @@ p...
true
Other
spring-projects
spring-framework
14ac023e01226778b8481a54a657d3f7f6e5e36b.json
Avoid use of repeated @Scheduled in tests Commented out severalFixedRatesWithRepeatedScheduledAnnotation() until we have full Java 8 support in the IDEs (e.g., Eclipse). Issue: SPR-10532
spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
@@ -128,19 +128,23 @@ public void fixedRateTaskWithInitialDelay() { assertEquals(3000L, task.getInterval()); } - @Test - public void severalFixedRates() { - BeanDefinition processorDefinition = new RootBeanDefinition(ScheduledAnnotationBeanPostProcessor.class); - BeanDefinition targetDefinition = new RootBeanD...
false
Other
spring-projects
spring-framework
5549bd909ee9c6e80368e0b32cc822e1bacde326.json
Fix typo in reference docs
src/reference/docbook/expressions.xml
@@ -458,7 +458,7 @@ Boolean b = simple.booleanList.get(0); @Autowired public void configure(MovieFinder movieFinder, - @Value("#{ systemProperties['user.region'] }"} String defaultLocale) { + @Value("#{ systemProperties['user.region'] }") String defaultLocale) { ...
false
Other
spring-projects
spring-framework
c3dd9ff342b461c1194d50f8575e9582994fb07b.json
Add test with @Schedules container annotation Issue: SPR-10532
spring-context/src/test/java/org/springframework/scheduling/annotation/ScheduledAnnotationBeanPostProcessorTests.java
@@ -46,12 +46,14 @@ * @author Mark Fisher * @author Juergen Hoeller * @author Chris Beams + * @author Sam Brannen */ public class ScheduledAnnotationBeanPostProcessorTests { + private final StaticApplicationContext context = new StaticApplicationContext(); + @Test public void fixedDelayTask() { - Static...
false
Other
spring-projects
spring-framework
ead0124b393fab17e71f6d879af54a7eefb28d56.json
Fix bug that ignored custom json prefix Issue: SPR-10817
spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
@@ -20,14 +20,6 @@ import java.lang.reflect.Type; import java.nio.charset.Charset; -import com.fasterxml.jackson.core.JsonEncoding; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; -import com....
true
Other
spring-projects
spring-framework
ead0124b393fab17e71f6d879af54a7eefb28d56.json
Fix bug that ignored custom json prefix Issue: SPR-10817
spring-web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java
@@ -26,7 +26,6 @@ import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.SerializationConfig; import org.codehaus.jackson.type.JavaType; - import org.springframework.http.HttpInputMessage; import org.springframework.http.HttpOutputMessage; import org.springframework.http.MediaType; @@ -201,...
true
Other
spring-projects
spring-framework
ead0124b393fab17e71f6d879af54a7eefb28d56.json
Fix bug that ignored custom json prefix Issue: SPR-10817
spring-web/src/test/java/org/springframework/http/converter/json/AbstractMappingJacksonHttpMessageConverterTests.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,10 +16,6 @@ package org.springframewo...
true
Other
spring-projects
spring-framework
ead0124b393fab17e71f6d879af54a7eefb28d56.json
Fix bug that ignored custom json prefix Issue: SPR-10817
spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.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. @@ -22,16 +22,17 @@ import java.util.ArrayList...
true
Other
spring-projects
spring-framework
ead0124b393fab17e71f6d879af54a7eefb28d56.json
Fix bug that ignored custom json prefix Issue: SPR-10817
spring-web/src/test/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverterTests.java
@@ -24,14 +24,14 @@ import org.codehaus.jackson.map.type.TypeFactory; import org.codehaus.jackson.type.JavaType; -import static org.junit.Assert.*; import org.junit.Test; - import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.MediaType; import org.springframework.http.Mock...
true
Other
spring-projects
spring-framework
82a26024ae17b7d3c8ba5f805c853a6df0a072e1.json
Allow @ResponseBody on the type level This change enables having @ResponseBody on the type-level in which case it inherited and does not need to be added on the method level. For added convenience, there is also a new @RestController annotation, a meta-annotation in turn annotated with @Controller and @ResponseBody. ...
spring-web/src/main/java/org/springframework/web/bind/annotation/ResponseBody.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 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. @@ -23,15 +23,18 @@ import java.lang.annotatio...
true
Other
spring-projects
spring-framework
82a26024ae17b7d3c8ba5f805c853a6df0a072e1.json
Allow @ResponseBody on the type level This change enables having @ResponseBody on the type-level in which case it inherited and does not need to be added on the method level. For added convenience, there is also a new @RestController annotation, a meta-annotation in turn annotated with @Controller and @ResponseBody. ...
spring-web/src/main/java/org/springframework/web/bind/annotation/RestController.java
@@ -0,0 +1,45 @@ +/* + * 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
82a26024ae17b7d3c8ba5f805c853a6df0a072e1.json
Allow @ResponseBody on the type level This change enables having @ResponseBody on the type-level in which case it inherited and does not need to be added on the method level. For added convenience, there is also a new @RestController annotation, a meta-annotation in turn annotated with @Controller and @ResponseBody. ...
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java
@@ -81,7 +81,8 @@ public boolean supportsParameter(MethodParameter parameter) { @Override public boolean supportsReturnType(MethodParameter returnType) { - return returnType.getMethodAnnotation(ResponseBody.class) != null; + return ((AnnotationUtils.findAnnotation(returnType.getDeclaringClass(), ResponseBody.cl...
true
Other
spring-projects
spring-framework
82a26024ae17b7d3c8ba5f805c853a6df0a072e1.json
Allow @ResponseBody on the type level This change enables having @ResponseBody on the type-level in which case it inherited and does not need to be added on the method level. For added convenience, there is also a new @RestController annotation, a meta-annotation in turn annotated with @Controller and @ResponseBody. ...
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java
@@ -16,9 +16,6 @@ package org.springframework.web.servlet.mvc.method.annotation; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - import java.io.Serializable; import java.lang.reflect.Method; import java.util.ArrayList; @@ -39,12 +36,17 @@ import org.springframewor...
true
Other
spring-projects
spring-framework
82a26024ae17b7d3c8ba5f805c853a6df0a072e1.json
Allow @ResponseBody on the type level This change enables having @ResponseBody on the type-level in which case it inherited and does not need to be added on the method level. For added convenience, there is also a new @RestController annotation, a meta-annotation in turn annotated with @Controller and @ResponseBody. ...
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java
@@ -16,14 +16,6 @@ package org.springframework.web.servlet.mvc.method.annotation; -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.junit.Assert.assertSame; -import...
true
Other
spring-projects
spring-framework
172a0b9f5d2b6caf5ed5e3d8cfe529c75ff145d5.json
Add header support to WebSocketConnectionManager Issue: SPR-10796
spring-websocket/src/main/java/org/springframework/web/socket/client/AbstractWebSocketClient.java
@@ -0,0 +1,111 @@ +/* + * 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
172a0b9f5d2b6caf5ed5e3d8cfe529c75ff145d5.json
Add header support to WebSocketConnectionManager Issue: SPR-10796
spring-websocket/src/main/java/org/springframework/web/socket/client/WebSocketConnectionManager.java
@@ -45,6 +45,8 @@ public class WebSocketConnectionManager extends ConnectionManagerSupport { private final List<String> protocols = new ArrayList<String>(); + private HttpHeaders headers; + private final boolean syncClientLifecycle; @@ -67,17 +69,41 @@ protected WebSocketHandler decorateWebSocketHandler(Web...
true
Other
spring-projects
spring-framework
172a0b9f5d2b6caf5ed5e3d8cfe529c75ff145d5.json
Add header support to WebSocketConnectionManager Issue: SPR-10796
spring-websocket/src/main/java/org/springframework/web/socket/client/endpoint/StandardWebSocketClient.java
@@ -17,11 +17,8 @@ package org.springframework.web.socket.client.endpoint; import java.net.URI; -import java.util.Arrays; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import javax.websocket.ClientEndpointConfig; import javax.websocket.ClientEndpointConfig.Conf...
true
Other
spring-projects
spring-framework
172a0b9f5d2b6caf5ed5e3d8cfe529c75ff145d5.json
Add header support to WebSocketConnectionManager Issue: SPR-10796
spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java
@@ -17,17 +17,16 @@ package org.springframework.web.socket.client.jetty; import java.net.URI; +import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.eclipse.jetty.websocket.client.ClientUpgradeRequest; import org.springframework.context.SmartLif...
true
Other
spring-projects
spring-framework
172a0b9f5d2b6caf5ed5e3d8cfe529c75ff145d5.json
Add header support to WebSocketConnectionManager Issue: SPR-10796
spring-websocket/src/test/java/org/springframework/web/socket/client/AbstractWebSocketClientTests.java
@@ -0,0 +1,26 @@ +/* + * 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
172a0b9f5d2b6caf5ed5e3d8cfe529c75ff145d5.json
Add header support to WebSocketConnectionManager Issue: SPR-10796
spring-websocket/src/test/java/org/springframework/web/socket/client/WebSocketConnectionManagerTests.java
@@ -44,14 +44,12 @@ public class WebSocketConnectionManagerTests { public void openConnection() throws Exception { List<String> subprotocols = Arrays.asList("abc"); - HttpHeaders headers = new HttpHeaders(); - headers.setSecWebSocketProtocol(subprotocols); WebSocketClient client = mock(WebSocketClient.cla...
true
Other
spring-projects
spring-framework
172a0b9f5d2b6caf5ed5e3d8cfe529c75ff145d5.json
Add header support to WebSocketConnectionManager Issue: SPR-10796
spring-websocket/src/test/java/org/springframework/web/socket/client/jetty/JettyWebSocketClientTests.java
@@ -0,0 +1,133 @@ +/* + * 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
7576274874deeccb6da6b09a8d5bd62e8b5538b7.json
Fix potential security risk when using Spring OXM Disable by default external entity resolution when using Spring OXM with jaxb. This prevents a XML entity from being able to resolve a local file on the host system. See: https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Processing Issue: SPR-10806
spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2CollectionHttpMessageConverter.java
@@ -226,7 +226,9 @@ protected void writeToResult(T t, HttpHeaders headers, Result result) throws IOE * @return the created factory */ protected XMLInputFactory createXmlInputFactory() { - return XMLInputFactory.newInstance(); + XMLInputFactory inputFactory = XMLInputFactory.newInstance(); + inputFactory.setP...
false
Other
spring-projects
spring-framework
2344412e040bf734595141f6af7d695da061c2ef.json
Fix SimpleJdbcCall and SimpleJdbcInsert Javadoc Change "fluid" interface to "fluent" and "string" to "chain", plus fix few typos in Javadoc. Issue: SPR-10792
spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcCall.java
@@ -36,21 +36,21 @@ * when the stored procedure was created. * * <p>The meta data processing is based on the DatabaseMetaData provided by - * the JDBC driver. Since we rely on the JDBC driver this "auto-detection" + * the JDBC driver. Since we rely on the JDBC driver, this "auto-detection" * can only be used fo...
true
Other
spring-projects
spring-framework
2344412e040bf734595141f6af7d695da061c2ef.json
Fix SimpleJdbcCall and SimpleJdbcInsert Javadoc Change "fluid" interface to "fluent" and "string" to "chain", plus fix few typos in Javadoc. Issue: SPR-10792
spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/SimpleJdbcInsert.java
@@ -41,7 +41,7 @@ * {@link org.springframework.jdbc.core.JdbcTemplate}. * * <p>Many of the configuration methods return the current instance of the SimpleJdbcInsert - * to provide the ability to string multiple ones together in a "fluid" interface style. + * to provide the ability to chain multiple ones together ...
true
Other
spring-projects
spring-framework
9e20a25607aeb54dc0d636727fb67b92e00dab1e.json
Introduce SubProtocolHandler abstraction Add SubProtocolHandler to encapsulate the logic for using a sub-protocol. A SubProtocolWebSocketHandler is also provided to delegate to the appropriate SubProtocolHandler based on the negotiated sub-protocol value at handshake. StompSubProtocolHandler provides handling for ST...
spring-messaging/src/main/java/org/springframework/messaging/handler/websocket/SubProtocolHandler.java
@@ -0,0 +1,94 @@ +/* + * 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
9e20a25607aeb54dc0d636727fb67b92e00dab1e.json
Introduce SubProtocolHandler abstraction Add SubProtocolHandler to encapsulate the logic for using a sub-protocol. A SubProtocolWebSocketHandler is also provided to delegate to the appropriate SubProtocolHandler based on the negotiated sub-protocol value at handshake. StompSubProtocolHandler provides handling for ST...
spring-messaging/src/main/java/org/springframework/messaging/handler/websocket/SubProtocolWebSocketHandler.java
@@ -0,0 +1,208 @@ +/* + * 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
9e20a25607aeb54dc0d636727fb67b92e00dab1e.json
Introduce SubProtocolHandler abstraction Add SubProtocolHandler to encapsulate the logic for using a sub-protocol. A SubProtocolWebSocketHandler is also provided to delegate to the appropriate SubProtocolHandler based on the negotiated sub-protocol value at handshake. StompSubProtocolHandler provides handling for ST...
spring-messaging/src/main/java/org/springframework/messaging/simp/package-info.java
@@ -1,4 +1,4 @@ /** - * Generic support for simple messaging protocols (like STOMP). + * Generic support for SImple Messaging Protocols such as STOMP. */ package org.springframework.messaging.simp;
true
Other
spring-projects
spring-framework
9e20a25607aeb54dc0d636727fb67b92e00dab1e.json
Introduce SubProtocolHandler abstraction Add SubProtocolHandler to encapsulate the logic for using a sub-protocol. A SubProtocolWebSocketHandler is also provided to delegate to the appropriate SubProtocolHandler based on the negotiated sub-protocol value at handshake. StompSubProtocolHandler provides handling for ST...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
@@ -197,7 +197,7 @@ public void start() { /** * Open a "system" session for sending messages from parts of the application - * not assoicated with a client STOMP session. + * not associated with a client STOMP session. */ private void openSystemSession() { @@ -449,12 +449,21 @@ public void forward(Messa...
true
Other
spring-projects
spring-framework
9e20a25607aeb54dc0d636727fb67b92e00dab1e.json
Introduce SubProtocolHandler abstraction Add SubProtocolHandler to encapsulate the logic for using a sub-protocol. A SubProtocolWebSocketHandler is also provided to delegate to the appropriate SubProtocolHandler based on the negotiated sub-protocol value at handshake. StompSubProtocolHandler provides handling for ST...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompProtocolHandler.java
@@ -5,44 +5,46 @@ * 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 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distri...
true
Other
spring-projects
spring-framework
9e20a25607aeb54dc0d636727fb67b92e00dab1e.json
Introduce SubProtocolHandler abstraction Add SubProtocolHandler to encapsulate the logic for using a sub-protocol. A SubProtocolWebSocketHandler is also provided to delegate to the appropriate SubProtocolHandler based on the negotiated sub-protocol value at handshake. StompSubProtocolHandler provides handling for ST...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/package-info.java
@@ -0,0 +1,4 @@ +/** + * Generic support for simple messaging protocols (like STOMP). + */ +package org.springframework.messaging.simp.stomp;
true
Other
spring-projects
spring-framework
9e20a25607aeb54dc0d636727fb67b92e00dab1e.json
Introduce SubProtocolHandler abstraction Add SubProtocolHandler to encapsulate the logic for using a sub-protocol. A SubProtocolWebSocketHandler is also provided to delegate to the appropriate SubProtocolHandler based on the negotiated sub-protocol value at handshake. StompSubProtocolHandler provides handling for ST...
spring-messaging/src/test/java/org/springframework/messaging/handler/websocket/SubProtocolWebSocketHandlerTests.java
@@ -0,0 +1,127 @@ +/* + * 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
9e20a25607aeb54dc0d636727fb67b92e00dab1e.json
Introduce SubProtocolHandler abstraction Add SubProtocolHandler to encapsulate the logic for using a sub-protocol. A SubProtocolWebSocketHandler is also provided to delegate to the appropriate SubProtocolHandler based on the negotiated sub-protocol value at handshake. StompSubProtocolHandler provides handling for ST...
spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHandler.java
@@ -20,12 +20,12 @@ * A handler for WebSocket messages and lifecycle events. * * <p>Implementations of this interface are encouraged to handle exceptions locally where - * it makes sense or alternatively let the exception bubble up in which case the exception - * is logged and the session closed with - * {@link C...
true
Other
spring-projects
spring-framework
9e20a25607aeb54dc0d636727fb67b92e00dab1e.json
Introduce SubProtocolHandler abstraction Add SubProtocolHandler to encapsulate the logic for using a sub-protocol. A SubProtocolWebSocketHandler is also provided to delegate to the appropriate SubProtocolHandler based on the negotiated sub-protocol value at handshake. StompSubProtocolHandler provides handling for ST...
spring-websocket/src/main/java/org/springframework/web/socket/support/MultiProtocolWebSocketHandler.java
@@ -1,125 +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
9e20a25607aeb54dc0d636727fb67b92e00dab1e.json
Introduce SubProtocolHandler abstraction Add SubProtocolHandler to encapsulate the logic for using a sub-protocol. A SubProtocolWebSocketHandler is also provided to delegate to the appropriate SubProtocolHandler based on the negotiated sub-protocol value at handshake. StompSubProtocolHandler provides handling for ST...
spring-websocket/src/test/java/org/springframework/web/socket/support/MultiProtocolWebSocketHandlerTests.java
@@ -1,106 +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
dcf7813de84267fb82aed351a8175e89ae7fedd8.json
Fix failing test Issue: SPR-10800
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/AbstractHttpReceivingTransportHandler.java
@@ -24,6 +24,7 @@ import org.springframework.http.MediaType; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; +import org.springframework.util.Assert; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSock...
true
Other
spring-projects
spring-framework
dcf7813de84267fb82aed351a8175e89ae7fedd8.json
Fix failing test Issue: SPR-10800
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/HttpReceivingTransportHandlerTests.java
@@ -24,9 +24,6 @@ import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.sockjs.SockJsProcessingException; -import org.springframework.web.socket.sockjs.transport.handler.AbstractHttpReceivingTransportHandler; -import org.sprin...
true
Other
spring-projects
spring-framework
3482c170e04546bc44f525f6301a8a1c11b9b014.json
Fix documentation typo
src/reference/docbook/mvc.xml
@@ -2418,7 +2418,7 @@ public String myHandleMethod(WebRequest webRequest, Model model) { public Callable&lt;String&gt; processUpload(final MultipartFile file) { return new Callable&lt;String&gt;() { - public Object call() throws Exception { + public String call() throws Exception { // ... retu...
false
Other
spring-projects
spring-framework
e5c254b081ae10021da6e2ab43ec25e195be7f53.json
Release version 4.0.0.RC1
gradle.properties
@@ -1 +1 @@ -version=4.0.0.BUILD-SNAPSHOT +version=4.0.0.RC1
false
Other
spring-projects
spring-framework
ec2429909261c7889bd4f447493d8076fe96766a.json
Delete unused imports
spring-websocket/src/main/java/org/springframework/web/socket/WebSocketMessage.java
@@ -16,9 +16,6 @@ package org.springframework.web.socket; -import org.springframework.util.Assert; -import org.springframework.util.ObjectUtils; - /** * A message that can be handled or sent on a WebSocket connection. * @@ -35,9 +32,9 @@ /** * When partial message support is available and requested via ...
true
Other
spring-projects
spring-framework
ec2429909261c7889bd4f447493d8076fe96766a.json
Delete unused imports
spring-websocket/src/main/java/org/springframework/web/socket/adapter/JettyWebSocketHandlerAdapter.java
@@ -35,8 +35,6 @@ import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.support.ExceptionWebSocketHandlerDecorator; -import java.nio.ByteBuffer; - /** * Adapts {@link WebSocketHandler} to the Jetty 9 WebSocket API. *
true
Other
spring-projects
spring-framework
2e6c998168e5537df3451fd3df0c09ae0e82a429.json
Update Javadoc for mocks regarding Servlet 3.0 Commit deba32cad9 upgraded the Servlet API mocks to Servlet 3.0; however, not all of the Javadoc was updated accordingly. This commit updates the remaining Javadoc with regard to Servlet 3.0 as the baseline for mocks in the spring-test module. In addition, this commit s...
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java
@@ -40,8 +40,9 @@ /** * Mock implementation of the {@link javax.servlet.http.HttpServletResponse} interface. * - * <p>As of Spring 4.0, this set of mocks is designed on a Servlet 3.0 baseline. Beyond that, - * this MockHttpServletResponse is also compatible with Servlet 3.1's setContentLengthLong. + * <p>As of Spr...
true
Other
spring-projects
spring-framework
2e6c998168e5537df3451fd3df0c09ae0e82a429.json
Update Javadoc for mocks regarding Servlet 3.0 Commit deba32cad9 upgraded the Servlet API mocks to Servlet 3.0; however, not all of the Javadoc was updated accordingly. This commit updates the remaining Javadoc with regard to Servlet 3.0 as the baseline for mocks in the spring-test module. In addition, this commit s...
spring-test/src/main/java/org/springframework/mock/web/MockHttpSession.java
@@ -35,7 +35,7 @@ /** * Mock implementation of the {@link javax.servlet.http.HttpSession} interface. * - * <p>Compatible with Servlet 2.5 as well as Servlet 3.0. + * <p>As of Spring 4.0, this set of mocks is designed on a Servlet 3.0 baseline. * * <p>Used for testing the web framework; also useful for testing ...
true
Other
spring-projects
spring-framework
2e6c998168e5537df3451fd3df0c09ae0e82a429.json
Update Javadoc for mocks regarding Servlet 3.0 Commit deba32cad9 upgraded the Servlet API mocks to Servlet 3.0; however, not all of the Javadoc was updated accordingly. This commit updates the remaining Javadoc with regard to Servlet 3.0 as the baseline for mocks in the spring-test module. In addition, this commit s...
spring-test/src/main/java/org/springframework/mock/web/MockMultipartHttpServletRequest.java
@@ -35,6 +35,8 @@ * Mock implementation of the * {@link org.springframework.web.multipart.MultipartHttpServletRequest} interface. * + * <p>As of Spring 4.0, this set of mocks is designed on a Servlet 3.0 baseline. + * * <p>Useful for testing application controllers that access multipart uploads. * The {@link ...
true
Other
spring-projects
spring-framework
2e6c998168e5537df3451fd3df0c09ae0e82a429.json
Update Javadoc for mocks regarding Servlet 3.0 Commit deba32cad9 upgraded the Servlet API mocks to Servlet 3.0; however, not all of the Javadoc was updated accordingly. This commit updates the remaining Javadoc with regard to Servlet 3.0 as the baseline for mocks in the spring-test module. In addition, this commit s...
spring-test/src/main/java/org/springframework/mock/web/MockServletContext.java
@@ -56,7 +56,9 @@ /** * Mock implementation of the {@link javax.servlet.ServletContext} interface. * - * <p>Compatible with Servlet 3.0. Can be configured to expose a specific version + * <p>As of Spring 4.0, this set of mocks is designed on a Servlet 3.0 baseline. + * + * <p>Compatible with Servlet 3.0 but can be...
true
Other
spring-projects
spring-framework
2e6c998168e5537df3451fd3df0c09ae0e82a429.json
Update Javadoc for mocks regarding Servlet 3.0 Commit deba32cad9 upgraded the Servlet API mocks to Servlet 3.0; however, not all of the Javadoc was updated accordingly. This commit updates the remaining Javadoc with regard to Servlet 3.0 as the baseline for mocks in the spring-test module. In addition, this commit s...
spring-test/src/main/java/org/springframework/mock/web/package-info.java
@@ -1,15 +1,14 @@ - /** + * A comprehensive set of Servlet API 3.0 mock objects, targeted at usage with + * Spring's web MVC framework. * - * A comprehensive set of Servlet API 2.5 mock objects, - * targeted at usage with Spring's web MVC framework. - * Useful for testing web contexts and controllers. + * <p>Useful ...
true
Other
spring-projects
spring-framework
2e6c998168e5537df3451fd3df0c09ae0e82a429.json
Update Javadoc for mocks regarding Servlet 3.0 Commit deba32cad9 upgraded the Servlet API mocks to Servlet 3.0; however, not all of the Javadoc was updated accordingly. This commit updates the remaining Javadoc with regard to Servlet 3.0 as the baseline for mocks in the spring-test module. In addition, this commit s...
spring-web/src/test/java/org/springframework/mock/web/test/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; @@ -52,11 +53,12 @@ import org.springframework.util.Assert; import org.springframework.util.LinkedCaseInsensi...
true
Other
spring-projects
spring-framework
2e6c998168e5537df3451fd3df0c09ae0e82a429.json
Update Javadoc for mocks regarding Servlet 3.0 Commit deba32cad9 upgraded the Servlet API mocks to Servlet 3.0; however, not all of the Javadoc was updated accordingly. This commit updates the remaining Javadoc with regard to Servlet 3.0 as the baseline for mocks in the spring-test module. In addition, this commit s...
spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java
@@ -40,8 +40,9 @@ /** * Mock implementation of the {@link javax.servlet.http.HttpServletResponse} interface. * - * <p>As of Spring 4.0, this set of mocks is designed on a Servlet 3.0 baseline. Beyond that, - * this MockHttpServletResponse is also compatible with Servlet 3.1's setContentLengthLong. + * <p>As of Spr...
true
Other
spring-projects
spring-framework
2e6c998168e5537df3451fd3df0c09ae0e82a429.json
Update Javadoc for mocks regarding Servlet 3.0 Commit deba32cad9 upgraded the Servlet API mocks to Servlet 3.0; however, not all of the Javadoc was updated accordingly. This commit updates the remaining Javadoc with regard to Servlet 3.0 as the baseline for mocks in the spring-test module. In addition, this commit s...
spring-web/src/test/java/org/springframework/mock/web/test/MockHttpSession.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. @@ -22,6 +22,7 @@ import java.util.HashMap; i...
true
Other
spring-projects
spring-framework
2e6c998168e5537df3451fd3df0c09ae0e82a429.json
Update Javadoc for mocks regarding Servlet 3.0 Commit deba32cad9 upgraded the Servlet API mocks to Servlet 3.0; however, not all of the Javadoc was updated accordingly. This commit updates the remaining Javadoc with regard to Servlet 3.0 as the baseline for mocks in the spring-test module. In addition, this commit s...
spring-web/src/test/java/org/springframework/mock/web/test/MockMultipartHttpServletRequest.java
@@ -35,6 +35,8 @@ * Mock implementation of the * {@link org.springframework.web.multipart.MultipartHttpServletRequest} interface. * + * <p>As of Spring 4.0, this set of mocks is designed on a Servlet 3.0 baseline. + * * <p>Useful for testing application controllers that access multipart uploads. * The {@link ...
true
Other
spring-projects
spring-framework
2e6c998168e5537df3451fd3df0c09ae0e82a429.json
Update Javadoc for mocks regarding Servlet 3.0 Commit deba32cad9 upgraded the Servlet API mocks to Servlet 3.0; however, not all of the Javadoc was updated accordingly. This commit updates the remaining Javadoc with regard to Servlet 3.0 as the baseline for mocks in the spring-test module. In addition, this commit s...
spring-web/src/test/java/org/springframework/mock/web/test/MockServletContext.java
@@ -56,7 +56,9 @@ /** * Mock implementation of the {@link javax.servlet.ServletContext} interface. * - * <p>Compatible with Servlet 3.0. Can be configured to expose a specific version + * <p>As of Spring 4.0, this set of mocks is designed on a Servlet 3.0 baseline. + * + * <p>Compatible with Servlet 3.0 but can be...
true
Other
spring-projects
spring-framework
d371886988a12331128ff645537e542f00dd7467.json
Allow null method for getTransactionAttribute Update MatchAlwaysTransactionAttributeSource.getTransactionAttribute to allow a null method argument. Passing a null method is not recommended and is not indicated as valid in the Javadoc, however, this was allowed in previous versions of Spring. Issue: SPR-11048
spring-core/src/main/java/org/springframework/util/ClassUtils.java
@@ -778,8 +778,12 @@ public static Method getMostSpecificMethod(Method method, Class<?> targetClass) * @return {@code true} if the method can be considered as user-declared; [@code false} otherwise */ public static boolean isUserLevelMethod(Method method) { - return (method.isBridge() || - (!method.isSynthe...
true
Other
spring-projects
spring-framework
d371886988a12331128ff645537e542f00dd7467.json
Allow null method for getTransactionAttribute Update MatchAlwaysTransactionAttributeSource.getTransactionAttribute to allow a null method argument. Passing a null method is not recommended and is not indicated as valid in the Javadoc, however, this was allowed in previous versions of Spring. Issue: SPR-11048
spring-tx/src/main/java/org/springframework/transaction/interceptor/MatchAlwaysTransactionAttributeSource.java
@@ -53,7 +53,7 @@ public void setTransactionAttribute(TransactionAttribute transactionAttribute) { @Override public TransactionAttribute getTransactionAttribute(Method method, Class<?> targetClass) { - return (ClassUtils.isUserLevelMethod(method) ? this.transactionAttribute : null); + return (method == null || ...
true
Other
spring-projects
spring-framework
d371886988a12331128ff645537e542f00dd7467.json
Allow null method for getTransactionAttribute Update MatchAlwaysTransactionAttributeSource.getTransactionAttribute to allow a null method argument. Passing a null method is not recommended and is not indicated as valid in the Javadoc, however, this was allowed in previous versions of Spring. Issue: SPR-11048
spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceTests.java
@@ -54,6 +54,16 @@ public void testMatchAlwaysTransactionAttributeSource() throws Exception { assertTrue(TransactionDefinition.PROPAGATION_SUPPORTS == ta.getPropagationBehavior()); } + @Test + public void testMatchAlwaysTransactionAttributeSourceWithNulls() throws Exception { + MatchAlwaysTransactionAttributeSo...
true
Other
spring-projects
spring-framework
164a9f938ccef29923476a4cf50565d4fa54d528.json
Update the Jetty WebSocket adapter This changes switches from using Jetty's WebSocketListener interface to use Jetty's @WebSocket annotations instead. The change should be transparent but the annnotations provide a little more controler including handling pong frames. This change also introduces a WebSocketMessage in...
spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/MessageHandlingException.java
@@ -28,6 +28,8 @@ */ public class MessageHandlingException extends MessagingException { + private static final long serialVersionUID = 690969923668400297L; + public MessageHandlingException(Message<?> message, String description, Throwable cause) { super(message, description, cause);
true
Other
spring-projects
spring-framework
164a9f938ccef29923476a4cf50565d4fa54d528.json
Update the Jetty WebSocket adapter This changes switches from using Jetty's WebSocketListener interface to use Jetty's @WebSocket annotations instead. The change should be transparent but the annnotations provide a little more controler including handling pong frames. This change also introduces a WebSocketMessage in...
spring-messaging/src/main/java/org/springframework/messaging/simp/BrokerAvailabilityEvent.java
@@ -26,8 +26,11 @@ */ public class BrokerAvailabilityEvent extends ApplicationEvent { + private static final long serialVersionUID = -8156742505179181002L; + private final boolean brokerAvailable; + /** * Creates a new {@code BrokerAvailabilityEvent}. *
true
Other
spring-projects
spring-framework
164a9f938ccef29923476a4cf50565d4fa54d528.json
Update the Jetty WebSocket adapter This changes switches from using Jetty's WebSocketListener interface to use Jetty's @WebSocket annotations instead. The change should be transparent but the annnotations provide a little more controler including handling pong frames. This change also introduces a WebSocketMessage in...
spring-websocket/src/main/java/org/springframework/web/socket/AbstractWebSocketMessage.java
@@ -0,0 +1,101 @@ +/* + * 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
164a9f938ccef29923476a4cf50565d4fa54d528.json
Update the Jetty WebSocket adapter This changes switches from using Jetty's WebSocketListener interface to use Jetty's @WebSocket annotations instead. The change should be transparent but the annnotations provide a little more controler including handling pong frames. This change also introduces a WebSocketMessage in...
spring-websocket/src/main/java/org/springframework/web/socket/BinaryMessage.java
@@ -19,92 +19,82 @@ import java.nio.ByteBuffer; /** - * A {@link WebSocketMessage} that contains a binary {@link ByteBuffer} payload. + * A binary WebSocket message. * * @author Rossen Stoyanchev * @since 4.0 */ -public final class BinaryMessage extends WebSocketMessage<ByteBuffer> { - - private byte[] byte...
true
Other
spring-projects
spring-framework
164a9f938ccef29923476a4cf50565d4fa54d528.json
Update the Jetty WebSocket adapter This changes switches from using Jetty's WebSocketListener interface to use Jetty's @WebSocket annotations instead. The change should be transparent but the annnotations provide a little more controler including handling pong frames. This change also introduces a WebSocketMessage in...
spring-websocket/src/main/java/org/springframework/web/socket/PingMessage.java
@@ -24,21 +24,34 @@ * @author Rossen Stoyanchev * @since 4.0 */ -public final class PingMessage extends WebSocketMessage<ByteBuffer> { +public final class PingMessage extends AbstractWebSocketMessage<ByteBuffer> { + /** + * Create a new ping message with an empty payload. + */ + public PingMessage() { + su...
true
Other
spring-projects
spring-framework
164a9f938ccef29923476a4cf50565d4fa54d528.json
Update the Jetty WebSocket adapter This changes switches from using Jetty's WebSocketListener interface to use Jetty's @WebSocket annotations instead. The change should be transparent but the annnotations provide a little more controler including handling pong frames. This change also introduces a WebSocketMessage in...
spring-websocket/src/main/java/org/springframework/web/socket/PongMessage.java
@@ -24,13 +24,26 @@ * @author Rossen Stoyanchev * @since 4.0 */ -public final class PongMessage extends WebSocketMessage<ByteBuffer> { +public final class PongMessage extends AbstractWebSocketMessage<ByteBuffer> { + /** + * Create a new pong message with an empty payload. + */ + public PongMessage() { + su...
true
Other
spring-projects
spring-framework
164a9f938ccef29923476a4cf50565d4fa54d528.json
Update the Jetty WebSocket adapter This changes switches from using Jetty's WebSocketListener interface to use Jetty's @WebSocket annotations instead. The change should be transparent but the annnotations provide a little more controler including handling pong frames. This change also introduces a WebSocketMessage in...
spring-websocket/src/main/java/org/springframework/web/socket/ReaderTextMessage.java
@@ -1,55 +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
164a9f938ccef29923476a4cf50565d4fa54d528.json
Update the Jetty WebSocket adapter This changes switches from using Jetty's WebSocketListener interface to use Jetty's @WebSocket annotations instead. The change should be transparent but the annnotations provide a little more controler including handling pong frames. This change also introduces a WebSocketMessage in...
spring-websocket/src/main/java/org/springframework/web/socket/TextMessage.java
@@ -17,25 +17,31 @@ package org.springframework.web.socket; /** - * A {@link WebSocketMessage} that contains a textual {@link String} payload. + * A text WebSocket message. * * @author Rossen Stoyanchev * @since 4.0 */ -public final class TextMessage extends WebSocketMessage<String> { +public final class Te...
true
Other
spring-projects
spring-framework
164a9f938ccef29923476a4cf50565d4fa54d528.json
Update the Jetty WebSocket adapter This changes switches from using Jetty's WebSocketListener interface to use Jetty's @WebSocket annotations instead. The change should be transparent but the annnotations provide a little more controler including handling pong frames. This change also introduces a WebSocketMessage in...
spring-websocket/src/main/java/org/springframework/web/socket/WebSocketHandler.java
@@ -18,8 +18,8 @@ /** * A handler for WebSocket messages and lifecycle events. - * - * <p>Implementations of this interface are encouraged to handle exceptions locally where + * <p> + * Implementations of this interface are encouraged to handle exceptions locally where * it makes sense or alternatively let the e...
true
Other
spring-projects
spring-framework
164a9f938ccef29923476a4cf50565d4fa54d528.json
Update the Jetty WebSocket adapter This changes switches from using Jetty's WebSocketListener interface to use Jetty's @WebSocket annotations instead. The change should be transparent but the annnotations provide a little more controler including handling pong frames. This change also introduces a WebSocketMessage in...
spring-websocket/src/main/java/org/springframework/web/socket/WebSocketMessage.java
@@ -25,72 +25,20 @@ * @author Rossen Stoyanchev * @since 4.0 */ -public abstract class WebSocketMessage<T> { - - private final T payload; - - private final boolean last; - - - /** - * Create a new {@link WebSocketMessage} instance with the given payload. - */ - WebSocketMessage(T payload) { - this(payload, tru...
true
Other
spring-projects
spring-framework
164a9f938ccef29923476a4cf50565d4fa54d528.json
Update the Jetty WebSocket adapter This changes switches from using Jetty's WebSocketListener interface to use Jetty's @WebSocket annotations instead. The change should be transparent but the annnotations provide a little more controler including handling pong frames. This change also introduces a WebSocketMessage in...
spring-websocket/src/main/java/org/springframework/web/socket/adapter/AbstractWebSocketSesssion.java
@@ -32,8 +32,6 @@ /** * An abstract base class for implementations of {@link WebSocketSession}. * - * @param T the type of the native (or delegate) WebSocket session - * * @author Rossen Stoyanchev * @since 4.0 */
true
Other
spring-projects
spring-framework
164a9f938ccef29923476a4cf50565d4fa54d528.json
Update the Jetty WebSocket adapter This changes switches from using Jetty's WebSocketListener interface to use Jetty's @WebSocket annotations instead. The change should be transparent but the annnotations provide a little more controler including handling pong frames. This change also introduces a WebSocketMessage in...
spring-websocket/src/main/java/org/springframework/web/socket/adapter/JettyWebSocketHandlerAdapter.java
@@ -19,22 +19,32 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.eclipse.jetty.websocket.api.Session; -import org.eclipse.jetty.websocket.api.WebSocketListener; +import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose; +import org.eclipse.jetty.websocket...
true
Other
spring-projects
spring-framework
164a9f938ccef29923476a4cf50565d4fa54d528.json
Update the Jetty WebSocket adapter This changes switches from using Jetty's WebSocketListener interface to use Jetty's @WebSocket annotations instead. The change should be transparent but the annnotations provide a little more controler including handling pong frames. This change also introduces a WebSocketMessage in...
spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketHttpHeaders.java
@@ -35,6 +35,8 @@ */ public class WebSocketHttpHeaders extends HttpHeaders { + private static final long serialVersionUID = -6644521016187828916L; + public static final String SEC_WEBSOCKET_ACCEPT = "Sec-WebSocket-Accept"; public static final String SEC_WEBSOCKET_EXTENSIONS = "Sec-WebSocket-Extensions";
true
Other
spring-projects
spring-framework
164a9f938ccef29923476a4cf50565d4fa54d528.json
Update the Jetty WebSocket adapter This changes switches from using Jetty's WebSocketListener interface to use Jetty's @WebSocket annotations instead. The change should be transparent but the annnotations provide a little more controler including handling pong frames. This change also introduces a WebSocketMessage in...
spring-websocket/src/test/java/org/springframework/web/socket/server/config/WebSocketConfigurationTests.java
@@ -69,7 +69,7 @@ public void registerWebSocketHandler() throws Exception { new WebSocketHandlerAdapter(), getWsBaseUrl() + "/ws").get(); TestWebSocketHandler serverHandler = this.wac.getBean(TestWebSocketHandler.class); - assertTrue(serverHandler.latch.await(2, TimeUnit.SECONDS)); + assertTrue(serverHandle...
true
Other
spring-projects
spring-framework
6d00a3f0ee795e1a5bd9ffe02c584623828dbc37.json
Add support for WebSocket Protocol Extensions This commits adds simple, overridable WebSocket Extension filtering during the handshake phase and adds that information in the WebSocket session. The actual WebSocket Extension negotiation happens within the server implementation (Glassfish, Jetty, Tomcat...), so one can...
spring-messaging/src/main/java/org/springframework/messaging/handler/websocket/SubProtocolHandler.java
@@ -69,7 +69,7 @@ void handleMessageFromClient(WebSocketSession session, WebSocketMessage message, /** * Resolve the session id from the given message or return {@code null}. * - * @param the message to resolve the session id from + * @param message the message to resolve the session id from */ String re...
true
Other
spring-projects
spring-framework
6d00a3f0ee795e1a5bd9ffe02c584623828dbc37.json
Add support for WebSocket Protocol Extensions This commits adds simple, overridable WebSocket Extension filtering during the handshake phase and adds that information in the WebSocket session. The actual WebSocket Extension negotiation happens within the server implementation (Glassfish, Jetty, Tomcat...), so one can...
spring-websocket/src/main/java/org/springframework/web/socket/WebSocketExtension.java
@@ -0,0 +1,167 @@ +/* + * 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
6d00a3f0ee795e1a5bd9ffe02c584623828dbc37.json
Add support for WebSocket Protocol Extensions This commits adds simple, overridable WebSocket Extension filtering during the handshake phase and adds that information in the WebSocket session. The actual WebSocket Extension negotiation happens within the server implementation (Glassfish, Jetty, Tomcat...), so one can...
spring-websocket/src/main/java/org/springframework/web/socket/WebSocketSession.java
@@ -20,6 +20,7 @@ import java.net.InetSocketAddress; import java.net.URI; import java.security.Principal; +import java.util.List; import java.util.Map; import org.springframework.http.HttpHeaders; @@ -79,6 +80,12 @@ public interface WebSocketSession { */ String getAcceptedProtocol(); + /** + * Return the...
true
Other
spring-projects
spring-framework
6d00a3f0ee795e1a5bd9ffe02c584623828dbc37.json
Add support for WebSocket Protocol Extensions This commits adds simple, overridable WebSocket Extension filtering during the handshake phase and adds that information in the WebSocket session. The actual WebSocket Extension negotiation happens within the server implementation (Glassfish, Jetty, Tomcat...), so one can...
spring-websocket/src/main/java/org/springframework/web/socket/adapter/JettyWebSocketSession.java
@@ -20,15 +20,19 @@ import java.net.InetSocketAddress; import java.net.URI; import java.security.Principal; +import java.util.ArrayList; +import java.util.List; import java.util.Map; +import org.eclipse.jetty.websocket.api.extensions.ExtensionConfig; import org.springframework.http.HttpHeaders; import org.sprin...
true
Other
spring-projects
spring-framework
6d00a3f0ee795e1a5bd9ffe02c584623828dbc37.json
Add support for WebSocket Protocol Extensions This commits adds simple, overridable WebSocket Extension filtering during the handshake phase and adds that information in the WebSocket session. The actual WebSocket Extension negotiation happens within the server implementation (Glassfish, Jetty, Tomcat...), so one can...
spring-websocket/src/main/java/org/springframework/web/socket/adapter/StandardWebSocketSession.java
@@ -20,10 +20,14 @@ import java.net.InetSocketAddress; import java.net.URI; import java.security.Principal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; import java.util.Map; import javax.websocket.CloseReason; import javax.websocket.CloseReason.CloseCodes; +import javax.webso...
true
Other
spring-projects
spring-framework
6d00a3f0ee795e1a5bd9ffe02c584623828dbc37.json
Add support for WebSocket Protocol Extensions This commits adds simple, overridable WebSocket Extension filtering during the handshake phase and adds that information in the WebSocket session. The actual WebSocket Extension negotiation happens within the server implementation (Glassfish, Jetty, Tomcat...), so one can...
spring-websocket/src/main/java/org/springframework/web/socket/server/DefaultHandshakeHandler.java
@@ -32,13 +32,15 @@ import org.springframework.http.server.ServerHttpResponse; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; +import org.springframework.web.socket.WebSocketExtension; import org.springframework.web.socket.WebSocketHandler; /** * A default {@link Hands...
true
Other
spring-projects
spring-framework
6d00a3f0ee795e1a5bd9ffe02c584623828dbc37.json
Add support for WebSocket Protocol Extensions This commits adds simple, overridable WebSocket Extension filtering during the handshake phase and adds that information in the WebSocket session. The actual WebSocket Extension negotiation happens within the server implementation (Glassfish, Jetty, Tomcat...), so one can...
spring-websocket/src/main/java/org/springframework/web/socket/server/RequestUpgradeStrategy.java
@@ -16,10 +16,12 @@ package org.springframework.web.socket.server; +import java.util.List; import java.util.Map; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; +import org.springframework.web.socket.WebSocketExtension; import org.springfra...
true
Other
spring-projects
spring-framework
6d00a3f0ee795e1a5bd9ffe02c584623828dbc37.json
Add support for WebSocket Protocol Extensions This commits adds simple, overridable WebSocket Extension filtering during the handshake phase and adds that information in the WebSocket session. The actual WebSocket Extension negotiation happens within the server implementation (Glassfish, Jetty, Tomcat...), so one can...
spring-websocket/src/main/java/org/springframework/web/socket/server/config/WebSocketConfigurer.java
@@ -16,8 +16,7 @@ package org.springframework.web.socket.server.config; -import org.eclipse.jetty.websocket.server.WebSocketHandler; - +import org.springframework.web.socket.WebSocketHandler; /**
true
Other
spring-projects
spring-framework
6d00a3f0ee795e1a5bd9ffe02c584623828dbc37.json
Add support for WebSocket Protocol Extensions This commits adds simple, overridable WebSocket Extension filtering during the handshake phase and adds that information in the WebSocket session. The actual WebSocket Extension negotiation happens within the server implementation (Glassfish, Jetty, Tomcat...), so one can...
spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractGlassFishRequestUpgradeStrategy.java
@@ -19,15 +19,21 @@ import java.io.IOException; import java.lang.reflect.Constructor; import java.net.URI; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import java.util.Random; +import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.htt...
true
Other
spring-projects
spring-framework
6d00a3f0ee795e1a5bd9ffe02c584623828dbc37.json
Add support for WebSocket Protocol Extensions This commits adds simple, overridable WebSocket Extension filtering during the handshake phase and adds that information in the WebSocket session. The actual WebSocket Extension negotiation happens within the server implementation (Glassfish, Jetty, Tomcat...), so one can...
spring-websocket/src/main/java/org/springframework/web/socket/server/support/AbstractStandardUpgradeStrategy.java
@@ -17,15 +17,18 @@ package org.springframework.web.socket.server.support; import java.net.InetSocketAddress; +import java.util.HashMap; import java.util.Map; import javax.websocket.Endpoint; +import javax.websocket.Extension; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFacto...
true
Other
spring-projects
spring-framework
6d00a3f0ee795e1a5bd9ffe02c584623828dbc37.json
Add support for WebSocket Protocol Extensions This commits adds simple, overridable WebSocket Extension filtering during the handshake phase and adds that information in the WebSocket session. The actual WebSocket Extension negotiation happens within the server implementation (Glassfish, Jetty, Tomcat...), so one can...
spring-websocket/src/main/java/org/springframework/web/socket/server/support/JettyRequestUpgradeStrategy.java
@@ -17,6 +17,8 @@ package org.springframework.web.socket.server.support; import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -34,6 +36,7 @@ import org.springframework.http.server.ServletServerHttpRequest; impor...
true
Other
spring-projects
spring-framework
6d00a3f0ee795e1a5bd9ffe02c584623828dbc37.json
Add support for WebSocket Protocol Extensions This commits adds simple, overridable WebSocket Extension filtering during the handshake phase and adds that information in the WebSocket session. The actual WebSocket Extension negotiation happens within the server implementation (Glassfish, Jetty, Tomcat...), so one can...
spring-websocket/src/main/java/org/springframework/web/socket/server/support/TomcatRequestUpgradeStrategy.java
@@ -17,22 +17,26 @@ package org.springframework.web.socket.server.support; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.List; import java.util.Map; import javax.servlet.ServletContext; import javax.servlet.ServletException; ...
true
Other
spring-projects
spring-framework
6d00a3f0ee795e1a5bd9ffe02c584623828dbc37.json
Add support for WebSocket Protocol Extensions This commits adds simple, overridable WebSocket Extension filtering during the handshake phase and adds that information in the WebSocket session. The actual WebSocket Extension negotiation happens within the server implementation (Glassfish, Jetty, Tomcat...), so one can...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractHttpSockJsSession.java
@@ -20,6 +20,7 @@ import java.net.InetSocketAddress; import java.net.URI; import java.security.Principal; +import java.util.List; import java.util.Map; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; @@ -30,6 +31,7 @@ import org.springframework.http.server.ServerHttpRes...
true
Other
spring-projects
spring-framework
6d00a3f0ee795e1a5bd9ffe02c584623828dbc37.json
Add support for WebSocket Protocol Extensions This commits adds simple, overridable WebSocket Extension filtering during the handshake phase and adds that information in the WebSocket session. The actual WebSocket Extension negotiation happens within the server implementation (Glassfish, Jetty, Tomcat...), so one can...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/WebSocketServerSockJsSession.java
@@ -20,13 +20,15 @@ import java.net.InetSocketAddress; import java.net.URI; import java.security.Principal; +import java.util.List; import java.util.Map; import org.springframework.http.HttpHeaders; import org.springframework.util.Assert; import org.springframework.util.StringUtils; import org.springframework...
true
Other
spring-projects
spring-framework
6d00a3f0ee795e1a5bd9ffe02c584623828dbc37.json
Add support for WebSocket Protocol Extensions This commits adds simple, overridable WebSocket Extension filtering during the handshake phase and adds that information in the WebSocket session. The actual WebSocket Extension negotiation happens within the server implementation (Glassfish, Jetty, Tomcat...), so one can...
spring-websocket/src/test/java/org/springframework/web/socket/WebSocketExtensionTests.java
@@ -0,0 +1,61 @@ +/* + * 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
6d00a3f0ee795e1a5bd9ffe02c584623828dbc37.json
Add support for WebSocket Protocol Extensions This commits adds simple, overridable WebSocket Extension filtering during the handshake phase and adds that information in the WebSocket session. The actual WebSocket Extension negotiation happens within the server implementation (Glassfish, Jetty, Tomcat...), so one can...
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/session/TestSockJsSession.java
@@ -26,6 +26,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.web.socket.CloseStatus; +import org.springframework.web.socket.WebSocketExtension; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.sockjs.support.frame.SockJsFrame; @@ -58,6 +5...
true
Other
spring-projects
spring-framework
6d00a3f0ee795e1a5bd9ffe02c584623828dbc37.json
Add support for WebSocket Protocol Extensions This commits adds simple, overridable WebSocket Extension filtering during the handshake phase and adds that information in the WebSocket session. The actual WebSocket Extension negotiation happens within the server implementation (Glassfish, Jetty, Tomcat...), so one can...
spring-websocket/src/test/java/org/springframework/web/socket/support/TestWebSocketSession.java
@@ -27,6 +27,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.web.socket.CloseStatus; +import org.springframework.web.socket.WebSocketExtension; import org.springframework.web.socket.WebSocketMessage; import org.springframework.web.socket.WebSocketSession; @@ -51,6 +52,8 @@ public cl...
true
Other
spring-projects
spring-framework
24dfe8ec19e90b4fae1eb47de9cd0fa3b98687fc.json
Replace use of jdk 1.8 api
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java
@@ -271,7 +271,7 @@ private static UriComponents applyContributors(UriComponentsBuilder builder, Met contributor = defaultUriComponentsContributor; } - int paramCount = method.getParameterCount(); + int paramCount = method.getParameterTypes().length; int argCount = args.length; Assert.isTrue(paramCou...
false
Other
spring-projects
spring-framework
88fe2e9b00b68b05c35f2204dbc5783ff04d9bcc.json
Convert TestContext to interface & default impl Since the Spring TestContext Framework was introduced in Spring Framework 2.5, the TestContext class has always been a public class with package private constructors. The visibility of TestContext's constructor and methods was intentionally limited in order to hide the i...
spring-test/src/main/java/org/springframework/test/context/DefaultTestContext.java
@@ -0,0 +1,183 @@ +/* + * 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
88fe2e9b00b68b05c35f2204dbc5783ff04d9bcc.json
Convert TestContext to interface & default impl Since the Spring TestContext Framework was introduced in Spring Framework 2.5, the TestContext class has always been a public class with package private constructors. The visibility of TestContext's constructor and methods was intentionally limited in order to hide the i...
spring-test/src/main/java/org/springframework/test/context/TestContext.java
@@ -16,139 +16,56 @@ package org.springframework.test.context; +import java.io.Serializable; import java.lang.reflect.Method; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import org.springframework.context.ApplicationContext; -import org.springframework.core.Attribut...
true
Other
spring-projects
spring-framework
88fe2e9b00b68b05c35f2204dbc5783ff04d9bcc.json
Convert TestContext to interface & default impl Since the Spring TestContext Framework was introduced in Spring Framework 2.5, the TestContext class has always been a public class with package private constructors. The visibility of TestContext's constructor and methods was intentionally limited in order to hide the i...
spring-test/src/main/java/org/springframework/test/context/TestContextManager.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. @@ -26,7 +26,6 @@ import org.apache.commons....
true
Other
spring-projects
spring-framework
88fe2e9b00b68b05c35f2204dbc5783ff04d9bcc.json
Convert TestContext to interface & default impl Since the Spring TestContext Framework was introduced in Spring Framework 2.5, the TestContext class has always been a public class with package private constructors. The visibility of TestContext's constructor and methods was intentionally limited in order to hide the i...
spring-test/src/main/java/org/springframework/test/context/support/DirtiesContextTestExecutionListener.java
@@ -44,22 +44,6 @@ public class DirtiesContextTestExecutionListener extends AbstractTestExecutionLi private static final Log logger = LogFactory.getLog(DirtiesContextTestExecutionListener.class); - /** - * Marks the {@linkplain ApplicationContext application context} of the supplied - * {@linkplain TestContext ...
true
Other
spring-projects
spring-framework
88fe2e9b00b68b05c35f2204dbc5783ff04d9bcc.json
Convert TestContext to interface & default impl Since the Spring TestContext Framework was introduced in Spring Framework 2.5, the TestContext class has always been a public class with package private constructors. The visibility of TestContext's constructor and methods was intentionally limited in order to hide the i...
spring-test/src/test/java/org/springframework/test/context/ContextCacheTests.java
@@ -56,7 +56,7 @@ private MergedContextConfiguration getMergedContextConfiguration(TestContext tes } private ApplicationContext loadContext(Class<?> testClass) { - TestContext testContext = new TestContext(testClass, contextCache); + TestContext testContext = new DefaultTestContext(testClass, contextCache); ...
true
Other
spring-projects
spring-framework
6cfbcf4f17eb43224cbb1613c0c800a955b40260.json
Avoid NPE in hasUnresolvableGenerics() Issue: SPR-11034
spring-core/src/main/java/org/springframework/core/ResolvableType.java
@@ -365,16 +365,18 @@ public boolean hasUnresolvableGenerics() { } } Class<?> resolved = resolve(); - Type[] ifcs = resolved.getGenericInterfaces(); - for (Type ifc : ifcs) { - if (ifc instanceof Class) { - if (forClass((Class) ifc).hasGenerics()) { - return true; + if (resolved != null) { + Typ...
false
Other
spring-projects
spring-framework
cf5db8362b3b95e2555e4e1600e3c6919e952f01.json
Replace MvcUrls with MvcUriComponentsBuilder Issue: SPR-8826
spring-web/src/main/java/org/springframework/web/method/support/CompositeUriComponentsContributor.java
@@ -0,0 +1,125 @@ +/* + * 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
cf5db8362b3b95e2555e4e1600e3c6919e952f01.json
Replace MvcUrls with MvcUriComponentsBuilder Issue: SPR-8826
spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java
@@ -555,6 +555,17 @@ public UriComponentsBuilder queryParam(String name, Object... values) { return this; } + /** + * Adds the given query parameters. + * @param params the params + * @return this UriComponentsBuilder + */ + public UriComponentsBuilder queryParams(MultiValueMap<String, String> params) { + A...
true