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 | cf5db8362b3b95e2555e4e1600e3c6919e952f01.json | Replace MvcUrls with MvcUriComponentsBuilder
Issue: SPR-8826 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java | @@ -19,6 +19,8 @@
import java.util.List;
import java.util.Properties;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanDefinitionHol... | true |
Other | spring-projects | spring-framework | cf5db8362b3b95e2555e4e1600e3c6919e952f01.json | Replace MvcUrls with MvcUriComponentsBuilder
Issue: SPR-8826 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/DefaultMvcUrlsFactoryBean.java | @@ -1,89 +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 | cf5db8362b3b95e2555e4e1600e3c6919e952f01.json | Replace MvcUrls with MvcUriComponentsBuilder
Issue: SPR-8826 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java | @@ -61,6 +61,7 @@
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.support.ConfigurableWebBindingInitializer;
import org.springframework.web.context.ServletContextAware;
+import org.springframework.web.method.support.CompositeUriComponentsContributor;
import org.spr... | true |
Other | spring-projects | spring-framework | cf5db8362b3b95e2555e4e1600e3c6919e952f01.json | Replace MvcUrls with MvcUriComponentsBuilder
Issue: SPR-8826 | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java | @@ -0,0 +1,430 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ ... | true |
Other | spring-projects | spring-framework | cf5db8362b3b95e2555e4e1600e3c6919e952f01.json | Replace MvcUrls with MvcUriComponentsBuilder
Issue: SPR-8826 | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/DefaultMvcUrls.java | @@ -1,172 +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 | cf5db8362b3b95e2555e4e1600e3c6919e952f01.json | Replace MvcUrls with MvcUriComponentsBuilder
Issue: SPR-8826 | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/MvcUrlUtils.java | @@ -1,203 +0,0 @@
-/*
- * Copyright 2012-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
-... | true |
Other | spring-projects | spring-framework | cf5db8362b3b95e2555e4e1600e3c6919e952f01.json | Replace MvcUrls with MvcUriComponentsBuilder
Issue: SPR-8826 | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/support/MvcUrls.java | @@ -1,111 +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 | cf5db8362b3b95e2555e4e1600e3c6919e952f01.json | Replace MvcUrls with MvcUriComponentsBuilder
Issue: SPR-8826 | spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java | @@ -19,8 +19,6 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Method;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -58,15 +56,14 @@
import org.springfram... | true |
Other | spring-projects | spring-framework | cf5db8362b3b95e2555e4e1600e3c6919e952f01.json | Replace MvcUrls with MvcUriComponentsBuilder
Issue: SPR-8826 | spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java | @@ -21,7 +21,6 @@
import javax.servlet.http.HttpServletRequest;
import org.joda.time.DateTime;
-import org.joda.time.format.ISODateTimeFormat;
import org.junit.Before;
import org.junit.Test;
import org.springframework.context.annotation.Bean;
@@ -40,9 +39,8 @@
import org.springframework.web.bind.annotation.Requ... | true |
Other | spring-projects | spring-framework | cf5db8362b3b95e2555e4e1600e3c6919e952f01.json | Replace MvcUrls with MvcUriComponentsBuilder
Issue: SPR-8826 | spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsContributorTests.java | @@ -14,12 +14,7 @@
* limitations under the License.
*/
-package org.springframework.web.servlet.mvc.support;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+package org.springframework.web.servlet.mvc.method.annotation;
import org.hamcrest.Mat... | true |
Other | spring-projects | spring-framework | cf5db8362b3b95e2555e4e1600e3c6919e952f01.json | Replace MvcUrls with MvcUriComponentsBuilder
Issue: SPR-8826 | spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/support/MvcUrlUtilsTests.java | @@ -1,122 +0,0 @@
-/*
- * Copyright 2012-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 | e80b7d1e2206bfcca0592d6cf2e33c8fc608a0a8.json | Add getSource() to ResolvableType & TypeDescriptor
Add getSource() method to ResolvableType and TypeDescriptor allowing
access to the underlying source field or method parameter when possible.
Primarily added to provide access to additional type information or
meta-data that alternative JVM languages may provide.
Is... | spring-core/src/main/java/org/springframework/core/ResolvableType.java | @@ -30,6 +30,9 @@
import java.util.Collection;
import java.util.Map;
+import org.springframework.core.SerializableTypeWrapper.FieldTypeProvider;
+import org.springframework.core.SerializableTypeWrapper.MethodParameterTypeProvider;
+import org.springframework.core.SerializableTypeWrapper.TypeProvider;
import org.sp... | true |
Other | spring-projects | spring-framework | e80b7d1e2206bfcca0592d6cf2e33c8fc608a0a8.json | Add getSource() to ResolvableType & TypeDescriptor
Add getSource() method to ResolvableType and TypeDescriptor allowing
access to the underlying source field or method parameter when possible.
Primarily added to provide access to additional type information or
meta-data that alternative JVM languages may provide.
Is... | spring-core/src/main/java/org/springframework/core/SerializableTypeWrapper.java | @@ -77,7 +77,7 @@ public static Type forMethodParameter(MethodParameter methodParameter) {
* Return a {@link Serializable} variant of {@link Class#getGenericSuperclass()}.
*/
public static Type forGenericSuperclass(final Class<?> type) {
- return forTypeProvider(new TypeProvider() {
+ return forTypeProvider(n... | true |
Other | spring-projects | spring-framework | e80b7d1e2206bfcca0592d6cf2e33c8fc608a0a8.json | Add getSource() to ResolvableType & TypeDescriptor
Add getSource() method to ResolvableType and TypeDescriptor allowing
access to the underlying source field or method parameter when possible.
Primarily added to provide access to additional type information or
meta-data that alternative JVM languages may provide.
Is... | spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java | @@ -19,6 +19,7 @@
import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
+import java.lang.reflect.Type;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -141,6 +142,16 @@ public Class<?> getType() {
return this.type;
}
+ /**
+ *... | true |
Other | spring-projects | spring-framework | e80b7d1e2206bfcca0592d6cf2e33c8fc608a0a8.json | Add getSource() to ResolvableType & TypeDescriptor
Add getSource() method to ResolvableType and TypeDescriptor allowing
access to the underlying source field or method parameter when possible.
Primarily added to provide access to additional type information or
meta-data that alternative JVM languages may provide.
Is... | spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java | @@ -786,6 +786,21 @@ public void toStrings() throws Exception {
assertThat(ResolvableType.forClass(List.class, ListOfGenericArray.class).toString(), equalTo("java.util.List<java.util.List<java.lang.String>[]>"));
}
+ @Test
+ public void getSource() throws Exception {
+ Class<?> classType = MySimpleInterfaceType... | true |
Other | spring-projects | spring-framework | e80b7d1e2206bfcca0592d6cf2e33c8fc608a0a8.json | Add getSource() to ResolvableType & TypeDescriptor
Add getSource() method to ResolvableType and TypeDescriptor allowing
access to the underlying source field or method parameter when possible.
Primarily added to provide access to additional type information or
meta-data that alternative JVM languages may provide.
Is... | spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java | @@ -24,6 +24,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
@@ -34,7 +35,6 @@
import java.util.Map;
import java.util.Set;... | true |
Other | spring-projects | spring-framework | 1a3ba79071a4e0898ec8d8807ea584ef00bdc3d7.json | Restore prior resolveTypeArguments behavior
Restore prior behavior of GenericTypeResolver.resolveTypeArguments to
never include null elements in the returned array.
Issue: SPR-11030 | spring-core/src/main/java/org/springframework/core/GenericTypeResolver.java | @@ -245,7 +245,7 @@ public static Class[] resolveTypeArguments(Class<?> clazz, Class<?> genericIfc)
if (!type.hasGenerics()) {
return null;
}
- return type.resolveGenerics();
+ return type.resolveGenerics(Object.class);
}
/** | true |
Other | spring-projects | spring-framework | 1a3ba79071a4e0898ec8d8807ea584ef00bdc3d7.json | Restore prior resolveTypeArguments behavior
Restore prior behavior of GenericTypeResolver.resolveTypeArguments to
never include null elements in the returned array.
Issue: SPR-11030 | spring-core/src/main/java/org/springframework/core/ResolvableType.java | @@ -480,10 +480,24 @@ public ResolvableType[] getGenerics() {
* @see #resolve()
*/
public Class<?>[] resolveGenerics() {
+ return resolveGenerics(null);
+ }
+
+ /**
+ * Convenience method that will {@link #getGenerics() get} and {@link #resolve()
+ * resolve} generic parameters, using the specified {@code fa... | true |
Other | spring-projects | spring-framework | 1a3ba79071a4e0898ec8d8807ea584ef00bdc3d7.json | Restore prior resolveTypeArguments behavior
Restore prior behavior of GenericTypeResolver.resolveTypeArguments to
never include null elements in the returned array.
Issue: SPR-11030 | spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.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.
@@ -29,6 +29,7 @@
import java.util.concurrent.... | true |
Other | spring-projects | spring-framework | 1a3ba79071a4e0898ec8d8807ea584ef00bdc3d7.json | Restore prior resolveTypeArguments behavior
Restore prior behavior of GenericTypeResolver.resolveTypeArguments to
never include null elements in the returned array.
Issue: SPR-11030 | spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java | @@ -21,6 +21,7 @@
import java.lang.reflect.TypeVariable;
import java.util.Collection;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.junit.Test;
@@ -136,6 +137,12 @@ public void testGetTypeVariableMap() throws Exception {
assertThat(x, equalTo((Type) Long.class));
}
+ @... | true |
Other | spring-projects | spring-framework | 5f2106046ccded1df2dc92821a6d12a06e26f949.json | Add UpgradeRequestStrategy for WildFly/Undertow
Issue: SPR-11237 | build.gradle | @@ -593,6 +593,13 @@ project("spring-websocket") {
exclude group: "javax.servlet", module: "javax.servlet"
}
optional("org.eclipse.jetty.websocket:websocket-client:${jettyVersion}")
+ optional("io.undertow:undertow-core:1.0.0.Beta31")
+ optional("io.undertow:undertow-servlet:1.0.0.Beta31") {
+ exclude gro... | true |
Other | spring-projects | spring-framework | 5f2106046ccded1df2dc92821a6d12a06e26f949.json | Add UpgradeRequestStrategy for WildFly/Undertow
Issue: SPR-11237 | spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractStandardUpgradeStrategy.java | @@ -23,6 +23,7 @@
import java.util.Map;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import javax.websocket.Endpoint;
import javax.websocket.Extension;
import javax.websocket.WebSocketContainer;
@@ -35,6 +36,7 @@
import org.spr... | true |
Other | spring-projects | spring-framework | 5f2106046ccded1df2dc92821a6d12a06e26f949.json | Add UpgradeRequestStrategy for WildFly/Undertow
Issue: SPR-11237 | spring-websocket/src/main/java/org/springframework/web/socket/server/standard/GlassFishRequestUpgradeStrategy.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.
@@ -45,9 +45,6 @@
import org.springframework.h... | true |
Other | spring-projects | spring-framework | 5f2106046ccded1df2dc92821a6d12a06e26f949.json | Add UpgradeRequestStrategy for WildFly/Undertow
Issue: SPR-11237 | spring-websocket/src/main/java/org/springframework/web/socket/server/standard/TomcatRequestUpgradeStrategy.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,6 @@
import org.springframework... | true |
Other | spring-projects | spring-framework | 5f2106046ccded1df2dc92821a6d12a06e26f949.json | Add UpgradeRequestStrategy for WildFly/Undertow
Issue: SPR-11237 | spring-websocket/src/main/java/org/springframework/web/socket/server/standard/UndertowRequestUpgradeStrategy.java | @@ -0,0 +1,161 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ ... | true |
Other | spring-projects | spring-framework | 5f2106046ccded1df2dc92821a6d12a06e26f949.json | Add UpgradeRequestStrategy for WildFly/Undertow
Issue: SPR-11237 | spring-websocket/src/main/java/org/springframework/web/socket/server/support/DefaultHandshakeHandler.java | @@ -62,14 +62,17 @@ public class DefaultHandshakeHandler implements HandshakeHandler {
protected Log logger = LogFactory.getLog(getClass());
+ private static final boolean glassFishWsPresent = ClassUtils.isPresent(
+ "org.glassfish.tyrus.servlet.TyrusHttpUpgradeHandler", DefaultHandshakeHandler.class.getClassLo... | true |
Other | spring-projects | spring-framework | 5f2106046ccded1df2dc92821a6d12a06e26f949.json | Add UpgradeRequestStrategy for WildFly/Undertow
Issue: SPR-11237 | spring-websocket/src/test/java/org/springframework/web/socket/AbstractWebSocketIntegrationTests.java | @@ -1,4 +1,5 @@
/*
+ * 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,6 +30,7 @@
import org.springframework.util.concurrent.ListenableFuture;
import org.springframe... | true |
Other | spring-projects | spring-framework | 5f2106046ccded1df2dc92821a6d12a06e26f949.json | Add UpgradeRequestStrategy for WildFly/Undertow
Issue: SPR-11237 | spring-websocket/src/test/java/org/springframework/web/socket/UndertowTestServer.java | @@ -0,0 +1,125 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ ... | true |
Other | spring-projects | spring-framework | 5f2106046ccded1df2dc92821a6d12a06e26f949.json | Add UpgradeRequestStrategy for WildFly/Undertow
Issue: SPR-11237 | spring-websocket/src/test/java/org/springframework/web/socket/WebSocketIntegrationTests.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.
@@ -49,7 +49,8 @@ public class WebSocketIntegra... | true |
Other | spring-projects | spring-framework | 5f2106046ccded1df2dc92821a6d12a06e26f949.json | Add UpgradeRequestStrategy for WildFly/Undertow
Issue: SPR-11237 | spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationTests.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.
@@ -27,10 +27,7 @@
import org.springframework.... | true |
Other | spring-projects | spring-framework | 5f2106046ccded1df2dc92821a6d12a06e26f949.json | Add UpgradeRequestStrategy for WildFly/Undertow
Issue: SPR-11237 | spring-websocket/src/test/java/org/springframework/web/socket/messaging/SimpAnnotationMethodIntegrationTests.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.
@@ -36,24 +36,18 @@
import org.springframework... | true |
Other | spring-projects | spring-framework | bac9f43b66626a3821d9ea34f2fac03444e21f09.json | Fix typo in documentation
Issue: SPR-11301 | src/asciidoc/index.adoc | @@ -28772,7 +28772,7 @@ A matrix variable may be defined as optional and a default value specified:
// GET /pets/42
@RequestMapping(value = "/pets/{petId}", method = RequestMethod.GET)
- public void findPet(@MatrixVariable(required=true, defaultValue="1") int q) {
+ public void findPet(@MatrixVariable(required=fa... | false |
Other | spring-projects | spring-framework | c9044151f5eb63f4d2bcc5a552c66ebb286a603c.json | Add explanation for the special 'default' profile
Better integrated explanation of the 'default' profile with both XML
and Java config examples showing the same thing.
Issue: SPR-11256 | src/asciidoc/index.adoc | @@ -19012,6 +19012,13 @@ Let's take a look at some examples with XML configuration and `@Configuration` c
<jee:jndi-lookup id="dataSource" jndi-name="java:comp/env/jdbc/datasource"/>
</beans>
+ <beans profile="default">
+ <jdbc:embedded-database id="dataSource">
+ <jdbc:script
+ location="classpath:c... | false |
Other | spring-projects | spring-framework | ea0825c0a672b22a46794f87f7d7dc69e82422d9.json | Trim tokenized strings in websocket namespace
Issue: SPR-11307 | spring-websocket/src/main/java/org/springframework/web/socket/config/HandlersBeanDefinitionParser.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,7 @@
import java.util.Arrays;
im... | true |
Other | spring-projects | spring-framework | ea0825c0a672b22a46794f87f7d7dc69e82422d9.json | Trim tokenized strings in websocket namespace
Issue: SPR-11307 | spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.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.
@@ -135,7 +135,7 @@ public BeanDefinition parse... | true |
Other | spring-projects | spring-framework | ea0825c0a672b22a46794f87f7d7dc69e82422d9.json | Trim tokenized strings in websocket namespace
Issue: SPR-11307 | spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.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. | true |
Other | spring-projects | spring-framework | ea0825c0a672b22a46794f87f7d7dc69e82422d9.json | Trim tokenized strings in websocket namespace
Issue: SPR-11307 | spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.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.
@@ -83,10 +83,12 @@ public void simpleBroker() ... | true |
Other | spring-projects | spring-framework | ea0825c0a672b22a46794f87f7d7dc69e82422d9.json | Trim tokenized strings in websocket namespace
Issue: SPR-11307 | spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-simple.xml | @@ -12,7 +12,7 @@
<websocket:handshake-handler ref="myHandler"/>
<websocket:sockjs/>
</websocket:stomp-endpoint>
- <websocket:simple-broker prefix="/topic"/>
+ <websocket:simple-broker prefix="/topic, /queue"/>
</websocket:message-broker>
<bean id="myHandler"... | true |
Other | spring-projects | spring-framework | 8b35c3ff74347f32194149ec91773c4eb2eb21ea.json | Recognize Content-Type as special header in MHSRB
When adding headers generically, MockHttpServletRequestBuilder now
recognizes Content-Type and updates the contentType field accordingly.
Issue: SPR-11308 | spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.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.
@@ -141,6 +141,10 @@ public MockHttpServletRequ... | true |
Other | spring-projects | spring-framework | 8b35c3ff74347f32194149ec91773c4eb2eb21ea.json | Recognize Content-Type as special header in MHSRB
When adding headers generically, MockHttpServletRequestBuilder now
recognizes Content-Type and updates the contentType field accordingly.
Issue: SPR-11308 | spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.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.
@@ -28,6 +28,7 @@
import java.util.Locale;
im... | true |
Other | spring-projects | spring-framework | 5068eb2e01a5f534b6ceaefe9d1034446b674164.json | Add minor optimization to AbstractErrors
Issue: SPR-11304 | spring-context/src/main/java/org/springframework/validation/AbstractErrors.java | @@ -227,8 +227,12 @@ public Class<?> getFieldType(String field) {
* @return whether the FieldError matches the given field
*/
protected boolean isMatchingFieldError(String field, FieldError fieldError) {
- return (field.equals(fieldError.getField()) ||
- (field.endsWith("*") && fieldError.getField().startsW... | false |
Other | spring-projects | spring-framework | 37c9b26ff83e5cad209a263527edc290f96abe85.json | Fix various documentation issues
- Remove formatting that interferes with code highlighting
- Fix some XML syntax issues
- Added missing punctuation | src/asciidoc/index.adoc | @@ -2299,7 +2299,7 @@ validate the bean id earlier, at XML document parse time.
[subs="verbatim,quotes"]
----
<property name="targetName">
- <!-- a bean with id 'theTargetBean' must exist; otherwise an exception will be thrown -->
+ <!-- a bean with id theTargetBean must exist; otherwise an exception will be thro... | false |
Other | spring-projects | spring-framework | 4342497305d54091ea327fc4368b96daade556a0.json | Add support for custom message converters
The Java and XML config for STOMP WebSocket applications now supports
configuring message converters.
Issue: SPR-11184 | build.gradle | @@ -392,6 +392,7 @@ project("spring-messaging") {
testCompile("commons-dbcp:commons-dbcp:1.2.2")
testCompile("javax.inject:javax.inject-tck:1")
testCompile("javax.servlet:javax.servlet-api:3.1.0")
+ testCompile("javax.validation:validation-api:1.0.0.GA")
testCompile("log4j:log4j:1.2.17")
testCompile("or... | true |
Other | spring-projects | spring-framework | 4342497305d54091ea327fc4368b96daade556a0.json | Add support for custom message converters
The Java and XML config for STOMP WebSocket applications now supports
configuring message converters.
Issue: SPR-11184 | spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java | @@ -26,12 +26,7 @@
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.annotation.Bean;
import org.springframework.messaging.Message;
-import org.springframework.messaging.converter.ByteArrayMessageConverter;
-import org.springframework.messaging.converter.CompositeMessageC... | true |
Other | spring-projects | spring-framework | 4342497305d54091ea327fc4368b96daade556a0.json | Add support for custom message converters
The Java and XML config for STOMP WebSocket applications now supports
configuring message converters.
Issue: SPR-11184 | spring-messaging/src/test/java/org/springframework/messaging/simp/config/MessageBrokerConfigurationTests.java | @@ -17,19 +17,21 @@
package org.springframework.messaging.simp.config;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.Mockito;
import org.springframework.context.annotation.Anno... | true |
Other | spring-projects | spring-framework | 4342497305d54091ea327fc4368b96daade556a0.json | Add support for custom message converters
The Java and XML config for STOMP WebSocket applications now supports
configuring message converters.
Issue: SPR-11184 | spring-websocket/src/main/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParser.java | @@ -153,7 +153,8 @@ public BeanDefinition parse(Element element, ParserContext parserCxt) {
RuntimeBeanReference brokerChannel = getMessageChannel(beanName, channelElem, parserCxt, source);
registerMessageBroker(element, clientInChannel, clientOutChannel, brokerChannel, parserCxt, source);
- RuntimeBeanReferen... | true |
Other | spring-projects | spring-framework | 4342497305d54091ea327fc4368b96daade556a0.json | Add support for custom message converters
The Java and XML config for STOMP WebSocket applications now supports
configuring message converters.
Issue: SPR-11184 | spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/AbstractWebSocketMessageBrokerConfigurer.java | @@ -0,0 +1,51 @@
+/*
+ * Copyright 2002-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *... | true |
Other | spring-projects | spring-framework | 4342497305d54091ea327fc4368b96daade556a0.json | Add support for custom message converters
The Java and XML config for STOMP WebSocket applications now supports
configuring message converters.
Issue: SPR-11184 | spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/DelegatingWebSocketMessageBrokerConfiguration.java | @@ -21,6 +21,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.converter.MessageConverter;
import org.springframework.messaging.simp.config.ChannelRegistration;
import org.springframework.messaging... | true |
Other | spring-projects | spring-framework | 4342497305d54091ea327fc4368b96daade556a0.json | Add support for custom message converters
The Java and XML config for STOMP WebSocket applications now supports
configuring message converters.
Issue: SPR-11184 | spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/EnableWebSocketMessageBroker.java | @@ -34,12 +34,13 @@
* </pre>
* <p>
* Customize the imported configuration by implementing the
- * {@link WebSocketMessageBrokerConfigurer} interface:
+ * {@link WebSocketMessageBrokerConfigurer} interface or more likely the convenient
+ * base class {@link AbstractWebSocketMessageBrokerConfigurer}:
*
* <pre c... | true |
Other | spring-projects | spring-framework | 4342497305d54091ea327fc4368b96daade556a0.json | Add support for custom message converters
The Java and XML config for STOMP WebSocket applications now supports
configuring message converters.
Issue: SPR-11184 | spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurer.java | @@ -17,9 +17,12 @@
package org.springframework.web.socket.config.annotation;
+import org.springframework.messaging.converter.MessageConverter;
import org.springframework.messaging.simp.config.ChannelRegistration;
import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import java.util.List;
+
... | true |
Other | spring-projects | spring-framework | 4342497305d54091ea327fc4368b96daade556a0.json | Add support for custom message converters
The Java and XML config for STOMP WebSocket applications now supports
configuring message converters.
Issue: SPR-11184 | spring-websocket/src/main/resources/org/springframework/web/socket/config/spring-websocket-4.0.xsd | @@ -481,6 +481,43 @@
<xsd:element name="simple-broker" type="simple-broker" />
<xsd:element name="stomp-broker-relay" type="stomp-broker-relay" />
</xsd:choice>
+ <xsd:element name="message-converters" minOccurs="0">
+ <xsd:ann... | true |
Other | spring-projects | spring-framework | 4342497305d54091ea327fc4368b96daade556a0.json | Add support for custom message converters
The Java and XML config for STOMP WebSocket applications now supports
configuring message converters.
Issue: SPR-11184 | spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java | @@ -29,6 +29,7 @@
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.converter.CompositeMessageConverter;
import org.springframework.messaging.converter.MessageConverter;
+import org.springframework.messaging.converter.StringMessageConverter;
import org.springframework.messagi... | true |
Other | spring-projects | spring-framework | 4342497305d54091ea327fc4368b96daade556a0.json | Add support for custom message converters
The Java and XML config for STOMP WebSocket applications now supports
configuring message converters.
Issue: SPR-11184 | spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java | @@ -118,7 +118,7 @@ public String handleMessage() {
}
@Configuration
- static class TestSimpleMessageBrokerConfig implements WebSocketMessageBrokerConfigurer {
+ static class TestSimpleMessageBrokerConfig extends AbstractWebSocketMessageBrokerConfigurer {
@Bean
public TestController subscriptionController... | true |
Other | spring-projects | spring-framework | 4342497305d54091ea327fc4368b96daade556a0.json | Add support for custom message converters
The Java and XML config for STOMP WebSocket applications now supports
configuring message converters.
Issue: SPR-11184 | spring-websocket/src/test/java/org/springframework/web/socket/messaging/SimpAnnotationMethodIntegrationTests.java | @@ -47,6 +47,7 @@
import org.springframework.web.socket.TextMessage;
import org.springframework.web.socket.TomcatWebSocketTestServer;
import org.springframework.web.socket.WebSocketSession;
+import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer;
import org.springframework.... | true |
Other | spring-projects | spring-framework | 4342497305d54091ea327fc4368b96daade556a0.json | Add support for custom message converters
The Java and XML config for STOMP WebSocket applications now supports
configuring message converters.
Issue: SPR-11184 | spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-converters-defaults-off.xml | @@ -0,0 +1,19 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:websocket="http://www.springframework.org/schema/websocket"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/sche... | true |
Other | spring-projects | spring-framework | 4342497305d54091ea327fc4368b96daade556a0.json | Add support for custom message converters
The Java and XML config for STOMP WebSocket applications now supports
configuring message converters.
Issue: SPR-11184 | spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-converters.xml | @@ -0,0 +1,19 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:websocket="http://www.springframework.org/schema/websocket"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/sche... | true |
Other | spring-projects | spring-framework | a30cf3058eee3737074a35f14408f9ec28feea1a.json | Remove unused imports in tests | spring-test/src/main/java/org/springframework/test/web/servlet/setup/DefaultMockMvcBuilder.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.
@@ -16,22 +16,8 @@
package org.springframewo... | true |
Other | spring-projects | spring-framework | a30cf3058eee3737074a35f14408f9ec28feea1a.json | Remove unused imports in tests | spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.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,7 +18,6 @@
import org.junit.Test;
im... | true |
Other | spring-projects | spring-framework | de280b01fe752fc7a5c6eeb22a5028f91b73f50a.json | Support custom PathMatcher for MappedInterceptor's
Issue: SPR-11197 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/InterceptorsBeanDefinitionParser.java | @@ -18,6 +18,7 @@
import java.util.List;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.w3c.dom.Element;
import org.springframework.beans.factory.config.BeanDefinition;
@@ -44,6 +45,11 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
Composite... | true |
Other | spring-projects | spring-framework | de280b01fe752fc7a5c6eeb22a5028f91b73f50a.json | Support custom PathMatcher for MappedInterceptor's
Issue: SPR-11197 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/InterceptorRegistration.java | @@ -16,12 +16,11 @@
package org.springframework.web.servlet.config.annotation;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.PathMatche... | true |
Other | spring-projects | spring-framework | de280b01fe752fc7a5c6eeb22a5028f91b73f50a.json | Support custom PathMatcher for MappedInterceptor's
Issue: SPR-11197 | spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java | @@ -36,6 +36,8 @@ public final class MappedInterceptor {
private final HandlerInterceptor interceptor;
+ private PathMatcher pathMatcher;
+
/**
* Create a new MappedInterceptor instance.
@@ -58,6 +60,7 @@ public MappedInterceptor(String[] includePatterns, String[] excludePatterns, Han
this.interceptor =... | true |
Other | spring-projects | spring-framework | de280b01fe752fc7a5c6eeb22a5028f91b73f50a.json | Support custom PathMatcher for MappedInterceptor's
Issue: SPR-11197 | spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.0.xsd | @@ -415,6 +415,20 @@
</xsd:complexType>
</xsd:element>
</xsd:choice>
+ <xsd:attribute name="path-matcher" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation source="java:org.springframework.util.PathMatcher"><![CDATA[
+ The bean name of a PathMatcher i... | true |
Other | spring-projects | spring-framework | de280b01fe752fc7a5c6eeb22a5028f91b73f50a.json | Support custom PathMatcher for MappedInterceptor's
Issue: SPR-11197 | spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java | @@ -19,10 +19,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
+import java.util.*;
import javax.servlet.RequestDispatcher;
import javax.val... | true |
Other | spring-projects | spring-framework | de280b01fe752fc7a5c6eeb22a5028f91b73f50a.json | Support custom PathMatcher for MappedInterceptor's
Issue: SPR-11197 | spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java | @@ -16,17 +16,15 @@
package org.springframework.web.servlet.config.annotation;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Li... | true |
Other | spring-projects | spring-framework | de280b01fe752fc7a5c6eeb22a5028f91b73f50a.json | Support custom PathMatcher for MappedInterceptor's
Issue: SPR-11197 | spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java | @@ -20,8 +20,12 @@
import org.junit.Before;
import org.junit.Test;
import org.springframework.util.AntPathMatcher;
+import org.springframework.util.PathMatcher;
import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
+import java.util.Comparator;
+import java.util.Map;
+
/**
* Test fixture for {@l... | true |
Other | spring-projects | spring-framework | de280b01fe752fc7a5c6eeb22a5028f91b73f50a.json | Support custom PathMatcher for MappedInterceptor's
Issue: SPR-11197 | spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-interceptors.xml | @@ -26,4 +26,13 @@
<bean id="log4jInterceptor"
class="org.springframework.web.context.request.Log4jNestedDiagnosticContextInterceptor" />
+ <mvc:interceptors path-matcher="pathMatcher">
+ <mvc:interceptor>
+ <mvc:mapping path="/accounts/[0-9]*" />
+ <bean class="org.springframewor... | true |
Other | spring-projects | spring-framework | b9c8f47b01b0bb2833539643d429b79ef0adabf5.json | Use OptionalValidatorFactoryBean in Configurers
Configurers and BeanDefinitionParsers should use
OptionalValidatorFactoryBean instead of
LocalValidatorFactoryBean.
The Optional implementation catches and logs setup
exceptions, useful when a validation API is present on
the classpath but not the actual implementation.... | spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java | @@ -305,7 +305,7 @@ public ApplicationContext getApplicationContext() {
* <li>delegating to getValidator() first</li>
* <li>if none returned, getting an existing instance with its well-known name "mvcValidator", created by an MVC configuration</li>
* <li>if none returned, checking the classpath for the p... | true |
Other | spring-projects | spring-framework | b9c8f47b01b0bb2833539643d429b79ef0adabf5.json | Use OptionalValidatorFactoryBean in Configurers
Configurers and BeanDefinitionParsers should use
OptionalValidatorFactoryBean instead of
LocalValidatorFactoryBean.
The Optional implementation catches and logs setup
exceptions, useful when a validation API is present on
the classpath but not the actual implementation.... | spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.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.
@@ -48,7 +48,6 @@
import org.springframework.h... | true |
Other | spring-projects | spring-framework | b9c8f47b01b0bb2833539643d429b79ef0adabf5.json | Use OptionalValidatorFactoryBean in Configurers
Configurers and BeanDefinitionParsers should use
OptionalValidatorFactoryBean instead of
LocalValidatorFactoryBean.
The Optional implementation catches and logs setup
exceptions, useful when a validation API is present on
the classpath but not the actual implementation.... | spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.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.
@@ -52,7 +52,6 @@
import org.springframework.v... | true |
Other | spring-projects | spring-framework | b9c8f47b01b0bb2833539643d429b79ef0adabf5.json | Use OptionalValidatorFactoryBean in Configurers
Configurers and BeanDefinitionParsers should use
OptionalValidatorFactoryBean instead of
LocalValidatorFactoryBean.
The Optional implementation catches and logs setup
exceptions, useful when a validation API is present on
the classpath but not the actual implementation.... | spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.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.
@@ -64,7 +64,7 @@ public interface WebMvcConfig... | true |
Other | spring-projects | spring-framework | 202b15e19b1d83a8962c8142bda4ef0c5b6f6098.json | Fix typo and polish formatting | src/reference/docbook/validation.xml | @@ -1081,8 +1081,7 @@ public interface ConversionService {
<para> To register a default ConversionService with Spring, add the
following bean definition with id <code>conversionService</code>: </para>
<programlisting language="xml"><![CDATA[<bean id="conversionService"
- class="org.springfra... | false |
Other | spring-projects | spring-framework | d70762baafd77d0528c1deadf70ed59ae40a2f45.json | Replace reference to aspectjrt with aspectjweaver
Replace reference to aspectjrt.jar with aspectjweaver.jar since
aspectjrt is a subset of aspectjweaver and the full jar is required
by Spring.
Issue: SPR-8896 | src/reference/docbook/aop.xml | @@ -329,7 +329,7 @@
<para>The @AspectJ support can be enabled with XML or Java style
configuration. In either case you will also need to ensure that
- AspectJ's <filename class="libraryfile">aspectjrt.jar</filename>
+ AspectJ's <filename class="libraryfile">aspectjweaver.jar</filename>
... | false |
Other | spring-projects | spring-framework | 838ba79f558c0d8fca84c2b8bd6d98c0e72dee0f.json | Fix Javadoc references to incorrect XML
Replace references to <task:annotation-config> with
<task:annotation-driven> | spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java | @@ -88,7 +88,7 @@
* <pre class="code">
* {@code
* <beans>
- * <task:annotation-config executor="myExecutor"/>
+ * <task:annotation-driven executor="myExecutor"/>
* <task:executor id="myExecutor" pool-size="7-42" queue-capacity="11"/>
* <bean id="asyncBean" class="com.foo.MyAsyncBean"/>
* </b... | true |
Other | spring-projects | spring-framework | 838ba79f558c0d8fca84c2b8bd6d98c0e72dee0f.json | Fix Javadoc references to incorrect XML
Replace references to <task:annotation-config> with
<task:annotation-driven> | spring-context/src/main/java/org/springframework/scheduling/annotation/EnableScheduling.java | @@ -153,7 +153,7 @@
* <pre class="code">
* {@code
* <beans>
- * <task:annotation-config scheduler="taskScheduler"/>
+ * <task:annotation-driven scheduler="taskScheduler"/>
* <task:scheduler id="taskScheduler" pool-size="42"/>
* <task:scheduled ref="myTask" method="work" fixed-rate="1000"/>
*... | true |
Other | spring-projects | spring-framework | 11cf978394bda237203f223c933d726c4391a84e.json | Define behavior of null Callable or DeferredResult
When a controller method declares Callable or DeferredResult as its
return value, and returns null, async processing will not start and
the request will be considered "handled" by the controller method.
Issue: SPR-9951 | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AsyncTaskMethodReturnValueHandler.java | @@ -49,6 +49,7 @@ public void handleReturnValue(Object returnValue,
NativeWebRequest webRequest) throws Exception {
if (returnValue == null) {
+ mavContainer.setRequestHandled(true);
return;
}
| true |
Other | spring-projects | spring-framework | 11cf978394bda237203f223c933d726c4391a84e.json | Define behavior of null Callable or DeferredResult
When a controller method declares Callable or DeferredResult as its
return value, and returns null, async processing will not start and
the request will be considered "handled" by the controller method.
Issue: SPR-9951 | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/CallableMethodReturnValueHandler.java | @@ -42,6 +42,7 @@ public void handleReturnValue(Object returnValue,
NativeWebRequest webRequest) throws Exception {
if (returnValue == null) {
+ mavContainer.setRequestHandled(true);
return;
}
| true |
Other | spring-projects | spring-framework | 11cf978394bda237203f223c933d726c4391a84e.json | Define behavior of null Callable or DeferredResult
When a controller method declares Callable or DeferredResult as its
return value, and returns null, async processing will not start and
the request will be considered "handled" by the controller method.
Issue: SPR-9951 | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/DeferredResultMethodReturnValueHandler.java | @@ -41,6 +41,7 @@ public void handleReturnValue(Object returnValue,
NativeWebRequest webRequest) throws Exception {
if (returnValue == null) {
+ mavContainer.setRequestHandled(true);
return;
}
| true |
Other | spring-projects | spring-framework | 63ca14c33ee746734fe27b37712a53d78afcce74.json | Clarify use of @Bean with @EnableAsync executors
Update Javadoc to indicate that the getAsyncExecutor() method may be
optionally annotated with @Bean and in such circumstance the
executor.initialize() method need not be called.
Issue: SPR-9934 | spring-context/src/main/java/org/springframework/scheduling/annotation/EnableAsync.java | @@ -96,7 +96,13 @@
* the examples are equivalent save the setting of the <em>thread name prefix</em> of the
* Executor; this is because the the {@code task:} namespace {@code executor} element does
* not expose such an attribute. This demonstrates how the code-based approach allows for
- * maximum configurability... | false |
Other | spring-projects | spring-framework | 8afcf717e2873e57f62ec6367be4f656039e6cc4.json | Fix failing test from previous commit | spring-test-mvc/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java | @@ -20,6 +20,7 @@
import java.util.Map;
import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
import org.springframework.http.HttpHeaders;
import org.springframework.mock.web.MockHttpServletRequest;
@@ -129,7 +130,8 @@ protected final MultiValueMap<String, String> getParamsMultiVal... | false |
Other | spring-projects | spring-framework | f0f76e493dd58f4f51a05619402aa4ec5de8dc15.json | Update README to reflect JDK 1.7 build prereq | README.md | @@ -36,7 +36,7 @@ simple step-by-step instructions.
The Spring Framework uses a [Gradle][]-based build system. In the instructions
below, [`./gradlew`][] is invoked from the root of the source tree and serves as
a cross-platform, self-contained bootstrap mechanism for the build. The only
-prerequisites are [Git][] a... | false |
Other | spring-projects | spring-framework | 62f2858f7f6da9eb84366b3c5f4f693838d159f3.json | Fix issue with SpEL in mvc namespace
This change ensures that the location attribute of a resource mapping
and the path attribute of an interceptor mapping support SpEL
expressions.
Issue: SPR-9291, SPR-9848 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/InterceptorsBeanDefinitionParser.java | @@ -21,6 +21,7 @@
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.parsing.BeanComponentDefinition;
import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
+import org.springframework.beans.factory.support.ManagedList;
import org.springf... | true |
Other | spring-projects | spring-framework | 62f2858f7f6da9eb84366b3c5f4f693838d159f3.json | Fix issue with SpEL in mvc namespace
This change ensures that the location attribute of a resource mapping
and the path attribute of an interceptor mapping support SpEL
expressions.
Issue: SPR-9291, SPR-9848 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/ResourcesBeanDefinitionParser.java | @@ -22,6 +22,7 @@
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.parsing.BeanComponentDefinition;
+import org.springframework.beans.factory.support.ManagedList;
import org.springframework.beans.factory.support.ManagedMap;
import org.springframework.beans.f... | true |
Other | spring-projects | spring-framework | 950f00a28005ad2860d72aa20e996c22076356d9.json | Fix Collections import
Replace backport Collections class with stock JDK version | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/CompositeRequestCondition.java | @@ -18,15 +18,14 @@
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
-import edu.emory.mathcs.backport.java.util.... | false |
Other | spring-projects | spring-framework | f833366a7fc3a26d4bd37fbaa7a43c9ccd9b21a4.json | Update package-info for test.util package | spring-test/src/main/java/org/springframework/test/util/package-info.java | @@ -1,6 +1,5 @@
/**
- * Helper classes for unit tests with reflective needs.
+ * General utility classes for use in unit and integration tests.
*/
-package org.springframework.test.util;
-
+package org.springframework.test.util;
\ No newline at end of file | false |
Other | spring-projects | spring-framework | ea95da126af330863eb6b0431e86d3819bc97632.json | Implement java.io.Closeable where appropriate
Issue: SPR-9962 | spring-context/src/main/java/org/springframework/context/ConfigurableApplicationContext.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2010 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.
@@ -16,6 +16,8 @@
package org.springframewor... | true |
Other | spring-projects | spring-framework | ea95da126af330863eb6b0431e86d3819bc97632.json | Implement java.io.Closeable where appropriate
Issue: SPR-9962 | spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/LobCreator.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2010 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.
@@ -16,6 +16,7 @@
package org.springframewor... | true |
Other | spring-projects | spring-framework | ea95da126af330863eb6b0431e86d3819bc97632.json | Implement java.io.Closeable where appropriate
Issue: SPR-9962 | spring-web/src/main/java/org/springframework/http/client/ClientHttpResponse.java | @@ -16,6 +16,7 @@
package org.springframework.http.client;
+import java.io.Closeable;
import java.io.IOException;
import org.springframework.http.HttpInputMessage;
@@ -30,7 +31,7 @@
* @author Arjen Poutsma
* @since 3.0
*/
-public interface ClientHttpResponse extends HttpInputMessage {
+public interface C... | true |
Other | spring-projects | spring-framework | ea95da126af330863eb6b0431e86d3819bc97632.json | Implement java.io.Closeable where appropriate
Issue: SPR-9962 | spring-web/src/main/java/org/springframework/http/server/ServerHttpResponse.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2009 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.
@@ -16,6 +16,8 @@
package org.springframewor... | true |
Other | spring-projects | spring-framework | 9a6ec1b4b5a2e39841b44b466b1e9986700d4325.json | Increase sleep time in ScheduledATAITests
This commit increases the sleep time in
ScheduledAndTransactionalAnnotationIntegrationTests with the hope of
improving the robustness of the test suite on the CI build server. | src/test/java/org/springframework/scheduling/annotation/ScheduledAndTransactionalAnnotationIntegrationTests.java | @@ -69,7 +69,7 @@ public void succeedsWhenSubclassProxyAndScheduledMethodNotPresentOnInterface() t
ctx.register(Config.class, SubclassProxyTxConfig.class, RepoConfigA.class);
ctx.refresh();
- Thread.sleep(10); // allow @Scheduled method to be called several times
+ Thread.sleep(50); // allow @Scheduled method... | false |
Other | spring-projects | spring-framework | c348be25116dfdf560763f4efbf3b07077e9de4f.json | Add RequestBuilder for async dispatches
This change enanbles performing async dispatches via Spring MVC Test. | spring-test-mvc/src/main/java/org/springframework/test/web/servlet/request/MockMvcRequestBuilders.java | @@ -15,8 +15,15 @@
*/
package org.springframework.test.web.servlet.request;
+import java.lang.reflect.Method;
+
+import javax.servlet.ServletContext;
+
import org.springframework.http.HttpMethod;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.test.web.servlet.MvcResult;
... | true |
Other | spring-projects | spring-framework | c348be25116dfdf560763f4efbf3b07077e9de4f.json | Add RequestBuilder for async dispatches
This change enanbles performing async dispatches via Spring MVC Test. | spring-test-mvc/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java | @@ -15,19 +15,27 @@
*/
package org.springframework.test.web.servlet.samples.standalone;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.asyncDispatch;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.w... | true |
Other | spring-projects | spring-framework | 4308a0404cf5ed9c1813c3320e0d86dfc085f06f.json | Refine EclipseLink SQL logging
Issue: SPR-12528 | spring-orm/src/main/java/org/springframework/orm/jpa/vendor/EclipseLinkJpaVendorAdapter.java | @@ -76,7 +76,8 @@ else if (getDatabase() != null) {
PersistenceUnitProperties.DDL_DATABASE_GENERATION);
}
if (isShowSql()) {
- jpaProperties.put(PersistenceUnitProperties.LOGGING_LEVEL, Level.FINE.toString());
+ jpaProperties.put(PersistenceUnitProperties.CATEGORY_LOGGING_LEVEL_ +
+ org.eclipse.pers... | false |
Other | spring-projects | spring-framework | 431aed3b01e4357619d32d3c26e5f7331c204c25.json | Fix typo in ide.gradle | gradle/ide.gradle | @@ -58,7 +58,7 @@ eclipse.classpath.file.whenMerged { classpath ->
}
}
-// Allow projects to be used as WPT modules
+// Allow projects to be used as WTP modules
eclipse.project.natures "org.eclipse.wst.common.project.facet.core.nature"
// Include project specific settings
@@ -97,7 +97,6 @@ tasks["eclipse"].dep... | false |
Other | spring-projects | spring-framework | eef0bf43d5d2a8ad5d0799cd1dd33fd7d151ae1d.json | Upgrade Jetty to 9.2.6.v20141205 | build.gradle | @@ -40,7 +40,7 @@ configure(allprojects) { project ->
ext.hsqldbVersion = "2.3.2"
ext.jackson2Version = "2.4.4"
ext.jasperReportsVersion = "6.0.0"
- ext.jettyVersion = "9.2.5.v20141112"
+ ext.jettyVersion = "9.2.6.v20141205"
ext.jodaVersion = "2.6"
ext.junitVersion ... | false |
Other | spring-projects | spring-framework | 86f99ec8f75b1a284da874a84729d5197d69d28a.json | Improve error handling in CollectionFactory
This commit improves error handling in CollectionFactory by asserting
preconditions.
In addition, this commit introduces ConnectionFactoryTests. | spring-core/src/main/java/org/springframework/core/CollectionFactory.java | @@ -40,15 +40,16 @@
import org.springframework.util.MultiValueMap;
/**
- * Factory for collections, being aware of Java 5 and Java 6 collections.
- * Mainly for internal use within the framework.
- *
+ * Factory for collections that is aware of Java 5 and Java 6 collection types.
+ * <p>Mainly for internal use with... | true |
Other | spring-projects | spring-framework | 86f99ec8f75b1a284da874a84729d5197d69d28a.json | Improve error handling in CollectionFactory
This commit improves error handling in CollectionFactory by asserting
preconditions.
In addition, this commit introduces ConnectionFactoryTests. | spring-core/src/test/java/org/springframework/core/CollectionFactoryTests.java | @@ -0,0 +1,94 @@
+/*
+ * Copyright 2002-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *... | true |
Other | spring-projects | spring-framework | 67f184293b94c076b0474231f739a74f42d5ffa8.json | Improve performance of generateKey
Only compute the error message to display when the generated key is
actually null instead of using Assert.notNull as the cache operation
'toString()' method is non trivial and gets computed regardless of the
result.
Issue: SPR-12527 | spring-context/src/main/java/org/springframework/cache/interceptor/CacheAspectSupport.java | @@ -477,8 +477,10 @@ private boolean isConditionPassing(CacheOperationContext context, Object result)
private Object generateKey(CacheOperationContext context, Object result) {
Object key = context.generateKey(result);
- Assert.notNull(key, "Null key returned for cache operation (maybe you are using named param... | false |
Other | spring-projects | spring-framework | 5aaed147d5627dbea9ebd9ad529a8721e2fc7fca.json | Use public AssumptionViolatedException in Assume
JUnit 4.12 created a 'public' version of the previously 'internal'
AssumptionViolatedException.
This commit upgrades Spring's Assume class to use this new public
version. | spring-core/src/test/java/org/springframework/tests/Assume.java | @@ -21,7 +21,7 @@
import java.util.Set;
import org.apache.commons.logging.Log;
-import org.junit.internal.AssumptionViolatedException;
+import org.junit.AssumptionViolatedException;
import org.springframework.util.ClassUtils;
| false |
Other | spring-projects | spring-framework | 84ef269d54808fd51a1b3c830fb1c445686e3ab2.json | Remove outdated reference to Spring Modules | src/asciidoc/index.adoc | @@ -48954,13 +48954,6 @@ this chapter.
* The http://groovy.codehaus.org/[Groovy] homepage
* The http://www.beanshell.org/[BeanShell] homepage
-Some of the more active members of the Spring community have also added support for a
-number of additional dynamic languages above and beyond the ones covered in this
-chap... | false |
Other | spring-projects | spring-framework | 0524a82c09689fab901e4718058f8c68f132d52a.json | Update unprocessableEntity to allow body
Issue: SPR-12515 | spring-web/src/main/java/org/springframework/http/ResponseEntity.java | @@ -252,7 +252,7 @@ public static HeadersBuilder<?> notFound() {
* @return the created builder
* @since 4.1.3
*/
- public static HeadersBuilder<?> unprocessableEntity() {
+ public static BodyBuilder unprocessableEntity() {
return status(HttpStatus.UNPROCESSABLE_ENTITY);
}
| true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.