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 | 13ce20b1ca14320dd3ddab516aff495753a2feae.json | Remove IOException from HandshakeHandler | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/SockJsHttpRequestHandler.java | @@ -74,10 +74,15 @@ protected WebSocketHandler decorateWebSocketHandler(WebSocketHandler handler) {
public void handleRequest(HttpServletRequest servletRequest, HttpServletResponse servletResponse)
throws ServletException, IOException {
- ServerHttpRequest serverRequest = new ServletServerHttpRequest(servletRe... | true |
Other | spring-projects | spring-framework | 13ce20b1ca14320dd3ddab516aff495753a2feae.json | Remove IOException from HandshakeHandler | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/WebSocketTransportHandler.java | @@ -16,7 +16,6 @@
package org.springframework.web.socket.sockjs.transport.handler;
-import java.io.IOException;
import java.util.Collections;
import java.util.Map;
@@ -26,6 +25,7 @@
import org.springframework.web.socket.CloseStatus;
import org.springframework.web.socket.WebSocketHandler;
import org.springfr... | true |
Other | spring-projects | spring-framework | 2397b21096ad1c184d9f22629f74a6c44a9ba923.json | Upgrade spring-websocket to Tyrus 1.2.1
This targets currently nightly snapshots and future release
of Glassfish 4.0.1. | build.gradle | @@ -510,8 +510,8 @@ project("spring-websocket") {
exclude group: "org.apache.tomcat", module: "tomcat-websocket-api"
exclude group: "org.apache.tomcat", module: "tomcat-servlet-api"
}
- optional("org.glassfish.tyrus:tyrus-websocket-core:1.0")
- optional("org.glassfish.tyrus:tyrus-container-servlet:1.0")
+ ... | true |
Other | spring-projects | spring-framework | 2397b21096ad1c184d9f22629f74a6c44a9ba923.json | Upgrade spring-websocket to Tyrus 1.2.1
This targets currently nightly snapshots and future release
of Glassfish 4.0.1. | spring-websocket/src/main/java/org/springframework/web/socket/server/support/GlassFishRequestUpgradeStrategy.java | @@ -32,7 +32,7 @@
import org.glassfish.tyrus.core.EndpointWrapper;
import org.glassfish.tyrus.core.ErrorCollector;
import org.glassfish.tyrus.core.RequestContext;
-import org.glassfish.tyrus.server.TyrusEndpoint;
+import org.glassfish.tyrus.core.TyrusEndpoint;
import org.glassfish.tyrus.servlet.TyrusHttpUpgradeHand... | true |
Other | spring-projects | spring-framework | 11c41993f1654631a4cc9162404107f76bc5a949.json | Update documentation with coding guidelines
This commit:
* adds a reference to the Spring Code Style wiki page in the main
CONTRIBUTING document
* updates the link to the Spring team in README
* adds a note regarding Intellij IDEA 13 issues | CONTRIBUTING.md | @@ -6,28 +6,30 @@ to expect from the Spring team when evaluating your submission._
_Please refer back to this document as a checklist before issuing any pull
request; this will save time for everyone!_
-## Understand the basics
+## Take your first steps
+
+### Understand the basics
Not sure what a pull request i... | true |
Other | spring-projects | spring-framework | 11c41993f1654631a4cc9162404107f76bc5a949.json | Update documentation with coding guidelines
This commit:
* adds a reference to the Spring Code Style wiki page in the main
CONTRIBUTING document
* updates the link to the Spring team in README
* adds a note regarding Intellij IDEA 13 issues | README.md | @@ -95,7 +95,7 @@ The Spring Framework is released under version 2.0 of the [Apache License][].
[Pull requests]: http://help.github.com/send-pull-requests
[contributor guidelines]: https://github.com/SpringSource/spring-framework/blob/master/CONTRIBUTING.md
[@springframework]: http://twitter.com/springframework
-[te... | true |
Other | spring-projects | spring-framework | 11c41993f1654631a4cc9162404107f76bc5a949.json | Update documentation with coding guidelines
This commit:
* adds a reference to the Spring Code Style wiki page in the main
CONTRIBUTING document
* updates the link to the Spring team in README
* adds a note regarding Intellij IDEA 13 issues | import-into-idea.md | @@ -12,10 +12,11 @@ _Within your locally cloned spring-framework working directory:_
## Known issues
-1. `spring-aspects` does not compile out of the box due to references to aspect types unknown to IDEA.
+1. Those steps don't work currently for Intellij IDEA 13+
+2. `spring-aspects` does not compile out of the bo... | true |
Other | spring-projects | spring-framework | 0637864b3909ab13727cb228258b778a265da8d9.json | Ensure AnnotationUtils is compatible with Java 6
The previous commit introduced a dependency on
Class.getDeclaredAnnotation() which is a Java 8 API.
This commit refactors AnnotationUtils.findAnnotation(Class, Class, Set)
to use Class.getAnnotation() in conjunction with
isAnnotationDeclaredLocally() in order to achiev... | spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java | @@ -278,19 +278,19 @@ private static <A extends Annotation> A findAnnotation(Class<?> clazz, Class<A>
Set<Annotation> visited) {
Assert.notNull(clazz, "Class must not be null");
- A annotation = clazz.getDeclaredAnnotation(annotationType);
- if (annotation != null) {
- return annotation;
+ if (isAnnotatio... | false |
Other | spring-projects | spring-framework | b727cdb120dcf08e76b8fd505cb63b37a7220935.json | Adjust ActiveMQ settings in integration tests
Before this change tests on the CI server showed the following message:
Store limit is 102400 mb, whilst the data directory:
/opt/.../KahaDB only has 74810 mb of usable space
This change turns off store persistence and also explicitly sets the
limit on memory usage. | spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java | @@ -469,6 +469,9 @@ public String getSessionId() {
@Override
public void afterConnected(TcpConnection<byte[]> connection) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Established TCP connection to broker in session=" + this.sessionId);
+ }
this.tcpConnection = connection;
connection.send(Me... | true |
Other | spring-projects | spring-framework | b727cdb120dcf08e76b8fd505cb63b37a7220935.json | Adjust ActiveMQ settings in integration tests
Before this change tests on the CI server showed the following message:
Store limit is 102400 mb, whilst the data directory:
/opt/.../KahaDB only has 74810 mb of usable space
This change turns off store persistence and also explicitly sets the
limit on memory usage. | spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java | @@ -25,6 +25,7 @@
import java.util.concurrent.TimeUnit;
import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.After;
@@ -89,7 +90,9 @@ private void s... | true |
Other | spring-projects | spring-framework | dc6eaad2e96fac35df9ef2595d5acf7379a59525.json | Update copyright date in ContextLoaderUtils | spring-test/src/main/java/org/springframework/test/context/ContextLoaderUtils.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. | false |
Other | spring-projects | spring-framework | 8f0849f328ee5725af1c02d0aa02697a6ac93590.json | Fix minor error in AnnotationUtilsTests
TransactionalAndOrderedClass now extends TransactionalClass.
The tests passed anyway, but they did not actually verify what was meant
to be verified. | spring-core/src/test/java/org/springframework/core/annotation/AnnotationUtilsTests.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.
@@ -445,7 +445,7 @@ public static class Transac... | false |
Other | spring-projects | spring-framework | 461816735fe7414d5883ec1f013bc3339c69b021.json | Fix unused import warning | spring-core/src/main/java/org/springframework/core/ResolvableType.java | @@ -36,7 +36,6 @@
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ConcurrentReferenceHashMap;
-import org.springframework.util.ConcurrentReferenceHashMap.ReferenceType;
import org.springframework.util.ObjectUtils;
import org.springframework.util.S... | false |
Other | spring-projects | spring-framework | edba32b3093703d5e9ed42b5b8ec23ecc1998398.json | Add processExternalEntities support to OXM
Update OXM AbstractMarshaller to support processing of external
XML entities. By default external entities will not be processed.
Issue: SPR-11376 | spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java | @@ -162,6 +162,11 @@ public void setEncoding(String encoding) {
this.encoding = encoding;
}
+ @Override
+ protected String getDefaultEncoding() {
+ return this.encoding;
+ }
+
/**
* Set the locations of the Castor XML mapping files.
*/ | true |
Other | spring-projects | spring-framework | edba32b3093703d5e9ed42b5b8ec23ecc1998398.json | Add processExternalEntities support to OXM
Update OXM AbstractMarshaller to support processing of external
XML entities. By default external entities will not be processed.
Issue: SPR-11376 | spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java | @@ -400,6 +400,13 @@ public void setProcessExternalEntities(boolean processExternalEntities) {
this.processExternalEntities = processExternalEntities;
}
+ /**
+ * @return the configured value for whether XML external entities are allowed.
+ */
+ public boolean isProcessExternalEntities() {
+ return this.proce... | true |
Other | spring-projects | spring-framework | edba32b3093703d5e9ed42b5b8ec23ecc1998398.json | Add processExternalEntities support to OXM
Update OXM AbstractMarshaller to support processing of external
XML entities. By default external entities will not be processed.
Issue: SPR-11376 | spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.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.
@@ -28,6 +28,7 @@
import javax.xml.stream.XMLS... | true |
Other | spring-projects | spring-framework | edba32b3093703d5e9ed42b5b8ec23ecc1998398.json | Add processExternalEntities support to OXM
Update OXM AbstractMarshaller to support processing of external
XML entities. By default external entities will not be processed.
Issue: SPR-11376 | spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.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.
@@ -73,6 +73,34 @@ public abstract class Abstra... | true |
Other | spring-projects | spring-framework | edba32b3093703d5e9ed42b5b8ec23ecc1998398.json | Add processExternalEntities support to OXM
Update OXM AbstractMarshaller to support processing of external
XML entities. By default external entities will not be processed.
Issue: SPR-11376 | spring-oxm/src/main/java/org/springframework/oxm/xmlbeans/XmlBeansMarshaller.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 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.
@@ -113,6 +113,10 @@ public boolean isValidatin... | true |
Other | spring-projects | spring-framework | edba32b3093703d5e9ed42b5b8ec23ecc1998398.json | Add processExternalEntities support to OXM
Update OXM AbstractMarshaller to support processing of external
XML entities. By default external entities will not be processed.
Issue: SPR-11376 | spring-oxm/src/main/java/org/springframework/oxm/xstream/XStreamMarshaller.java | @@ -27,11 +27,9 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import javax.xml.stream.XMLEventReader;
-import javax.xml.stream.XMLEventWriter;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
+import ja... | true |
Other | spring-projects | spring-framework | edba32b3093703d5e9ed42b5b8ec23ecc1998398.json | Add processExternalEntities support to OXM
Update OXM AbstractMarshaller to support processing of external
XML entities. By default external entities will not be processed.
Issue: SPR-11376 | spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.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.
@@ -19,6 +19,8 @@
import java.io.ByteArrayInpu... | true |
Other | spring-projects | spring-framework | edba32b3093703d5e9ed42b5b8ec23ecc1998398.json | Add processExternalEntities support to OXM
Update OXM AbstractMarshaller to support processing of external
XML entities. By default external entities will not be processed.
Issue: SPR-11376 | spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.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.
@@ -31,9 +31,12 @@
import javax.xml.namespace.... | true |
Other | spring-projects | spring-framework | edba32b3093703d5e9ed42b5b8ec23ecc1998398.json | Add processExternalEntities support to OXM
Update OXM AbstractMarshaller to support processing of external
XML entities. By default external entities will not be processed.
Issue: SPR-11376 | spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java | @@ -16,21 +16,34 @@
package org.springframework.oxm.jibx;
+import java.io.IOException;
import java.io.StringWriter;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
i... | true |
Other | spring-projects | spring-framework | edba32b3093703d5e9ed42b5b8ec23ecc1998398.json | Add processExternalEntities support to OXM
Update OXM AbstractMarshaller to support processing of external
XML entities. By default external entities will not be processed.
Issue: SPR-11376 | spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java | @@ -28,7 +28,9 @@
import org.springframework.tests.Assume;
import org.springframework.tests.TestGroup;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
/**
* @author Arjen Poutsma | true |
Other | spring-projects | spring-framework | edba32b3093703d5e9ed42b5b8ec23ecc1998398.json | Add processExternalEntities support to OXM
Update OXM AbstractMarshaller to support processing of external
XML entities. By default external entities will not be processed.
Issue: SPR-11376 | spring-web/src/main/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverter.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2010 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.
@@ -28,6 +28,9 @@
import javax.xml.bind.annota... | true |
Other | spring-projects | spring-framework | edba32b3093703d5e9ed42b5b8ec23ecc1998398.json | Add processExternalEntities support to OXM
Update OXM AbstractMarshaller to support processing of external
XML entities. By default external entities will not be processed.
Issue: SPR-11376 | spring-web/src/main/java/org/springframework/http/converter/xml/SourceHttpMessageConverter.java | @@ -95,6 +95,12 @@ public void setProcessExternalEntities(boolean processExternalEntities) {
this.processExternalEntities = processExternalEntities;
}
+ /**
+ * @return the configured value for whether XML external entities are allowed.
+ */
+ public boolean isProcessExternalEntities() {
+ return this.process... | true |
Other | spring-projects | spring-framework | edba32b3093703d5e9ed42b5b8ec23ecc1998398.json | Add processExternalEntities support to OXM
Update OXM AbstractMarshaller to support processing of external
XML entities. By default external entities will not be processed.
Issue: SPR-11376 | spring-web/src/test/java/org/springframework/http/converter/xml/Jaxb2RootElementHttpMessageConverterTests.java | @@ -32,9 +32,13 @@
import org.springframework.aop.framework.AdvisedSupport;
import org.springframework.aop.framework.AopProxy;
import org.springframework.aop.framework.DefaultAopProxyFactory;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
import org.springframew... | true |
Other | spring-projects | spring-framework | 2b4c81e64240527c34d9896a13746596eab6e846.json | Fix memory leak in ConcurrentReferenceHashMap
Update ConcurrentReferenceHashMap to protect against references that
have been garbage collected but for some reason do not appear as a
`pollForPurge` result.
Also added purgeUnreferencedEntries() method to allow for programmatic
cleanup.
Issue: SPR-11440 | spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java | @@ -338,6 +338,19 @@ public void clear() {
}
}
+ /**
+ * Remove any entries that have been garbage collected and are no longer referenced.
+ * Under normal circumstances garbage collected entries are automatically purged as
+ * items are added or removed from the Map. This method can be used to force a purge,... | false |
Other | spring-projects | spring-framework | fe6a9826c57705149610fd678f71f0f6e423ff9f.json | Fix typo in AbstractDelegatingSmartContextLoader | spring-test/src/main/java/org/springframework/test/context/support/AbstractDelegatingSmartContextLoader.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 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.
@@ -57,7 +57,7 @@
* files nor annotated class... | false |
Other | spring-projects | spring-framework | 268657b6cb5ba3153f2d35e37a7e21e8197db6cd.json | Add PropertyNamingStrategy field to ObjectMapperFB
Issue: SPR-11431 | spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.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.
@@ -34,6 +34,7 @@
import com.fasterxml.jackson... | true |
Other | spring-projects | spring-framework | 268657b6cb5ba3153f2d35e37a7e21e8197db6cd.json | Add PropertyNamingStrategy field to ObjectMapperFB
Issue: SPR-11431 | spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.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.
@@ -32,6 +32,7 @@
import com.fasterxml.jackson... | true |
Other | spring-projects | spring-framework | 0cb27f4bc50e4ce78c64176a0aec1291754cabfd.json | Allow HttpMethod as a controller method argument
Issue: SPR-11425 | spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 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.
@@ -73,6 +73,7 @@
* <li>{@link java.io.Output... | true |
Other | spring-projects | spring-framework | 0cb27f4bc50e4ce78c64176a0aec1291754cabfd.json | Allow HttpMethod as a controller method argument
Issue: SPR-11425 | spring-web/src/main/java/org/springframework/web/context/request/ServletWebRequest.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,6 +24,8 @@
import javax.servlet.http.Ht... | true |
Other | spring-projects | spring-framework | 0cb27f4bc50e4ce78c64176a0aec1291754cabfd.json | Allow HttpMethod as a controller method argument
Issue: SPR-11425 | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.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.
@@ -29,8 +29,10 @@
import javax.servlet.http.H... | true |
Other | spring-projects | spring-framework | 0cb27f4bc50e4ce78c64176a0aec1291754cabfd.json | Allow HttpMethod as a controller method argument
Issue: SPR-11425 | spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.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.
@@ -30,6 +30,7 @@
import org.junit.Test;
im... | true |
Other | spring-projects | spring-framework | 0cb27f4bc50e4ce78c64176a0aec1291754cabfd.json | Allow HttpMethod as a controller method argument
Issue: SPR-11425 | src/asciidoc/index.adoc | @@ -28946,6 +28946,7 @@ multiple requests are allowed to access a session concurrently.
value is the raw InputStream/Reader as exposed by the Servlet API.
* `java.io.OutputStream` / `java.io.Writer` for generating the response's content. This
value is the raw OutputStream/Writer as exposed by the Servlet API.
+*... | true |
Other | spring-projects | spring-framework | b1abe26b334fdcedff4084f5addf95b78917470e.json | Add ResultMatchers for status code ranges
Issue: SPR-11424 | spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.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.
@@ -65,6 +65,76 @@ public void match(MvcResult ... | true |
Other | spring-projects | spring-framework | b1abe26b334fdcedff4084f5addf95b78917470e.json | Add ResultMatchers for status code ranges
Issue: SPR-11424 | spring-test/src/test/java/org/springframework/test/web/servlet/result/StatusResultMatchersTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
import java.util.ArrayList;
... | true |
Other | spring-projects | spring-framework | 8028eae786ff36ea58df9a385319bf045795fa77.json | Fix CGLIB memory leak for method injection
This commit continues the work for fixing memory leaks resulting from
CGLIB subclass generation for beans relying on method injection.
- Set proxy callbacks on the CGLIB Factory (i.e., the instance) instead
of in the generated subclass (i.e., via the Enhancer).
- Convert ... | spring-beans/src/main/java/org/springframework/beans/factory/support/CglibSubclassingInstantiationStrategy.java | @@ -22,22 +22,27 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.BeanInstantiationException;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.cglib.core.SpringNami... | true |
Other | spring-projects | spring-framework | 8028eae786ff36ea58df9a385319bf045795fa77.json | Fix CGLIB memory leak for method injection
This commit continues the work for fixing memory leaks resulting from
CGLIB subclass generation for beans relying on method injection.
- Set proxy callbacks on the CGLIB Factory (i.e., the instance) instead
of in the generated subclass (i.e., via the Enhancer).
- Convert ... | spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java | @@ -65,7 +65,6 @@
import org.springframework.util.FileCopyUtils;
import org.springframework.util.SerializationTestUtils;
import org.springframework.util.StopWatch;
-
import org.xml.sax.InputSource;
import static org.hamcrest.CoreMatchers.*;
@@ -390,11 +389,11 @@ public void testAutowireModeNotInherited() {
Xm... | true |
Other | spring-projects | spring-framework | 2ea5360b822c2618586370577cbd4a548c88efac.json | Upgrade Jetty to 9.1.0 GA
Issue: SPR-11099 | build.gradle | @@ -18,6 +18,7 @@ configure(allprojects) { project ->
ext.hsqldbVersion = "1.8.0.10"
ext.junitVersion = "4.11"
ext.slf4jVersion = "1.6.1"
+ ext.jettyVersion = "9.1.0.v20131115"
ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
apply plugin: "propdeps"
@@ -389,10 +390,10 @@ project("spring-... | false |
Other | spring-projects | spring-framework | cc4faa59902a18e22c9e554b7576883b89c6b36e.json | Fix standard multipart binding + Polish
Fixing standard multipart binding when multiple parts share
the same name.
Uncomment previously @Ignored tests now that Jetty supports
Servlet 3.0 spec.
Issue: SPR-10591 | spring-web/src/main/java/org/springframework/web/bind/support/WebRequestDataBinder.java | @@ -17,13 +17,17 @@
package org.springframework.web.bind.support;
import java.io.IOException;
+import java.util.List;
+import java.util.Map;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.Part;
import org.springframework.beans.MutablePropertyVa... | true |
Other | spring-projects | spring-framework | cc4faa59902a18e22c9e554b7576883b89c6b36e.json | Fix standard multipart binding + Polish
Fixing standard multipart binding when multiple parts share
the same name.
Uncomment previously @Ignored tests now that Jetty supports
Servlet 3.0 spec.
Issue: SPR-10591 | spring-web/src/test/java/org/springframework/web/bind/support/WebRequestDataBinderIntegrationTests.java | @@ -21,7 +21,6 @@
import javax.servlet.MultipartConfigElement;
import javax.servlet.ServletException;
-import javax.servlet.annotation.MultipartConfig;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -38,7 +37,6 @@
import org... | true |
Other | spring-projects | spring-framework | cc4faa59902a18e22c9e554b7576883b89c6b36e.json | Fix standard multipart binding + Polish
Fixing standard multipart binding when multiple parts share
the same name.
Uncomment previously @Ignored tests now that Jetty supports
Servlet 3.0 spec.
Issue: SPR-10591 | spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java | @@ -19,13 +19,14 @@
import java.net.URI;
import java.util.Arrays;
+import javax.servlet.MultipartConfigElement;
+
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.junit.AfterClass;
import org.junit.Before;... | true |
Other | spring-projects | spring-framework | 6f2004f4f8fcaaa2b712901753d660af59d943fe.json | Restore multi-page and PDF reference documentation
Generate docbook xml from the asciidoc reference guide and use the
docbook-reference-plugin to generate HTML (single and multi-page) and
PDF documentation.
Issue: SPR-11096 | build.gradle | @@ -5,6 +5,7 @@ buildscript {
dependencies {
classpath("org.springframework.build.gradle:propdeps-plugin:0.0.5")
classpath("org.asciidoctor:asciidoctor-gradle-plugin:0.7.0")
+ classpath("org.springframework.build.gradle:docbook-reference-plugin:0.2.8")
}
}
@@ -857,29 +858,36 @@ configure(rootProject) {
... | true |
Other | spring-projects | spring-framework | 6f2004f4f8fcaaa2b712901753d660af59d943fe.json | Restore multi-page and PDF reference documentation
Generate docbook xml from the asciidoc reference guide and use the
docbook-reference-plugin to generate HTML (single and multi-page) and
PDF documentation.
Issue: SPR-11096 | src/asciidoc/index-docinfo.xml | @@ -0,0 +1,11 @@
+<productname>Spring Framework</productname>
+<releaseinfo>{revnumber}</releaseinfo>
+<copyright>
+ <year>2004-2013</year>
+</copyright>
+<legalnotice>
+ <para>Copies of this document may be made for your own use and for distribution to
+ others, provided that you do not charge any fee for such copies ... | true |
Other | spring-projects | spring-framework | 6f2004f4f8fcaaa2b712901753d660af59d943fe.json | Restore multi-page and PDF reference documentation
Generate docbook xml from the asciidoc reference guide and use the
docbook-reference-plugin to generate HTML (single and multi-page) and
PDF documentation.
Issue: SPR-11096 | src/asciidoc/index.adoc | @@ -1,30 +1,15 @@
= Spring Framework Reference Documentation
-:author: Rod Johnson; Juergen Hoeller; Keith Donald; Colin Sampaleanu; Rob Harrop; +
- Thomas Risberg; Alef Arendsen; Darren Davison; Dmitriy Kopylenko; +
- Mark Pollack; Thierry Templier; Erwin Vervaet; Portia Tung; Ben Hale; +
- Ad... | true |
Other | spring-projects | spring-framework | 5d8b008a8b62be9b0c9d442da878ebc8edf8f55c.json | Remove superfluous spaces in asciidoc
Remove the superfluous spaces that appear in the asciidoc source.
Issue: SPR-11096 | src/asciidoc/index.adoc | @@ -927,7 +927,7 @@ public class RewardsTestDatabase {
[[new-java-configuration]]
===== Java based bean metadata
-Some core features from the JavaConfig project have been added to the Spring Framework
+Some core features from the JavaConfig project have been added to the Spring Framework
now. This means that the ... | false |
Other | spring-projects | spring-framework | 99cf06bfc93b4a0f4840bbcdbe62c9ba2e966d52.json | Remove superfluous space before 'http' in asciidoc
Remove the superfluous space that appears before each 'http' reference
in the asciidoc source. Presumably there due to some quirk of the
docbook conversion.
Issue: SPR-11096 | src/asciidoc/index.adoc | @@ -34,7 +34,7 @@ your code base.
This document is a reference guide to Spring Framework features. If you have any
requests, comments, or questions on this document, please post them on the user mailing
-list or on the support forums at http://forum.spring.io/[].
+list or on the support forums at http://forum.spri... | false |
Other | spring-projects | spring-framework | 13bef4fd2d3b0b307b6498a84302fdce8ecb9eb2.json | Specify asciidoc type
Specify a specific asciidoc type of 'docbook' to prevent
'multiple titles at level 0' errors during generation.
Issue: SPR-11096 | src/asciidoc/index.adoc | @@ -5,6 +5,7 @@
Adrian Colyer; John Lewis; Costin Leau; Mark Fisher; Sam Brannen; +
Ramnivas Laddad; Arjen Poutsma; Chris Beams; Tareq Abedrabbo; Andy Clement; +
Dave Syer; Oliver Gierke; Rossen Stoyanchev; Phillip Webb; Rob Winch
+:doctype: book
Core support for dependency injection, t... | false |
Other | spring-projects | spring-framework | cb858a3b01ec071366a9fa40fa680f4712619a9b.json | Replace springsource.org links with spring.io
Update reference documentation links to use the new spring.io domain.
Issue: SPR-11096 | src/asciidoc/index.adoc | @@ -11,7 +11,7 @@ The Spring Framework is a lightweight solution and a potential one-stop-shop for
Spring is designed to be non-intrusive, meaning that your domain logic code generally has no dependencies on the framework itself. In your integration layer (such as the data access layer), some dependencies on the dat... | false |
Other | spring-projects | spring-framework | ea08d4b49c06f0c5291f0779267be11255861938.json | Add .gradletasknamecache to .gitignore | .gitignore | @@ -36,3 +36,4 @@ spring-*/src/main/java/META-INF/MANIFEST.MF
out
test-output
atlassian-ide-plugin.xml
+.gradletasknamecache | false |
Other | spring-projects | spring-framework | dfa7483812df219440e3e7c8a58e0421e55924e6.json | Fix broken javadoc links in reference guide
Replace links in the reference documentation from
`http://static.springsource.org/spring/docs/current/api/..` to
`http://docs.spring.io/spring/docs/current/javadoc-api/..`
Issue: SPR-11087 | src/asciidoc/index.adoc | @@ -894,7 +894,7 @@ A `ContentNegotiationStrategy` is now available for resolving the requested medi
`ContentNegotiationManager` is the central class to use when configuring content negotiation options. For more details see <<mvc-config-content-negotiation>>.
-The introduction of `ContentNegotiationManger` also en... | false |
Other | spring-projects | spring-framework | e84885c65508a6182dd8ed204afebe45503898cf.json | Update STOMP decoder to handle incomplete frames
Previously, StompDecoder would throw a StompConversionException when
it attempted to decode a Buffer that contained an incomplete frame.
This commit updates StompDecoder to return null when it encounters an
incomplete frame. It also resets the buffer, thereby allowing ... | spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompCodec.java | @@ -53,6 +53,8 @@ public Message<byte[]> apply(Buffer buffer) {
Message<byte[]> message = DECODER.decode(buffer.byteBuffer());
if (message != null) {
next.accept(message);
+ } else {
+ break;
}
}
return null; | true |
Other | spring-projects | spring-framework | e84885c65508a6182dd8ed204afebe45503898cf.json | Update STOMP decoder to handle incomplete frames
Previously, StompDecoder would throw a StompConversionException when
it attempted to decode a Buffer that contained an incomplete frame.
This commit updates StompDecoder to return null when it encounters an
incomplete frame. It also resets the buffer, thereby allowing ... | spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java | @@ -52,26 +52,35 @@ public class StompDecoder {
public Message<byte[]> decode(ByteBuffer buffer) {
skipLeadingEol(buffer);
- Message<byte[]> decodedMessage;
+ Message<byte[]> decodedMessage = null;
+
+ buffer.mark();
String command = readCommand(buffer);
if (command.length() > 0) {
MultiValueMap... | true |
Other | spring-projects | spring-framework | e84885c65508a6182dd8ed204afebe45503898cf.json | Update STOMP decoder to handle incomplete frames
Previously, StompDecoder would throw a StompConversionException when
it attempted to decode a Buffer that contained an incomplete frame.
This commit updates StompDecoder to return null when it encounters an
incomplete frame. It also resets the buffer, thereby allowing ... | spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompCodecTests.java | @@ -158,6 +158,30 @@ public void accept(Message<byte[]> message) {
assertEquals(StompCommand.DISCONNECT, StompHeaderAccessor.wrap(messages.get(1)).getCommand());
}
+ @Test
+ public void decodeFrameWithIncompleteHeader() {
+ assertIncompleteDecode("SEND\ndestination");
+ assertIncompleteDecode("SEND\ndestinatio... | true |
Other | spring-projects | spring-framework | 72dec7d0fed80cf74139157690641096de23f41a.json | Add default destination for @SendTo methods
Issue: SPR-11085 | spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java | @@ -52,6 +52,10 @@ public class SendToMethodReturnValueHandler implements HandlerMethodReturnValueH
private final boolean annotationRequired;
+ private String defaultDestinationPrefix = "/topic";
+
+ private String defaultUserDestinationPrefix = "/queue";
+
public SendToMethodReturnValueHandler(SimpMessageSen... | true |
Other | spring-projects | spring-framework | 72dec7d0fed80cf74139157690641096de23f41a.json | Add default destination for @SendTo methods
Issue: SPR-11085 | spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandlerTests.java | @@ -30,7 +30,6 @@
import org.springframework.core.MethodParameter;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
-import org.springframework.messaging.handler.annotation.MessageMapping;
import org.springframework.messaging.handler.annotation.SendTo;
import org.s... | true |
Other | spring-projects | spring-framework | 72dec7d0fed80cf74139157690641096de23f41a.json | Add default destination for @SendTo methods
Issue: SPR-11085 | spring-messaging/src/test/java/org/springframework/messaging/simp/handler/SimpAnnotationMethodIntegrationTests.java | @@ -102,7 +102,7 @@ public void sendMessageToControllerAndReceiveReplyViaTopic() throws Exception {
"id:subs1", "destination:/topic/increment").build();
TextMessage message2 = create(StompCommand.SEND).headers(
- "destination:/app/topic/increment").body("5").build();
+ "destination:/app/increment").body... | true |
Other | spring-projects | spring-framework | 6900645d59b7fa808cac9bae369611b73793a8ce.json | Fix a typo in package description | spring-jdbc/src/main/java/org/springframework/jdbc/package-info.java | @@ -1,10 +1,9 @@
-
/**
*
* The classes in this package make JDBC easier to use and
* reduce the likelihood of common errors. In particular, they:
* <ul>
- * <li>Simplify error handling, avoiding the need for try/catch/final
+ * <li>Simplify error handling, avoiding the need for try/catch/finally
* blocks in ... | false |
Other | spring-projects | spring-framework | 2a6c1f75e7f9601d736dfebe5823e7070edf1db5.json | Simplify determination of SockJS path
The SockJS path is now passed to the SockJsService handleRequest method
thus removing the need to guess it.
Issue: SPR-11058 | spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractStompEndpointRegistration.java | @@ -147,7 +147,7 @@ public StompSockJsServiceRegistration(TaskScheduler defaultTaskScheduler) {
}
protected SockJsService getSockJsService() {
- return super.getSockJsService(paths);
+ return super.getSockJsService();
}
}
| true |
Other | spring-projects | spring-framework | 2a6c1f75e7f9601d736dfebe5823e7070edf1db5.json | Simplify determination of SockJS path
The SockJS path is now passed to the SockJsService handleRequest method
thus removing the need to guess it.
Issue: SPR-11058 | spring-websocket/src/main/java/org/springframework/web/socket/server/config/AbstractWebSocketHandlerRegistration.java | @@ -16,9 +16,7 @@
package org.springframework.web.socket.server.config;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.List;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.util.Assert;
@@ -110,7 +108,7 @@ final M getMappings() {
M mappings = createM... | true |
Other | spring-projects | spring-framework | 2a6c1f75e7f9601d736dfebe5823e7070edf1db5.json | Simplify determination of SockJS path
The SockJS path is now passed to the SockJsService handleRequest method
thus removing the need to guess it.
Issue: SPR-11058 | spring-websocket/src/main/java/org/springframework/web/socket/server/config/SockJsServiceRegistration.java | @@ -199,11 +199,8 @@ public SockJsServiceRegistration setInterceptors(HandshakeInterceptor... interce
return this;
}
- protected SockJsService getSockJsService(String[] sockJsPrefixes) {
+ protected SockJsService getSockJsService() {
DefaultSockJsService service = createSockJsService();
- if (sockJsPrefixes ... | true |
Other | spring-projects | spring-framework | 2a6c1f75e7f9601d736dfebe5823e7070edf1db5.json | Simplify determination of SockJS path
The SockJS path is now passed to the SockJsService handleRequest method
thus removing the need to guess it.
Issue: SPR-11058 | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/SockJsHttpRequestHandler.java | @@ -28,6 +28,7 @@
import org.springframework.http.server.ServletServerHttpResponse;
import org.springframework.util.Assert;
import org.springframework.web.HttpRequestHandler;
+import org.springframework.web.servlet.HandlerMapping;
import org.springframework.web.socket.WebSocketHandler;
import org.springframework.w... | true |
Other | spring-projects | spring-framework | 2a6c1f75e7f9601d736dfebe5823e7070edf1db5.json | Simplify determination of SockJS path
The SockJS path is now passed to the SockJsService handleRequest method
thus removing the need to guess it.
Issue: SPR-11058 | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/SockJsService.java | @@ -29,11 +29,6 @@
* asynchronous support enabled through the ServletContext API or by adding an
* {@code <async-support>true</async-support>} element to servlet and filter declarations
* in web.xml.
- * <p>
- * The service can be integrated into any HTTP request handling mechanism (e.g. plain
- * Servlet, Spring... | true |
Other | spring-projects | spring-framework | 2a6c1f75e7f9601d736dfebe5823e7070edf1db5.json | Simplify determination of SockJS path
The SockJS path is now passed to the SockJsService handleRequest method
thus removing the need to guess it.
Issue: SPR-11058 | spring-websocket/src/main/java/org/springframework/web/socket/sockjs/support/AbstractSockJsService.java | @@ -18,15 +18,11 @@
import java.io.IOException;
import java.nio.charset.Charset;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
-import java.util.... | true |
Other | spring-projects | spring-framework | 2a6c1f75e7f9601d736dfebe5823e7070edf1db5.json | Simplify determination of SockJS path
The SockJS path is now passed to the SockJsService handleRequest method
thus removing the need to guess it.
Issue: SPR-11058 | spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/AbstractSockJsServiceTests.java | @@ -51,84 +51,9 @@ public void setUp() {
this.service = new TestSockJsService(new ThreadPoolTaskScheduler());
}
- @Test
- public void getSockJsPathForGreetingRequest() throws Exception {
-
- handleRequest("GET", "/a", HttpStatus.OK);
- assertEquals("Welcome to SockJS!\n", this.servletResponse.getContentAsStrin... | true |
Other | spring-projects | spring-framework | 2a6c1f75e7f9601d736dfebe5823e7070edf1db5.json | Simplify determination of SockJS path
The SockJS path is now passed to the SockJsService handleRequest method
thus removing the need to guess it.
Issue: SPR-11058 | spring-websocket/src/test/java/org/springframework/web/socket/sockjs/transport/handler/DefaultSockJsServiceTests.java | @@ -44,11 +44,11 @@
*/
public class DefaultSockJsServiceTests extends AbstractHttpRequestTests {
- private static final String sockJsPrefix = "mysockjs";
+ private static final String sockJsPrefix = "/mysockjs";
private static final String sessionId = "session1";
- private static final String sessionUrlPrefi... | true |
Other | spring-projects | spring-framework | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/main/java/org/springframework/messaging/simp/config/MessageBrokerConfigurer.java | @@ -39,6 +39,8 @@ public class MessageBrokerConfigurer {
private String[] annotationMethodDestinationPrefixes;
+ private String userDestinationPrefix;
+
public MessageBrokerConfigurer(MessageChannel webSocketResponseChannel) {
Assert.notNull(webSocketResponseChannel);
@@ -81,6 +83,26 @@ public MessageBroke... | true |
Other | spring-projects | spring-framework | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/main/java/org/springframework/messaging/simp/config/ServletStompEndpointRegistry.java | @@ -22,7 +22,7 @@
import java.util.Map;
import org.springframework.messaging.handler.websocket.SubProtocolWebSocketHandler;
-import org.springframework.messaging.simp.handler.MutableUserQueueSuffixResolver;
+import org.springframework.messaging.simp.handler.UserSessionRegistry;
import org.springframework.messaging... | true |
Other | spring-projects | spring-framework | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/main/java/org/springframework/messaging/simp/config/WebSocketMessageBrokerConfigurationSupport.java | @@ -68,8 +68,9 @@ public abstract class WebSocketMessageBrokerConfigurationSupport {
@Bean
public HandlerMapping brokerWebSocketHandlerMapping() {
- ServletStompEndpointRegistry registry = new ServletStompEndpointRegistry(subProtocolWebSocketHandler(),
- userQueueSuffixResolver(), brokerDefaultSockJsTaskSched... | true |
Other | spring-projects | spring-framework | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/main/java/org/springframework/messaging/simp/handler/AbstractSubscriptionRegistry.java | @@ -108,7 +108,11 @@ public final MultiValueMap<String, String> findSubscriptions(Message<?> message)
if (logger.isTraceEnabled()) {
logger.trace("Find subscriptions, destination=" + headers.getDestination());
}
- return findSubscriptionsInternal(destination, message);
+ MultiValueMap<String, String> result... | true |
Other | spring-projects | spring-framework | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/main/java/org/springframework/messaging/simp/handler/DefaultUserDestinationResolver.java | @@ -0,0 +1,187 @@
+/*
+ * 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 | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/main/java/org/springframework/messaging/simp/handler/DefaultUserSessionRegistry.java | @@ -0,0 +1,79 @@
+/*
+ * 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 | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/main/java/org/springframework/messaging/simp/handler/SimpleUserQueueSuffixResolver.java | @@ -1,75 +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 | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/main/java/org/springframework/messaging/simp/handler/UserDestinationMessageHandler.java | @@ -23,20 +23,19 @@
import org.springframework.messaging.MessagingException;
import org.springframework.messaging.core.MessageSendingOperations;
import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
-import org.springframework.messaging.simp.SimpMessageType;
import org.springframework.messaging.suppo... | true |
Other | spring-projects | spring-framework | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/main/java/org/springframework/messaging/simp/handler/UserDestinationResolver.java | @@ -0,0 +1,54 @@
+/*
+ * 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 | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/main/java/org/springframework/messaging/simp/handler/UserQueueSuffixResolver.java | @@ -1,48 +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 | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/main/java/org/springframework/messaging/simp/handler/UserSessionRegistry.java | @@ -0,0 +1,44 @@
+package org.springframework.messaging.simp.handler;
+
+import java.util.Set;
+
+/**
+ * A registry for looking up active session id's by user.
+ * <p>
+ * Used in support of resolving unique session-specific user destinations.
+ * See {@link DefaultUserDestinationResolver} for more details.
+ *
+ * @a... | true |
Other | spring-projects | spring-framework | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompProtocolHandler.java | @@ -30,8 +30,7 @@
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.handler.websocket.SubProtocolHandler;
import org.springframework.messaging.simp.SimpMessageType;
-import org.springframework.messaging.simp.handler.MutableUserQueueSuffixResolver;
-import org.springframework.m... | true |
Other | spring-projects | spring-framework | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/test/java/org/springframework/messaging/simp/TestPrincipal.java | @@ -14,17 +14,44 @@
* limitations under the License.
*/
-package org.springframework.messaging.simp.handler;
+package org.springframework.messaging.simp;
+
+import java.security.Principal;
/**
+ * An implementation of {@link Principal} for testing.
+ *
* @author Rossen Stoyanchev
- * @since 4.0
*/
-publi... | true |
Other | spring-projects | spring-framework | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/test/java/org/springframework/messaging/simp/config/ServletStompEndpointRegistryTests.java | @@ -24,8 +24,8 @@
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.handler.websocket.SubProtocolHandler;
import org.springframework.messaging.handler.websocket.SubProtocolWebSocketHandler;
-import org.springframework.messaging.simp.handler.MutableUserQueueSuffixResolver;
-imp... | true |
Other | spring-projects | spring-framework | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/test/java/org/springframework/messaging/simp/config/WebSocketMessageBrokerConfigurationSupportTests.java | @@ -35,9 +35,9 @@
import org.springframework.messaging.simp.SimpMessageType;
import org.springframework.messaging.simp.annotation.SubscribeEvent;
import org.springframework.messaging.simp.handler.SimpAnnotationMethodMessageHandler;
-import org.springframework.messaging.simp.handler.MutableUserQueueSuffixResolver;
i... | true |
Other | spring-projects | spring-framework | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/test/java/org/springframework/messaging/simp/handler/DefaultUserDestinationResolverTests.java | @@ -0,0 +1,120 @@
+/*
+ * 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 | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/test/java/org/springframework/messaging/simp/handler/DefaultUserSessionRegistryTests.java | @@ -27,56 +27,57 @@
/**
- * Test fixture for {@link SimpleUserQueueSuffixResolver}
+ * Test fixture for {@link DefaultUserSessionRegistry}
*
* @author Rossen Stoyanchev
* @since 4.0
*/
-public class SimpleUserQueueSuffixResolverTests {
+public class DefaultUserSessionRegistryTests {
private static fina... | true |
Other | spring-projects | spring-framework | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/test/java/org/springframework/messaging/simp/handler/UserDestinationMessageHandlerTests.java | @@ -0,0 +1,126 @@
+/*
+ * 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 | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompProtocolHandlerTests.java | @@ -28,9 +28,9 @@
import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
import org.springframework.messaging.simp.SimpMessageType;
+import org.springframework.messaging.simp.TestPrincipal;
import org.springframework.messaging.support.MessageBuilder... | true |
Other | spring-projects | spring-framework | 0340cc5f03c2d2ece2352d8f04bdc87344d27acc.json | Update user destinations handling
Before this change subscribing to a user-specific destination in STOMP
required manually appending a unique queue suffix provided in a header
with the CONNECTED frame.
This change removes the need to do that. Instead STOMP clients can
subscribe to "/user/queue/error" and can then beg... | spring-websocket/src/test/java/org/springframework/web/socket/support/TestPrincipal.java | @@ -20,7 +20,8 @@
/**
- * An implementation of Prinicipal for testing.
+ * An implementation of {@link Principal} for testing.
+ *
* @author Rossen Stoyanchev
*/
public class TestPrincipal implements Principal { | true |
Other | spring-projects | spring-framework | c09f85172b5fe8f6b5c4a19fdb0ea2ca795987b2.json | Use AsciiDoctor special characters
- Replaced ellipsis with "..."
- Replaced em dash with "--"
- Fixed issue with italics migration in the Standard Annotation Support
section of the Testing chapter | src/asciidoc/index.adoc | @@ -595,10 +595,10 @@ This functionality is also available if you prefer to configure your components
public class RewardsTestDatabase {
@Value("#{systemProperties.databaseName}")
- public void setDatabaseName(String dbName) { … }
+ public void setDatabaseName(String dbName) { ... }
@Value("#{strat... | false |
Other | spring-projects | spring-framework | b5bd4d8a8a27b014950bb106e2cdfcff7887676f.json | Add div around extra hidden fields in FormTag
Issue: SPR-10926 | spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java | @@ -493,11 +493,13 @@ public int doEndTag() throws JspException {
*/
private void writeHiddenFields(Map<String, String> hiddenFields) throws JspException {
if (hiddenFields != null) {
+ this.tagWriter.appendValue("<div>\n");
for (String name : hiddenFields.keySet()) {
this.tagWriter.appendValue("<inp... | true |
Other | spring-projects | spring-framework | b5bd4d8a8a27b014950bb106e2cdfcff7887676f.json | Add div around extra hidden fields in FormTag
Issue: SPR-10926 | spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java | @@ -335,7 +335,7 @@ public void testRequestDataValueProcessorHooks() throws Exception {
String output = getOutput();
- assertEquals("<input type=\"hidden\" name=\"key\" value=\"value\" />", getInputTag(output));
+ assertEquals("<div>\n<input type=\"hidden\" name=\"key\" value=\"value\" />\n</div>", getInputTag... | true |
Other | spring-projects | spring-framework | 18b69903ca49bca82b545272589253c5a261d9fc.json | Return 415 on bad request body content-type
Issue: SPR-10982 | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java | @@ -31,6 +31,7 @@
import org.springframework.core.MethodParameter;
import org.springframework.core.ResolvableType;
import org.springframework.http.HttpInputMessage;
+import org.springframework.http.InvalidMediaTypeException;
import org.springframework.http.MediaType;
import org.springframework.http.converter.Gener... | true |
Other | spring-projects | spring-framework | 18b69903ca49bca82b545272589253c5a261d9fc.json | Return 415 on bad request body content-type
Issue: SPR-10982 | spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java | @@ -187,6 +187,12 @@ public void resolveArgumentNoContentType() throws Exception {
}
}
+ @Test(expected = HttpMediaTypeNotSupportedException.class)
+ public void resolveArgumentInvalidContentType() throws Exception {
+ this.servletRequest.setContentType("bad");
+ processor.resolveArgument(paramRequestBodyStrin... | true |
Other | spring-projects | spring-framework | 0eeb6717e09a81e58ba206fce3176b9b22f23f44.json | Fix exception mock request builder
Issue: SPR-11043 | spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java | @@ -593,9 +593,8 @@ public final MockHttpServletRequest buildRequest(ServletContext servletContext)
for (Entry<String, List<String>> entry : this.uriComponents.getQueryParams().entrySet()) {
for (String value : entry.getValue()) {
- request.addParameter(
- UriUtils.decode(entry.getKey(), "UTF-8"),
... | true |
Other | spring-projects | spring-framework | 0eeb6717e09a81e58ba206fce3176b9b22f23f44.json | Fix exception mock request builder
Issue: SPR-11043 | spring-test-mvc/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java | @@ -228,6 +228,19 @@ public void requestParameterFromQueryWithEncoding() throws Exception {
assertEquals("bar=baz", request.getParameter("foo"));
}
+ // SPR-11043
+
+ @Test
+ public void requestParameterFromQueryNull() throws Exception {
+ this.builder = new MockHttpServletRequestBuilder(HttpMethod.GET, "/?foo"... | true |
Other | spring-projects | spring-framework | c6c55550342e47454468c5c26ae9777cd687fee4.json | Use final keyword in MessageHeaders | spring-messaging/src/main/java/org/springframework/messaging/MessageHeaders.java | @@ -71,7 +71,7 @@ public final class MessageHeaders implements Map<String, Object>, Serializable {
private static volatile IdGenerator idGenerator = null;
- private static volatile IdGenerator defaultIdGenerator = new AlternativeJdkIdGenerator();
+ private static final IdGenerator defaultIdGenerator = new Alterna... | false |
Other | spring-projects | spring-framework | 7ed108e974e0a097a617bff03a2b7aa0ed60d11b.json | Avoid potential NPE in toString()
Issue: SPR-1528 | spring-context/src/main/java/org/springframework/context/i18n/SimpleLocaleContext.java | @@ -49,7 +49,7 @@ public Locale getLocale() {
@Override
public String toString() {
- return this.locale.toString();
+ return (this.locale != null ? this.locale.toString() : "-");
}
} | true |
Other | spring-projects | spring-framework | 7ed108e974e0a097a617bff03a2b7aa0ed60d11b.json | Avoid potential NPE in toString()
Issue: SPR-1528 | spring-context/src/main/java/org/springframework/context/i18n/SimpleTimeZoneAwareLocaleContext.java | @@ -27,6 +27,7 @@
* a Locale but no TimeZone.
*
* @author Juergen Hoeller
+ * @author Nicholas Williams
* @since 4.0
* @see LocaleContextHolder#setLocaleContext
* @see LocaleContextHolder#getTimeZone()
@@ -55,7 +56,7 @@ public TimeZone getTimeZone() {
@Override
public String toString() {
- return sup... | true |
Other | spring-projects | spring-framework | 307bf4bede299bdc95a99f68ae51fd076d5cdca9.json | Add messaging.simp.user package | spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java | @@ -57,7 +57,7 @@ public SimpMessagingTemplate(MessageChannel messageChannel) {
/**
* Configure the prefix to use for destinations targeting a specific user.
* <p>The default value is "/user/".
- * @see org.springframework.messaging.simp.handler.UserDestinationMessageHandler
+ * @see org.springframework.messa... | true |
Other | spring-projects | spring-framework | 307bf4bede299bdc95a99f68ae51fd076d5cdca9.json | Add messaging.simp.user package | spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/SendToUser.java | @@ -36,7 +36,7 @@
* @author Rossen Stoyanchev
* @since 4.0
* @see org.springframework.messaging.handler.annotation.SendTo
- * @see org.springframework.messaging.simp.handler.UserDestinationMessageHandler
+ * @see org.springframework.messaging.simp.user.UserDestinationMessageHandler
*/
@Target(ElementType.METHO... | true |
Other | spring-projects | spring-framework | 307bf4bede299bdc95a99f68ae51fd076d5cdca9.json | Add messaging.simp.user package | spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/package-info.java | @@ -1,5 +1,4 @@
/**
- * Annotations and for handling messages from simple messaging protocols
- * (like STOMP).
+ * Annotations and for handling messages from SImple Messaging Protocols such as STOMP.
*/
package org.springframework.messaging.simp.annotation; | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.