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 | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/sockjs/server/transport/AbstractHttpServerSockJsSession.java | @@ -31,6 +31,7 @@
import org.springframework.util.Assert;
import org.springframework.websocket.CloseStatus;
import org.springframework.websocket.WebSocketHandler;
+import org.springframework.websocket.support.ExceptionWebSocketHandlerDecorator;
/**
* An abstract base class for use with HTTP-based transports.
@@... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/sockjs/server/transport/SockJsWebSocketHandler.java | @@ -34,8 +34,16 @@
/**
- * A wrapper around a {@link WebSocketHandler} instance that parses as well as adds SockJS
- * messages frames as well as sends SockJS heartbeat messages.
+ * A wrapper around a {@link WebSocketHandler} instance that parses and adds SockJS
+ * messages frames and also sends SockJS heartbeat... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/websocket/PartialMessageHandler.java | @@ -1,28 +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 | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/websocket/WebSocketHandler.java | @@ -17,7 +17,15 @@
package org.springframework.websocket;
/**
- * A handler for WebSocket sessions.
+ * 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 ... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/websocket/adapter/JettyWebSocketListenerAdapter.java | @@ -16,6 +16,8 @@
package org.springframework.websocket.adapter;
+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.springframework.util.Assert;
@@ -24,6 +26,7... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/websocket/adapter/StandardEndpointAdapter.java | @@ -23,12 +23,15 @@
import javax.websocket.EndpointConfig;
import javax.websocket.MessageHandler;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.springframework.util.Assert;
import org.springframework.websocket.BinaryMessage;
import org.springframework.websocket... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/websocket/adapter/WebSocketHandlerAdapter.java | @@ -37,11 +37,11 @@
public class WebSocketHandlerAdapter implements WebSocketHandler {
@Override
- public void afterConnectionEstablished(WebSocketSession session) {
+ public void afterConnectionEstablished(WebSocketSession session) throws Exception {
}
@Override
- public final void handleMessage(WebSocketSe... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/websocket/client/WebSocketConnectFailureException.java | @@ -25,6 +25,7 @@
@SuppressWarnings("serial")
public class WebSocketConnectFailureException extends NestedRuntimeException {
+
public WebSocketConnectFailureException(String msg, Throwable cause) {
super(msg, cause);
} | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/websocket/server/DefaultHandshakeHandler.java | @@ -89,7 +89,7 @@ public String[] getSupportedProtocols() {
@Override
public final boolean doHandshake(ServerHttpRequest request, ServerHttpResponse response,
- WebSocketHandler webSocketHandler) throws IOException {
+ WebSocketHandler webSocketHandler) throws IOException, HandshakeFailureException {
log... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/websocket/server/HandshakeFailureException.java | @@ -0,0 +1,48 @@
+/*
+ * 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 | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/websocket/server/HandshakeHandler.java | @@ -31,7 +31,21 @@
public interface HandshakeHandler {
+ /**
+ *
+ * @param request
+ * @param response
+ * @param webSocketHandler
+ * @return
+ *
+ * @throws IOException thrown when accessing or setting the response
+ *
+ * @throws HandshakeFailureException thrown when handshake processing failed to
+ ... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/websocket/server/RequestUpgradeStrategy.java | @@ -37,12 +37,17 @@ public interface RequestUpgradeStrategy {
String[] getSupportedVersions();
/**
- * Perform runtime specific steps to complete the upgrade.
- * Invoked only if the handshake is successful.
+ * Perform runtime specific steps to complete the upgrade. Invoked after successful
+ * negotiation o... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/websocket/server/support/GlassfishRequestUpgradeStrategy.java | @@ -48,6 +48,7 @@
import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
+import org.springframework.websocket.server.HandshakeFailureException;
import org.springframework.websocket.server.endpoint.EndpointRegistration;
/**
@@ -69... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/websocket/server/support/JettyRequestUpgradeStrategy.java | @@ -34,6 +34,7 @@
import org.springframework.util.Assert;
import org.springframework.websocket.WebSocketHandler;
import org.springframework.websocket.adapter.JettyWebSocketListenerAdapter;
+import org.springframework.websocket.server.HandshakeFailureException;
import org.springframework.websocket.server.RequestUpgr... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/websocket/server/support/TomcatRequestUpgradeStrategy.java | @@ -32,6 +32,7 @@
import org.springframework.http.server.ServletServerHttpRequest;
import org.springframework.util.Assert;
import org.springframework.util.ReflectionUtils;
+import org.springframework.websocket.server.HandshakeFailureException;
import org.springframework.websocket.server.endpoint.EndpointRegistratio... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/websocket/server/support/WebSocketHttpRequestHandler.java | @@ -28,7 +28,6 @@
import org.springframework.http.server.ServletServerHttpResponse;
import org.springframework.util.Assert;
import org.springframework.web.HttpRequestHandler;
-import org.springframework.web.util.NestedServletException;
import org.springframework.websocket.WebSocketHandler;
import org.springframewo... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/websocket/support/ExceptionWebSocketHandlerDecorator.java | @@ -43,11 +43,11 @@ public void afterConnectionEstablished(WebSocketSession session) {
getDelegate().afterConnectionEstablished(session);
}
catch (Throwable ex) {
- tryCloseWithError(session, ex);
+ tryCloseWithError(session, ex, logger);
}
}
- private void tryCloseWithError(WebSocketSession sessio... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/websocket/support/LoggingWebSocketHandlerDecorator.java | @@ -39,31 +39,31 @@ public LoggingWebSocketHandlerDecorator(WebSocketHandler delegate) {
@Override
- public void afterConnectionEstablished(WebSocketSession session) {
+ public void afterConnectionEstablished(WebSocketSession session) throws Exception {
if (logger.isDebugEnabled()) {
logger.debug("Connecti... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/websocket/support/PerConnectionWebSocketHandlerProxy.java | @@ -81,14 +81,14 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
}
@Override
- public void afterConnectionEstablished(WebSocketSession session) {
+ public void afterConnectionEstablished(WebSocketSession session) throws Exception {
WebSocketHandler handler = this.provider.getHand... | true |
Other | spring-projects | spring-framework | 166ca7a5a3254c6d63551ad286a9e55375276e85.json | Update exception handling
Allow WebSocketHandler methods to raise an exception.
By default we install ExceptionWebSocketHandlerDecorator, which logs
unhandled exceptions and closes the session. That decorator can be
extended or replaced.
Any exceptions that remain unhandled still (i.e. no exception handling
decorato... | spring-websocket/src/main/java/org/springframework/websocket/support/WebSocketHandlerDecorator.java | @@ -43,22 +43,22 @@ protected WebSocketHandler getDelegate() {
}
@Override
- public void afterConnectionEstablished(WebSocketSession session) {
+ public void afterConnectionEstablished(WebSocketSession session) throws Exception {
this.delegate.afterConnectionEstablished(session);
}
@Override
- public voi... | true |
Other | spring-projects | spring-framework | 9ca4672300aa59949ac1073c56feedee783af6ec.json | Fix handshake handling issue | spring-websocket/src/main/java/org/springframework/websocket/CloseStatus.java | @@ -198,6 +198,10 @@ public boolean equals(Object other) {
return (this.code == otherStatus.code && ObjectUtils.nullSafeEquals(this.reason, otherStatus.reason));
}
+ public boolean equalsCode(CloseStatus other) {
+ return this.code == other.code;
+ }
+
@Override
public String toString() {
return "CloseSt... | true |
Other | spring-projects | spring-framework | 9ca4672300aa59949ac1073c56feedee783af6ec.json | Fix handshake handling issue | spring-websocket/src/main/java/org/springframework/websocket/client/endpoint/StandardWebSocketClient.java | @@ -27,9 +27,12 @@
import javax.websocket.ClientEndpointConfig.Configurator;
import javax.websocket.ContainerProvider;
import javax.websocket.Endpoint;
+import javax.websocket.HandshakeResponse;
import javax.websocket.Session;
import javax.websocket.WebSocketContainer;
+import org.apache.commons.logging.Log;
+im... | true |
Other | spring-projects | spring-framework | 9ca4672300aa59949ac1073c56feedee783af6ec.json | Fix handshake handling issue | spring-websocket/src/main/java/org/springframework/websocket/client/jetty/JettyWebSocketClient.java | @@ -134,6 +134,8 @@ public WebSocketSession doHandshake(WebSocketHandler webSocketHandler, String ur
public WebSocketSession doHandshake(WebSocketHandler webSocketHandler, HttpHeaders headers, URI uri)
throws WebSocketConnectFailureException {
+ // TODO: populate headers
+
JettyWebSocketListenerAdapter list... | true |
Other | spring-projects | spring-framework | 9ca4672300aa59949ac1073c56feedee783af6ec.json | Fix handshake handling issue | spring-websocket/src/main/java/org/springframework/websocket/server/DefaultHandshakeHandler.java | @@ -20,6 +20,7 @@
import java.nio.charset.Charset;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -34,6 +35,7 @@
import org.springframework.http.server.ServerHttpReque... | true |
Other | spring-projects | spring-framework | 2e4f38f6af49637f2ff5f651944aef35a049c60a.json | Introduce AbstractMockMvcBuilder class
This change splits out an abstract base class from DefaultMockMvcBuilder
with StandaloneMockMvcBuilder switching to extend the new abstract class
(rather than DefaultMockMvcBuilder).
Issue: SPR-11238 | spring-test/src/main/java/org/springframework/test/web/servlet/MockMvcBuilderSupport.java | @@ -42,7 +42,8 @@ public abstract class MockMvcBuilderSupport {
protected final MockMvc createMockMvc(Filter[] filters, MockServletConfig servletConfig,
WebApplicationContext webAppContext, RequestBuilder defaultRequestBuilder,
- List<ResultMatcher> globalResultMatchers, List<ResultHandler> globalResultHandle... | true |
Other | spring-projects | spring-framework | 2e4f38f6af49637f2ff5f651944aef35a049c60a.json | Introduce AbstractMockMvcBuilder class
This change splits out an abstract base class from DefaultMockMvcBuilder
with StandaloneMockMvcBuilder switching to extend the new abstract class
(rather than DefaultMockMvcBuilder).
Issue: SPR-11238 | spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java | @@ -0,0 +1,203 @@
+/*
+ * 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 | 2e4f38f6af49637f2ff5f651944aef35a049c60a.json | Introduce AbstractMockMvcBuilder class
This change splits out an abstract base class from DefaultMockMvcBuilder
with StandaloneMockMvcBuilder switching to extend the new abstract class
(rather than DefaultMockMvcBuilder).
Issue: SPR-11238 | spring-test/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.java | @@ -34,29 +34,17 @@
import org.springframework.web.servlet.DispatcherServlet;
/**
- * An concrete implementation of {@link MockMvcBuilder} with methods for
- * configuring filters, default request properties, and global expectations and
- * result actions.
+ * An concrete implementation of {@link AbstractMockMvcBui... | true |
Other | spring-projects | spring-framework | 2e4f38f6af49637f2ff5f651944aef35a049c60a.json | Introduce AbstractMockMvcBuilder class
This change splits out an abstract base class from DefaultMockMvcBuilder
with StandaloneMockMvcBuilder switching to extend the new abstract class
(rather than DefaultMockMvcBuilder).
Issue: SPR-11238 | spring-test/src/main/java/org/springframework/test/web/servlet/setup/MockMvcBuilders.java | @@ -42,8 +42,8 @@ public class MockMvcBuilders {
* application controllers in it. The context must have been configured with
* a {@link ServletContext}.
*/
- public static <B extends DefaultMockMvcBuilder<B>> DefaultMockMvcBuilder<B> webAppContextSetup(WebApplicationContext context) {
- return new DefaultMock... | true |
Other | spring-projects | spring-framework | 2e4f38f6af49637f2ff5f651944aef35a049c60a.json | Introduce AbstractMockMvcBuilder class
This change splits out an abstract base class from DefaultMockMvcBuilder
with StandaloneMockMvcBuilder switching to extend the new abstract class
(rather than DefaultMockMvcBuilder).
Issue: SPR-11238 | spring-test/src/main/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilder.java | @@ -82,7 +82,7 @@
* @author Rossen Stoyanchev
* @since 3.2
*/
-public class StandaloneMockMvcBuilder extends DefaultMockMvcBuilder<StandaloneMockMvcBuilder> {
+public class StandaloneMockMvcBuilder extends AbstractMockMvcBuilder<StandaloneMockMvcBuilder> {
private final Object[] controllers;
@@ -124,7 +124,... | true |
Other | spring-projects | spring-framework | 2e4f38f6af49637f2ff5f651944aef35a049c60a.json | Introduce AbstractMockMvcBuilder class
This change splits out an abstract base class from DefaultMockMvcBuilder
with StandaloneMockMvcBuilder switching to extend the new abstract class
(rather than DefaultMockMvcBuilder).
Issue: SPR-11238 | spring-test/src/test/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilderTests.java | @@ -35,7 +35,7 @@
*/
public class DefaultMockMvcBuilderTests {
- private DefaultMockMvcBuilder<?> builder;
+ private StandaloneMockMvcBuilder builder;
@Before
public void setup() { | true |
Other | spring-projects | spring-framework | 2e4f38f6af49637f2ff5f651944aef35a049c60a.json | Introduce AbstractMockMvcBuilder class
This change splits out an abstract base class from DefaultMockMvcBuilder
with StandaloneMockMvcBuilder switching to extend the new abstract class
(rather than DefaultMockMvcBuilder).
Issue: SPR-11238 | spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java | @@ -21,6 +21,7 @@
import org.springframework.mock.web.test.MockServletContext;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.method.HandlerMethod;
import ... | true |
Other | spring-projects | spring-framework | b085ec90b20bb99303d2c5dd13d41a1ade5196af.json | Replace references to VMware with Pivotal
Replace references to VMware in license, notices and maven generation
with Pivotal, Inc.
Issue: SPR-11073 | gradle/publish-maven.gradle | @@ -43,7 +43,7 @@ def customizePom(pom, gradleProject) {
developer {
id = "jhoeller"
name = "Juergen Hoeller"
- email = "jhoeller@vmware.com"
+ email = "jhoeller@gopivotal.com"
}
}
issueManagement { | true |
Other | spring-projects | spring-framework | b085ec90b20bb99303d2c5dd13d41a1ade5196af.json | Replace references to VMware with Pivotal
Replace references to VMware in license, notices and maven generation
with Pivotal, Inc.
Issue: SPR-11073 | src/dist/license.txt | @@ -265,15 +265,15 @@ components and modifications thereto, if any, (the "Source Files"), by
downloading the Source Files from http://www.springsource.org/download, or by
sending a request, with your name and address to:
- VMware, Inc., 3401 Hillview Avenue
- Palo Alto, CA 94304
+ Pivotal, Inc., 875 Howard... | true |
Other | spring-projects | spring-framework | b085ec90b20bb99303d2c5dd13d41a1ade5196af.json | Replace references to VMware with Pivotal
Replace references to VMware in license, notices and maven generation
with Pivotal, Inc.
Issue: SPR-11073 | src/dist/notice.txt | @@ -1,5 +1,5 @@
Spring Framework ${version}
-Copyright (c) 2002-${copyright} SpringSource, a division of VMware, Inc.
+Copyright (c) 2002-${copyright} Pivotal, Inc.
This product is licensed to you under the Apache License, Version 2.0
(the "License"). You may not use this product except in compliance with | true |
Other | spring-projects | spring-framework | 0e7b94f9e906b6944ef17c33eb4e4f0e04d403e6.json | Add constructors to MessageHandlingException
Issue: SPR-11345 | spring-messaging/src/main/java/org/springframework/messaging/MessageHandlingException.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,10 +25,18 @@
@SuppressWarnings("serial"... | false |
Other | spring-projects | spring-framework | 74fe1aea310dd29a8dea154e3e92ee7d47180db4.json | Fix typo in documentation | src/asciidoc/index.adoc | @@ -28791,7 +28791,7 @@ with MVC Java Config>> section describes how the `RequestMappingHandlerMapping`
be customized.
In the MVC namespace, the `<mvc:annotation-driven>` element has an
-`enableMatrixVariables` attribute that should be set to `true`. By default it is set
+`enable-matrix-variables` attribute that sh... | false |
Other | spring-projects | spring-framework | 98174e101f97bbf59b85420601a0130bb168a341.json | Improve documentation of matrix variables.
Prior to this commit, it was not clear how to enable the support of matrix
variables in the mvc namespace. As the feature is disabled by default, added
something to highlight the part that explains how to configure it
Issue: SPR-11331 | src/asciidoc/index.adoc | @@ -28780,6 +28780,38 @@ Note that to enable the use of matrix variables, you must set the
`removeSemicolonContent` property of `RequestMappingHandlerMapping` to `false`. By
default it is set to `true`.
+[TIP]
+====
+
+The MVC Java config and the MVC namespace both provide options for enabling the use of
+matrix va... | false |
Other | spring-projects | spring-framework | 845a6b0b7d628c8e08d3254fd7bee3974d2104b3.json | Remove serialVersionUIDs in spring-messaging Exc.
Prior to this commit, several spring-messaging exceptions
had defined serialVersionUIDs. Those exception aren't
supposed to leave the system via Java serialization; also,
their deserialization is supported only against the same
version of Spring.
Issue: SPR-11339 | spring-messaging/src/main/java/org/springframework/messaging/MessageHandlingException.java | @@ -22,11 +22,9 @@
* @author Mark Fisher
* @since 4.0
*/
+@SuppressWarnings("serial")
public class MessageHandlingException extends MessagingException {
- private static final long serialVersionUID = 690969923668400297L;
-
-
public MessageHandlingException(Message<?> message, String description) {
super(m... | true |
Other | spring-projects | spring-framework | 845a6b0b7d628c8e08d3254fd7bee3974d2104b3.json | Remove serialVersionUIDs in spring-messaging Exc.
Prior to this commit, several spring-messaging exceptions
had defined serialVersionUIDs. Those exception aren't
supposed to leave the system via Java serialization; also,
their deserialization is supported only against the same
version of Spring.
Issue: SPR-11339 | spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/MissingSessionUserException.java | @@ -23,11 +23,9 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
+@SuppressWarnings("serial")
public class MissingSessionUserException extends MessagingException {
- private static final long serialVersionUID = -6905878930083523161L;
-
-
public MissingSessionUserException(Message<?> message) {
super(message... | true |
Other | spring-projects | spring-framework | ae06c3a6ab36785aa3fc69aa1672e3a7d621e4a0.json | Use DestinationUserNameProvider with @SendTo
Issue: SPR-11327 | spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
package org.springframework.... | true |
Other | spring-projects | spring-framework | ae06c3a6ab36785aa3fc69aa1672e3a7d621e4a0.json | Use DestinationUserNameProvider with @SendTo
Issue: SPR-11327 | spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandlerTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,7 +33,9 @@
import org.springframework.m... | true |
Other | spring-projects | spring-framework | ae06c3a6ab36785aa3fc69aa1672e3a7d621e4a0.json | Use DestinationUserNameProvider with @SendTo
Issue: SPR-11327 | spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java | @@ -241,13 +241,13 @@ private void afterStompSessionConnected(StompHeaderAccessor headers, WebSocketSe
if (principal != null) {
headers.setNativeHeader(CONNECTED_USER_HEADER, principal.getName());
if (this.userSessionRegistry != null) {
- String userName = getNameForUserSessionRegistry(principal);
+ St... | true |
Other | spring-projects | spring-framework | e4ad2b352e35a0cdbc5d4834f9689a13162c8d19.json | Add DestinationUserNameProvider interface
The interface is to be implemented in addition to
java.security.Principal when Principal.getName() is not globally unique
enough for use in user destinations.
Issue: SPR-11327 | spring-messaging/src/main/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolver.java | @@ -165,7 +165,9 @@ protected boolean checkDestination(String destination, String requiredPrefix) {
return true;
}
- protected String getTargetDestination(String origDestination, String targetDestination, String sessionId, String user) {
+ protected String getTargetDestination(String origDestination, String targ... | true |
Other | spring-projects | spring-framework | e4ad2b352e35a0cdbc5d4834f9689a13162c8d19.json | Add DestinationUserNameProvider interface
The interface is to be implemented in addition to
java.security.Principal when Principal.getName() is not globally unique
enough for use in user destinations.
Issue: SPR-11327 | spring-messaging/src/main/java/org/springframework/messaging/simp/user/DestinationUserNameProvider.java | @@ -0,0 +1,20 @@
+package org.springframework.messaging.simp.user;
+
+/**
+ * An interface to be implemented in addition to {@link java.security.Principal}
+ * when {@link java.security.Principal#getName()} is not globally unique enough
+ * for use in user destinations. For more on user destination see
+ * {@link org.s... | true |
Other | spring-projects | spring-framework | e4ad2b352e35a0cdbc5d4834f9689a13162c8d19.json | Add DestinationUserNameProvider interface
The interface is to be implemented in addition to
java.security.Principal when Principal.getName() is not globally unique
enough for use in user destinations.
Issue: SPR-11327 | spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java | @@ -39,19 +39,21 @@ public class DefaultUserDestinationResolverTests {
private UserSessionRegistry registry;
+ private TestPrincipal user;
+
@Before
public void setup() {
+ this.user = new TestPrincipal("joe");
this.registry = new DefaultUserSessionRegistry();
- this.registry.registerSessionId("joe", S... | true |
Other | spring-projects | spring-framework | e4ad2b352e35a0cdbc5d4834f9689a13162c8d19.json | Add DestinationUserNameProvider interface
The interface is to be implemented in addition to
java.security.Principal when Principal.getName() is not globally unique
enough for use in user destinations.
Issue: SPR-11327 | spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java | @@ -35,6 +35,7 @@
import org.springframework.messaging.simp.stomp.StompDecoder;
import org.springframework.messaging.simp.stomp.StompEncoder;
import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
+import org.springframework.messaging.simp.user.DestinationUserNameProvider;
import org.springframework.m... | true |
Other | spring-projects | spring-framework | e4ad2b352e35a0cdbc5d4834f9689a13162c8d19.json | Add DestinationUserNameProvider interface
The interface is to be implemented in addition to
java.security.Principal when Principal.getName() is not globally unique
enough for use in user destinations.
Issue: SPR-11327 | spring-websocket/src/test/java/org/springframework/web/socket/messaging/StompSubProtocolHandlerTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
import java.nio.ByteBuffer... | true |
Other | spring-projects | spring-framework | 098d7c746532135e0edc241d91dfc1f27389949d.json | Ensure all tests in spring-test are executed
Prior to this commit TestNG tests would only be executed by the Gradle
build if they were located in the “testng” package. Tests in subpackages
would therefore be omitted from the build.
This commit ensures that all TestNG classes in the “testng” package and
any of its sub... | build.gradle | @@ -826,19 +826,23 @@ project("spring-test") {
task testNG(type: Test) {
useTestNG()
+ // forkEvery 1
scanForTestClasses = false
- include "**/testng/*.*"
+ include "**/testng/**/*.*"
exclude "**/FailingBeforeAndAfterMethodsTests.class"
// "TestCase" classes are run by other test classes, not the bui... | false |
Other | spring-projects | spring-framework | 8edb7a18ccb8cd1d1b072f1cf2931c9e7e932bfc.json | Revert previous impl for SPR-10163
This reverts commit 96b418cc8ae537e985cfe67b80cd866d03c8060f,
"Make RequestMappingHandlerMapping xml config easier".
This implementation makes the mvc:annotation namespace less readable,
and future configuration items would add even more to this namespace.
Issue: SPR-10163 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java | @@ -171,19 +171,6 @@ else if (element.hasAttribute("enableMatrixVariables")) {
Boolean enableMatrixVariables = Boolean.valueOf(element.getAttribute("enableMatrixVariables"));
handlerMappingDef.getPropertyValues().add("removeSemicolonContent", !enableMatrixVariables);
}
- if(element.hasAttribute("use-suffix-... | true |
Other | spring-projects | spring-framework | 8edb7a18ccb8cd1d1b072f1cf2931c9e7e932bfc.json | Revert previous impl for SPR-10163
This reverts commit 96b418cc8ae537e985cfe67b80cd866d03c8060f,
"Make RequestMappingHandlerMapping xml config easier".
This implementation makes the mvc:annotation namespace less readable,
and future configuration items would add even more to this namespace.
Issue: SPR-10163 | spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.0.xsd | @@ -255,35 +255,6 @@
]]></xsd:documentation>
</xsd:annotation>
</xsd:attribute>
- <xsd:attribute name="use-suffix-pattern-match" type="xsd:boolean">
- <xsd:annotation>
- <xsd:documentation><![CDATA[
- Whether to use suffix pattern match (".*") when matching... | true |
Other | spring-projects | spring-framework | 8edb7a18ccb8cd1d1b072f1cf2931c9e7e932bfc.json | Revert previous impl for SPR-10163
This reverts commit 96b418cc8ae537e985cfe67b80cd866d03c8060f,
"Make RequestMappingHandlerMapping xml config easier".
This implementation makes the mvc:annotation namespace less readable,
and future configuration items would add even more to this namespace.
Issue: SPR-10163 | spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2014 the original author or authors.
+ * 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.
@@ -15,6 +15,10 @@
*/
package org.springfram... | true |
Other | spring-projects | spring-framework | 8edb7a18ccb8cd1d1b072f1cf2931c9e7e932bfc.json | Revert previous impl for SPR-10163
This reverts commit 96b418cc8ae537e985cfe67b80cd866d03c8060f,
"Make RequestMappingHandlerMapping xml config easier".
This implementation makes the mvc:annotation namespace less readable,
and future configuration items would add even more to this namespace.
Issue: SPR-10163 | spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-content-negotiation-manager.xml | @@ -5,8 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <mvc:annotation-driven content-negotiation-manager="contentNegotiatio... | true |
Other | spring-projects | spring-framework | 8edb7a18ccb8cd1d1b072f1cf2931c9e7e932bfc.json | Revert previous impl for SPR-10163
This reverts commit 96b418cc8ae537e985cfe67b80cd866d03c8060f,
"Make RequestMappingHandlerMapping xml config easier".
This implementation makes the mvc:annotation namespace less readable,
and future configuration items would add even more to this namespace.
Issue: SPR-10163 | spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-custom-attributes.xml | @@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:mvc="http://www.springframework.org/schema/mvc"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://... | true |
Other | spring-projects | spring-framework | 6bb6b6e6b5620af0f82cd80fb8c65684097f22e5.json | Fix warnings in HeaderMethodArgumentResolver | spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolver.java | @@ -16,6 +16,9 @@
package org.springframework.messaging.handler.annotation.support;
+import java.util.List;
+import java.util.Map;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
@@ -25,10 +28,6 @@
i... | false |
Other | spring-projects | spring-framework | 809a5f59b3531f4dc774e0f5620d274412e51b08.json | Fix typo in reference
Issue: SPR-11311 | src/asciidoc/index.adoc | @@ -37220,7 +37220,7 @@ XML configuration equivalent:
http://www.springframework.org/schema/websocket/spring-websocket-4.0.xsd">
<websocket:message-broker>
- <websocket:stomp-endpoint path="/portfolio" />
+ <websocket:stomp-endpoint path="/portfolio">
<websocket:sockjs/>
</websocket:stomp-endpoint... | false |
Other | spring-projects | spring-framework | 19859fdb35009008da95d57ecacff259faca732f.json | Add section on test STOMP/WebSocket applications
Issue: SPR-11266 | src/asciidoc/index.adoc | @@ -36530,7 +36530,12 @@ server-side while <<websocket-fallback>> explains the SockJS protocol and shows
how to configure and use it.
<<websocket-stomp-overview>> introduces the STOMP messaging protocol.
-
+<<websocket-stomp-enable>> demonstrates how to configure STOMP support in Spring.
+<<websocket-stomp-handle>>... | false |
Other | spring-projects | spring-framework | 8ed8ee2dfe23c5c434fe8c0fa509067cf881fdc8.json | Skip abstract beans in getBeansWithAnnotation()
Update BeanFactory.getBeansWithAnnotation() to skip any abstract
bean definitions.
Issue: SPR-10663 | spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java | @@ -31,7 +31,6 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -469,11 +468,14 @@ public <T> Map<String, T> getBeansOfType(Class<T> type, boolean includeNonSingle
@O... | true |
Other | spring-projects | spring-framework | 8ed8ee2dfe23c5c434fe8c0fa509067cf881fdc8.json | Skip abstract beans in getBeansWithAnnotation()
Update BeanFactory.getBeansWithAnnotation() to skip any abstract
bean definitions.
Issue: SPR-10663 | spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests-abstract.xml | @@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<beans>
+
+ <bean id="abstractFactoryBean" class="org.springframework.beans.factory.FactoryBeanTests$AbstractFactoryBean" abstract="true"/>
+
+</bea... | true |
Other | spring-projects | spring-framework | 8ed8ee2dfe23c5c434fe8c0fa509067cf881fdc8.json | Skip abstract beans in getBeansWithAnnotation()
Update BeanFactory.getBeansWithAnnotation() to skip any abstract
bean definitions.
Issue: SPR-10663 | spring-beans/src/test/java/org/springframework/beans/factory/FactoryBeanTests.java | @@ -26,6 +26,7 @@
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.core.io.Resource;
+import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
/**
@@ -38,6 ... | true |
Other | spring-projects | spring-framework | 62e23363cb78bfb106d0dc499c8c2c18ec2a3719.json | Fix getters to match setters in RMHA
Issue: SPR-10519 | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java | @@ -63,11 +63,11 @@
import org.springframework.web.context.request.NativeWebRequest;
import org.springframework.web.context.request.ServletWebRequest;
import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.context.request.async.WebAsyncTask;
import org.springframework.web.context... | true |
Other | spring-projects | spring-framework | 62e23363cb78bfb106d0dc499c8c2c18ec2a3719.json | Fix getters to match setters in RMHA
Issue: SPR-10519 | spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java | @@ -16,9 +16,6 @@
package org.springframework.web.servlet.mvc.method.annotation;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
import java.lang.reflect.Method;
import java.util.Arrays;
@@ -41,6 +38,8 @@
import org.springframework.web.servlet.FlashMap;
import org.... | true |
Other | spring-projects | spring-framework | 9bc4663ead7ce90c5749537b6debaebf770f1280.json | Add accept(String) method to mock request builder
Issue: SPR-10390 | spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java | @@ -25,6 +25,7 @@
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
+
import javax.servlet.ServletContext;
import javax.servlet.ServletRequest;
import javax.servlet.http.Cookie;
@@ -188,6 +189,21 @@ public MockHttpServletRequestBuilder accept(MediaType... mediaTypes) {
return this;
}... | false |
Other | spring-projects | spring-framework | 01c4e458c75bbdcff3772dce2c0fada56c8993b9.json | Add support for "system" STOMP session
The "system" STOMP session is established at startup and can be used
to send messages without a client session, e.g. to support broadcasting
from a REST/HTTP handler method. | spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/StompHeaderAccessor.java | @@ -67,6 +67,10 @@ public class StompHeaderAccessor extends PubSubHeaderAccesssor {
public static final String NACK = "nack";
+ public static final String LOGIN = "login";
+
+ public static final String PASSCODE = "passcode";
+
public static final String DESTINATION = "destination";
public static final Stri... | true |
Other | spring-projects | spring-framework | 01c4e458c75bbdcff3772dce2c0fada56c8993b9.json | Add support for "system" STOMP session
The "system" STOMP session is established at startup and can be used
to send messages without a client session, e.g. to support broadcasting
from a REST/HTTP handler method. | spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/StompRelayPubSubMessageHandler.java | @@ -25,6 +25,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.LinkedBlockingQueue;
+import org.springframework.context.SmartLifecycle;
import org.springframework.http.MediaType;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
@@ -5... | true |
Other | spring-projects | spring-framework | 01c4e458c75bbdcff3772dce2c0fada56c8993b9.json | Add support for "system" STOMP session
The "system" STOMP session is established at startup and can be used
to send messages without a client session, e.g. to support broadcasting
from a REST/HTTP handler method. | spring-websocket/src/main/java/org/springframework/web/messaging/support/PubSubHeaderAccesssor.java | @@ -171,7 +171,7 @@ private Object getHeaderValue(String headerName) {
if (this.headers.get(headerName) != null) {
return this.headers.get(headerName);
}
- else if (this.originalHeaders.get(headerName) != null) {
+ else if ((this.originalHeaders != null) && (this.originalHeaders.get(headerName) != null)) {
... | true |
Other | spring-projects | spring-framework | 5feac077381b8cabe90c54f0c6f63fe8f8047b8a.json | Add getLastHandler to WebSocketHandlerDecorator | spring-websocket/src/main/java/org/springframework/web/socket/support/WebSocketHandlerDecorator.java | @@ -42,6 +42,14 @@ public WebSocketHandler getDelegate() {
return this.delegate;
}
+ public WebSocketHandler getLastHandler() {
+ WebSocketHandler result = delegate;
+ while (result instanceof WebSocketHandlerDecorator) {
+ result = ((WebSocketHandlerDecorator) result).getDelegate();
+ }
+ return result;
+... | true |
Other | spring-projects | spring-framework | 5feac077381b8cabe90c54f0c6f63fe8f8047b8a.json | Add getLastHandler to WebSocketHandlerDecorator | spring-websocket/src/test/java/org/springframework/web/socket/support/WebSocketHandlerDecoratorTests.java | @@ -0,0 +1,42 @@
+/*
+ * 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 | 28174744a74e08cc974a54041e304dc4aafa5334.json | Fix race when flushing messages
The use of an AtomicBoolean and no lock meant that it was possible
for a message to be queued and then never be flushed and sent to the
broker:
1. On t1, a message is received and isConnected is false. The message
will be queued.
2. On t2, CONNECTED is received from the broker. isCo... | spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/StompRelayPubSubMessageHandler.java | @@ -24,7 +24,6 @@
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.atomic.AtomicBoolean;
import org.springframework.http.MediaType;
import org.springframework.messaging.Message;
@@ -171,10 +170,... | false |
Other | spring-projects | spring-framework | d20dabf1fbcc77f152d0334a30fc30c1aa7d053a.json | Fix issue with obtaining WebSocketContainer | spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/ServerEndpointExporter.java | @@ -35,7 +35,6 @@
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
/**
@@ -58,9 +57,6 @@
*/
public class Serve... | false |
Other | spring-projects | spring-framework | 3c6c56fe0de9f31bf5f31e8f414f294fd03624dd.json | Fix issue with obtaining WebSocketContainer | spring-websocket/src/main/java/org/springframework/web/socket/server/endpoint/ServerEndpointExporter.java | @@ -35,7 +35,6 @@
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
/**
@@ -58,9 +57,6 @@
*/
public class Serve... | false |
Other | spring-projects | spring-framework | 3f9da6f4809431a323a627c719cc28987fb6945e.json | Add generic parameters to MessageHandler impls | spring-websocket/src/main/java/org/springframework/web/messaging/PubSubChannelRegistry.java | @@ -25,7 +25,8 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public interface PubSubChannelRegistry<M extends Message<?>, H extends MessageHandler<M>> {
+@SuppressWarnings("rawtypes")
+public interface PubSubChannelRegistry<M extends Message, H extends MessageHandler<M>> {
SubscribableChannel<M, H> getClien... | true |
Other | spring-projects | spring-framework | 3f9da6f4809431a323a627c719cc28987fb6945e.json | Add generic parameters to MessageHandler impls | spring-websocket/src/main/java/org/springframework/web/messaging/service/AbstractPubSubMessageHandler.java | @@ -37,7 +37,8 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public abstract class AbstractPubSubMessageHandler implements MessageHandler<Message<?>> {
+@SuppressWarnings("rawtypes")
+public abstract class AbstractPubSubMessageHandler<M extends Message> implements MessageHandler<M> {
protected final Log log... | true |
Other | spring-projects | spring-framework | 3f9da6f4809431a323a627c719cc28987fb6945e.json | Add generic parameters to MessageHandler impls | spring-websocket/src/main/java/org/springframework/web/messaging/service/ReactorPubSubMessageHandler.java | @@ -44,9 +44,10 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public class ReactorPubSubMessageHandler extends AbstractPubSubMessageHandler {
+@SuppressWarnings("rawtypes")
+public class ReactorPubSubMessageHandler<M extends Message> extends AbstractPubSubMessageHandler<M> {
- private MessageChannel<Message<?... | true |
Other | spring-projects | spring-framework | 3f9da6f4809431a323a627c719cc28987fb6945e.json | Add generic parameters to MessageHandler impls | spring-websocket/src/main/java/org/springframework/web/messaging/service/method/AnnotationPubSubMessageHandler.java | @@ -52,10 +52,11 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public class AnnotationPubSubMessageHandler extends AbstractPubSubMessageHandler
+@SuppressWarnings("rawtypes")
+public class AnnotationPubSubMessageHandler<M extends Message> extends AbstractPubSubMessageHandler<M>
implements ApplicationContextA... | true |
Other | spring-projects | spring-framework | 3f9da6f4809431a323a627c719cc28987fb6945e.json | Add generic parameters to MessageHandler impls | spring-websocket/src/main/java/org/springframework/web/messaging/service/method/ArgumentResolver.java | @@ -27,7 +27,8 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public interface ArgumentResolver {
+@SuppressWarnings("rawtypes")
+public interface ArgumentResolver<M extends Message> {
/**
* Whether the given {@linkplain MethodParameter method parameter} is
@@ -53,6 +54,6 @@ public interface ArgumentResol... | true |
Other | spring-projects | spring-framework | 3f9da6f4809431a323a627c719cc28987fb6945e.json | Add generic parameters to MessageHandler impls | spring-websocket/src/main/java/org/springframework/web/messaging/service/method/ArgumentResolverComposite.java | @@ -36,21 +36,21 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public class ArgumentResolverComposite implements ArgumentResolver {
+@SuppressWarnings("rawtypes")
+public class ArgumentResolverComposite<M extends Message> implements ArgumentResolver<M> {
protected final Log logger = LogFactory.getLog(getCla... | true |
Other | spring-projects | spring-framework | 3f9da6f4809431a323a627c719cc28987fb6945e.json | Add generic parameters to MessageHandler impls | spring-websocket/src/main/java/org/springframework/web/messaging/service/method/InvocableMessageHandlerMethod.java | @@ -43,9 +43,10 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public class InvocableMessageHandlerMethod extends HandlerMethod {
+@SuppressWarnings("rawtypes")
+public class InvocableMessageHandlerMethod<M extends Message> extends HandlerMethod {
- private ArgumentResolverComposite argumentResolvers = new Arg... | true |
Other | spring-projects | spring-framework | 3f9da6f4809431a323a627c719cc28987fb6945e.json | Add generic parameters to MessageHandler impls | spring-websocket/src/main/java/org/springframework/web/messaging/service/method/MessageBodyArgumentResolver.java | @@ -32,7 +32,8 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public class MessageBodyArgumentResolver implements ArgumentResolver {
+@SuppressWarnings("rawtypes")
+public class MessageBodyArgumentResolver<M extends Message> implements ArgumentResolver<M> {
private final MessageConverter converter;
@@ -47,... | true |
Other | spring-projects | spring-framework | 3f9da6f4809431a323a627c719cc28987fb6945e.json | Add generic parameters to MessageHandler impls | spring-websocket/src/main/java/org/springframework/web/messaging/service/method/MessageChannelArgumentResolver.java | @@ -28,12 +28,13 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public class MessageChannelArgumentResolver implements ArgumentResolver {
+@SuppressWarnings("rawtypes")
+public class MessageChannelArgumentResolver<M extends Message> implements ArgumentResolver<M> {
- private MessageChannel<Message<?>> messageB... | true |
Other | spring-projects | spring-framework | 3f9da6f4809431a323a627c719cc28987fb6945e.json | Add generic parameters to MessageHandler impls | spring-websocket/src/main/java/org/springframework/web/messaging/service/method/MessageReturnValueHandler.java | @@ -28,12 +28,13 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public class MessageReturnValueHandler implements ReturnValueHandler {
+@SuppressWarnings("rawtypes")
+public class MessageReturnValueHandler<M extends Message> implements ReturnValueHandler<M> {
- private MessageChannel<Message<?>> clientChannel;... | true |
Other | spring-projects | spring-framework | 3f9da6f4809431a323a627c719cc28987fb6945e.json | Add generic parameters to MessageHandler impls | spring-websocket/src/main/java/org/springframework/web/messaging/service/method/ReturnValueHandler.java | @@ -27,7 +27,8 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public interface ReturnValueHandler {
+@SuppressWarnings("rawtypes")
+public interface ReturnValueHandler<M extends Message> {
/**
* Whether the given {@linkplain MethodParameter method return type} is
@@ -50,6 +51,6 @@ public interface ReturnV... | true |
Other | spring-projects | spring-framework | 3f9da6f4809431a323a627c719cc28987fb6945e.json | Add generic parameters to MessageHandler impls | spring-websocket/src/main/java/org/springframework/web/messaging/service/method/ReturnValueHandlerComposite.java | @@ -28,26 +28,26 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public class ReturnValueHandlerComposite implements ReturnValueHandler {
+@SuppressWarnings("rawtypes")
+public class ReturnValueHandlerComposite<M extends Message> implements ReturnValueHandler<M> {
- private final List<ReturnValueHandler> return... | true |
Other | spring-projects | spring-framework | 3f9da6f4809431a323a627c719cc28987fb6945e.json | Add generic parameters to MessageHandler impls | spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/StompMessageConverter.java | @@ -37,7 +37,8 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public class StompMessageConverter {
+@SuppressWarnings("rawtypes")
+public class StompMessageConverter<M extends Message> {
private static final Charset STOMP_CHARSET = Charset.forName("UTF-8");
@@ -50,7 +51,7 @@ public class StompMessageConver... | true |
Other | spring-projects | spring-framework | 3f9da6f4809431a323a627c719cc28987fb6945e.json | Add generic parameters to MessageHandler impls | spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/StompRelayPubSubMessageHandler.java | @@ -55,11 +55,12 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public class StompRelayPubSubMessageHandler extends AbstractPubSubMessageHandler {
+@SuppressWarnings("rawtypes")
+public class StompRelayPubSubMessageHandler<M extends Message> extends AbstractPubSubMessageHandler<M> {
- private MessageChannel<Me... | true |
Other | spring-projects | spring-framework | 3f9da6f4809431a323a627c719cc28987fb6945e.json | Add generic parameters to MessageHandler impls | spring-websocket/src/main/java/org/springframework/web/messaging/stomp/support/StompWebSocketHandler.java | @@ -49,22 +49,24 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public class StompWebSocketHandler extends TextWebSocketHandlerAdapter implements MessageHandler<Message<?>> {
+@SuppressWarnings("rawtypes")
+public class StompWebSocketHandler<M extends Message> extends TextWebSocketHandlerAdapter
+ implements Me... | true |
Other | spring-projects | spring-framework | 3f9da6f4809431a323a627c719cc28987fb6945e.json | Add generic parameters to MessageHandler impls | spring-websocket/src/main/java/org/springframework/web/messaging/support/AbstractPubSubChannelRegistry.java | @@ -28,7 +28,9 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public class AbstractPubSubChannelRegistry<M extends Message<?>, H extends MessageHandler<M>> implements PubSubChannelRegistry<M, H>, InitializingBean {
+@SuppressWarnings("rawtypes")
+public class AbstractPubSubChannelRegistry<M extends Message, H ex... | true |
Other | spring-projects | spring-framework | 3f9da6f4809431a323a627c719cc28987fb6945e.json | Add generic parameters to MessageHandler impls | spring-websocket/src/main/java/org/springframework/web/messaging/support/ReactorMessageChannel.java | @@ -47,8 +47,8 @@ public class ReactorMessageChannel implements SubscribableChannel<Message<?>, Me
private String name = toString(); // TODO
- private final Map<MessageHandler, Registration<?>> registrations =
- new HashMap<MessageHandler, Registration<?>>();
+ private final Map<MessageHandler<Message<?>>, Regi... | true |
Other | spring-projects | spring-framework | 3f9da6f4809431a323a627c719cc28987fb6945e.json | Add generic parameters to MessageHandler impls | spring-websocket/src/main/java/org/springframework/web/messaging/support/SessionMessageChannel.java | @@ -28,32 +28,33 @@
* @author Rossen Stoyanchev
* @since 4.0
*/
-public class SessionMessageChannel implements MessageChannel<Message<?>> {
+@SuppressWarnings("rawtypes")
+public class SessionMessageChannel<M extends Message> implements MessageChannel<M> {
- private MessageChannel<Message<?>> delegate;
+ privat... | true |
Other | spring-projects | spring-framework | d5a5a4894fe0f04caa0d934e9fffa2b44181903a.json | Add header name to ex. msg in HeaderResultMatchers
Prior to this commit, the longValue() in HeaderResultMatchers added the
expected response header name to generated assertion failure messages;
however, both string() methods did not. This made it more difficult to
analyze the cause of failed tests.
Furthermore, while... | spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/HeaderResultMatchers.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.
@@ -17,6 +17,7 @@
package org.springframework.... | true |
Other | spring-projects | spring-framework | d5a5a4894fe0f04caa0d934e9fffa2b44181903a.json | Add header name to ex. msg in HeaderResultMatchers
Prior to this commit, the longValue() in HeaderResultMatchers added the
expected response header name to generated assertion failure messages;
however, both string() methods did not. This made it more difficult to
analyze the cause of failed tests.
Furthermore, while... | spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/HeaderAssertionTests.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,72 +16,154 @@
package org.springframe... | true |
Other | spring-projects | spring-framework | d25611dd40d6f17c70e67c1052c6629054c4e49a.json | Move MockMultHtServReqTests to correct package
This commit relocates MockMultipartHttpServletRequestTests to the
appropriate package. | spring-test/src/test/java/org/springframework/mock/web/MockMultipartHttpServletRequestTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2006 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.
@@ -14,12 +14,7 @@
* limitations under the Li... | false |
Other | spring-projects | spring-framework | 044f51283b92609e0a17c90adcaf0dc57201477c.json | Introduce ActiveProfilesResolver in the TCF
Prior to this commit, the active bean definition profiles to use when
loading an ApplicationContext for tests could only be configured
declaratively (i.e., via hard-coded values supplied to the 'value' or
'profiles' attribute of @ActiveProfiles).
This commit makes it possib... | spring-test/src/main/java/org/springframework/test/context/ActiveProfiles.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.
@@ -34,6 +34,7 @@
* @see SmartContextLoader
... | true |
Other | spring-projects | spring-framework | 044f51283b92609e0a17c90adcaf0dc57201477c.json | Introduce ActiveProfilesResolver in the TCF
Prior to this commit, the active bean definition profiles to use when
loading an ApplicationContext for tests could only be configured
declaratively (i.e., via hard-coded values supplied to the 'value' or
'profiles' attribute of @ActiveProfiles).
This commit makes it possib... | spring-test/src/main/java/org/springframework/test/context/ActiveProfilesResolver.java | @@ -0,0 +1,50 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *... | true |
Other | spring-projects | spring-framework | 044f51283b92609e0a17c90adcaf0dc57201477c.json | Introduce ActiveProfilesResolver in the TCF
Prior to this commit, the active bean definition profiles to use when
loading an ApplicationContext for tests could only be configured
declaratively (i.e., via hard-coded values supplied to the 'value' or
'profiles' attribute of @ActiveProfiles).
This commit makes it possib... | spring-test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java | @@ -16,11 +16,6 @@
package org.springframework.test.context;
-import static org.springframework.beans.BeanUtils.instantiateClass;
-import static org.springframework.core.annotation.AnnotationUtils.findAnnotationDeclaringClass;
-import static org.springframework.core.annotation.AnnotationUtils.findAnnotationDeclari... | true |
Other | spring-projects | spring-framework | 044f51283b92609e0a17c90adcaf0dc57201477c.json | Introduce ActiveProfilesResolver in the TCF
Prior to this commit, the active bean definition profiles to use when
loading an ApplicationContext for tests could only be configured
declaratively (i.e., via hard-coded values supplied to the 'value' or
'profiles' attribute of @ActiveProfiles).
This commit makes it possib... | spring-test/src/test/java/org/springframework/test/context/ContextCacheTests.java | @@ -32,6 +32,7 @@
* conjunction with cache keys used in {@link TestContext}.
*
* @author Sam Brannen
+ * @author Michail Nikolaev
* @since 3.1
* @see SpringRunnerContextCacheTests
*/
@@ -84,6 +85,7 @@ public void verifyCacheKeyIsBasedOnActiveProfiles() {
loadCtxAndAssertStats(FooBarProfilesTestCase.class... | true |
Other | spring-projects | spring-framework | 044f51283b92609e0a17c90adcaf0dc57201477c.json | Introduce ActiveProfilesResolver in the TCF
Prior to this commit, the active bean definition profiles to use when
loading an ApplicationContext for tests could only be configured
declaratively (i.e., via hard-coded values supplied to the 'value' or
'profiles' attribute of @ActiveProfiles).
This commit makes it possib... | spring-test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java | @@ -16,10 +16,6 @@
package org.springframework.test.context;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-import static org.springframework.test.context.ContextLoaderUtils.*;
-
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
@@ -38,10 +34,15 @@... | true |
Other | spring-projects | spring-framework | 044f51283b92609e0a17c90adcaf0dc57201477c.json | Introduce ActiveProfilesResolver in the TCF
Prior to this commit, the active bean definition profiles to use when
loading an ApplicationContext for tests could only be configured
declaratively (i.e., via hard-coded values supplied to the 'value' or
'profiles' attribute of @ActiveProfiles).
This commit makes it possib... | spring-test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4TestSuite.java | @@ -37,7 +37,9 @@
import org.springframework.test.context.junit4.orm.HibernateSessionFlushingTests;
import org.springframework.test.context.junit4.profile.annotation.DefaultProfileAnnotationConfigTests;
import org.springframework.test.context.junit4.profile.annotation.DevProfileAnnotationConfigTests;
+import org.spr... | true |
Other | spring-projects | spring-framework | 044f51283b92609e0a17c90adcaf0dc57201477c.json | Introduce ActiveProfilesResolver in the TCF
Prior to this commit, the active bean definition profiles to use when
loading an ApplicationContext for tests could only be configured
declaratively (i.e., via hard-coded values supplied to the 'value' or
'profiles' attribute of @ActiveProfiles).
This commit makes it possib... | spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/DevProfileResolverAnnotationConfigTests.java | @@ -0,0 +1,34 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ ... | true |
Other | spring-projects | spring-framework | 044f51283b92609e0a17c90adcaf0dc57201477c.json | Introduce ActiveProfilesResolver in the TCF
Prior to this commit, the active bean definition profiles to use when
loading an ApplicationContext for tests could only be configured
declaratively (i.e., via hard-coded values supplied to the 'value' or
'profiles' attribute of @ActiveProfiles).
This commit makes it possib... | spring-test/src/test/java/org/springframework/test/context/junit4/profile/annotation/ProfileAnnotationConfigTestSuite.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.
@@ -31,7 +31,8 @@
// Note: the following 'mult... | true |
Other | spring-projects | spring-framework | 044f51283b92609e0a17c90adcaf0dc57201477c.json | Introduce ActiveProfilesResolver in the TCF
Prior to this commit, the active bean definition profiles to use when
loading an ApplicationContext for tests could only be configured
declaratively (i.e., via hard-coded values supplied to the 'value' or
'profiles' attribute of @ActiveProfiles).
This commit makes it possib... | spring-test/src/test/java/org/springframework/test/context/junit4/profile/importresource/DevProfileResolverAnnotationConfigTests.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 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.