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
0d00b674f4b2b7b6c7abd49b38c484c14d06bc94.json
Fix documentation formatting Using the "quotes" substitution group by default leads to side effect when the "*" character is used. This is especially true for AOP pointcut or for MVC mappings. Plain verbatim might work most of the time unless you intend to highlight a piece of code or a comment. Issue: SPR-12456
src/asciidoc/index.adoc
@@ -9565,7 +9565,7 @@ a resource points to just one resource at a time. When the path location contains an Ant-style pattern, for example: [literal] -[subs="verbatim,quotes"] +[subs="verbatim"] ---- /WEB-INF/*-context.xml com/mycompany/**/applicationContext.xml @@ -9833,7 +9833,7 @@ Implementing a `Validator` ...
false
Other
spring-projects
spring-framework
bb150c47cf50ac946197354b199f5081e8a7fb85.json
Add undertow 1.1.0.Final support Upgrade undertow dependency to 1.1.0.Final. Add support for undertow 1.1.0.Final in the UndertowRequestUpgradeStrategy, after a breaking change in the `io.undertow.websockets.jsr.ConfiguredServerEndpoint` constructor. Issue: SPR-12302
build.gradle
@@ -54,7 +54,7 @@ configure(allprojects) { project -> ext.tiles3Version = "3.0.5" ext.tomcatVersion = "8.0.15" ext.tyrusVersion = "1.3.5" - ext.undertowVersion = "1.0.17.Final" + ext.undertowVersion = "1.1.0.Final" ext.woodstoxVersion = "4.4.1" ext.xstreamVersion = "...
true
Other
spring-projects
spring-framework
bb150c47cf50ac946197354b199f5081e8a7fb85.json
Add undertow 1.1.0.Final support Upgrade undertow dependency to 1.1.0.Final. Add support for undertow 1.1.0.Final in the UndertowRequestUpgradeStrategy, after a breaking change in the `io.undertow.websockets.jsr.ConfiguredServerEndpoint` constructor. Issue: SPR-12302
spring-websocket/src/main/java/org/springframework/web/socket/server/standard/UndertowRequestUpgradeStrategy.java
@@ -28,19 +28,22 @@ import javax.websocket.Encoder; import javax.websocket.Endpoint; import javax.websocket.Extension; +import javax.websocket.server.ServerEndpointConfig; import io.undertow.server.HttpServerExchange; import io.undertow.server.HttpUpgradeListener; import io.undertow.servlet.api.InstanceFactory;...
true
Other
spring-projects
spring-framework
75c70fac3d77b4a9b81fb95b46309636ffdd3d76.json
Fix user destination parsing in simp messaging This commit fixes the parsing of message destinations such as "/user/anna/queue/foo", reverting a regression introduced by SPR-11506, which worked well with @SendToUser use cases but caused issues for messages sent to other users. Issue: SPR-12444
spring-messaging/src/main/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolver.java
@@ -150,9 +150,17 @@ else if (SimpMessageType.MESSAGE.equals(messageType)) { subscribeDestination = this.destinationPrefix.substring(0, startIndex-1) + destinationWithoutPrefix; user = destination.substring(startIndex, endIndex); user = StringUtils.replace(user, "%2F", "/"); - user = user.equals(sessionId...
true
Other
spring-projects
spring-framework
75c70fac3d77b4a9b81fb95b46309636ffdd3d76.json
Fix user destination parsing in simp messaging This commit fixes the parsing of message destinations such as "/user/anna/queue/foo", reverting a regression introduced by SPR-11506, which worked well with @SendToUser use cases but caused issues for messages sent to other users. Issue: SPR-12444
spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java
@@ -117,6 +117,25 @@ public void handleMessage() { assertEquals(this.user.getName(), actual.getUser()); } + // SPR-12444 + @Test + public void handleMessageToOtherUser() { + final String OTHER_SESSION_ID = "456"; + final String OTHER_USER_NAME = "anna"; + + String sourceDestination = "/user/"+OTHER_USER_NAME+...
true
Other
spring-projects
spring-framework
44ff1436f8a7aff318618127fecfbb3b18be7ef1.json
Use https for maven repositories
build.gradle
@@ -1,6 +1,6 @@ buildscript { repositories { - maven { url "http://repo.springsource.org/plugins-release" } + maven { url "https://repo.spring.io/plugins-release" } } dependencies { classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7") @@ -110,7 +110,7 @@ configure(allprojects) { project -> ...
false
Other
spring-projects
spring-framework
94ee763bc8bd945a79dcc3aa9330734cde6bc730.json
Fix bytecode generation for SpEL OpPlus Without this change the plus operator would fail to include a CHECKCAST in generated bytecode when it was compiled in cases where one of the operands has a runtime type of String but a statically declared type that was not String (i.e. Object). Issue: SPR-12426
spring-expression/src/main/java/org/springframework/expression/spel/ast/OpPlus.java
@@ -206,6 +206,9 @@ private void walk(MethodVisitor mv, CodeFlow cf, SpelNodeImpl operand) { else { cf.enterCompilationScope(); operand.generateCode(mv,cf); + if (cf.lastDescriptor() != "Ljava/lang/String") { + mv.visitTypeInsn(CHECKCAST, "java/lang/String"); + } cf.exitCompilationScope(); mv....
true
Other
spring-projects
spring-framework
94ee763bc8bd945a79dcc3aa9330734cde6bc730.json
Fix bytecode generation for SpEL OpPlus Without this change the plus operator would fail to include a CHECKCAST in generated bytecode when it was compiled in cases where one of the operands has a runtime type of String but a statically declared type that was not String (i.e. Object). Issue: SPR-12426
spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
@@ -1683,12 +1683,41 @@ public void opPlusString() throws Exception { expression = parse("'hello' + 3 + ' spring'"); assertEquals("hello3 spring",expression.getValue(new Greeter())); assertCantCompile(expression); + + expression = parse("object + 'a'"); + assertEquals("objecta",expression.getValue(new Gree...
true
Other
spring-projects
spring-framework
4942c5c1fb792806b3bcc9fa6da2beaf44d30bba.json
Add Id to JmsListenerEndpoint Docs Issue: SPR-12425
src/asciidoc/index.adoc
@@ -43561,6 +43561,7 @@ programmatically in addition to the ones that are detected by the `JmsListener` @Override public void configureJmsListeners(JmsListenerEndpointRegistrar registrar) { SimpleJmsListenerEndpoint endpoint = new SimpleJmsListenerEndpoint(); + endpoint.setId("myJmsEndpoint"); endpoint....
false
Other
spring-projects
spring-framework
9cef8e3001ddd61c734281a7556efd84b6cc2755.json
Apply extra checks to static resource handling - remove leading '/' and control chars - improve url and relative path checks - account for URL encoding - add isResourceUnderLocation final verification Issue: SPR-12354
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
@@ -17,10 +17,14 @@ package org.springframework.web.servlet.resource; import java.io.IOException; +import java.net.URLDecoder; import java.util.List; + import javax.servlet.http.HttpServletRequest; +import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; +import org.s...
true
Other
spring-projects
spring-framework
9cef8e3001ddd61c734281a7556efd84b6cc2755.json
Apply extra checks to static resource handling - remove leading '/' and control chars - improve url and relative path checks - account for URL encoding - add isResourceUnderLocation final verification Issue: SPR-12354
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandler.java
@@ -18,8 +18,10 @@ import java.io.IOException; import java.io.InputStream; +import java.net.URLDecoder; import java.util.ArrayList; import java.util.List; + import javax.activation.FileTypeMap; import javax.activation.MimetypesFileTypeMap; import javax.servlet.ServletException; @@ -28,14 +30,15 @@ import or...
true
Other
spring-projects
spring-framework
9cef8e3001ddd61c734281a7556efd84b6cc2755.json
Apply extra checks to static resource handling - remove leading '/' and control chars - improve url and relative path checks - account for URL encoding - add isResourceUnderLocation final verification Issue: SPR-12354
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/AppCacheManifestTransformerTests.java
@@ -17,6 +17,7 @@ package org.springframework.web.servlet.resource; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; import javax.servlet.http.HttpServletRequest; @@ -75,13 +76,13 @@ public void syntaxErrorInManifest() throws Exception { @Test public ...
true
Other
spring-projects
spring-framework
9cef8e3001ddd61c734281a7556efd84b6cc2755.json
Apply extra checks to static resource handling - remove leading '/' and control chars - improve url and relative path checks - account for URL encoding - add isResourceUnderLocation final verification Issue: SPR-12354
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CssLinkResourceTransformerTests.java
@@ -47,10 +47,13 @@ public class CssLinkResourceTransformerTests { @Before public void setUp() { - VersionResourceResolver resolver = new VersionResourceResolver(); - resolver.setStrategyMap(Collections.singletonMap("/**", new ContentVersionStrategy())); + VersionResourceResolver versionResolver = new VersionR...
true
Other
spring-projects
spring-framework
9cef8e3001ddd61c734281a7556efd84b6cc2755.json
Apply extra checks to static resource handling - remove leading '/' and control chars - improve url and relative path checks - account for URL encoding - add isResourceUnderLocation final verification Issue: SPR-12354
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PathResourceResolverTests.java
@@ -1,46 +1,102 @@ +/* + * 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
9cef8e3001ddd61c734281a7556efd84b6cc2755.json
Apply extra checks to static resource handling - remove leading '/' and control chars - improve url and relative path checks - account for URL encoding - add isResourceUnderLocation final verification Issue: SPR-12354
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceHttpRequestHandlerTests.java
@@ -16,25 +16,28 @@ package org.springframework.web.servlet.resource; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +...
true
Other
spring-projects
spring-framework
9cef8e3001ddd61c734281a7556efd84b6cc2755.json
Apply extra checks to static resource handling - remove leading '/' and control chars - improve url and relative path checks - account for URL encoding - add isResourceUnderLocation final verification Issue: SPR-12354
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceTransformerSupportTests.java
@@ -46,9 +46,11 @@ public class ResourceTransformerSupportTests { @Before public void setUp() { - VersionResourceResolver resolver = new VersionResourceResolver(); - resolver.setStrategyMap(Collections.singletonMap("/**", new ContentVersionStrategy())); - List<ResourceResolver> resolvers = Arrays.asList(resolv...
true
Other
spring-projects
spring-framework
18033486aec5de46833a2437026a0494c6485460.json
Check STOMP headers against ending backslash Issue: SPR-12418
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java
@@ -260,6 +260,9 @@ private String unescape(String inString) { while (index >= 0) { sb.append(inString.substring(pos, index)); + if((index + 1) >= inString.length()) { + throw new StompConversionException("Illegal escape sequence at index " + index + ": " + inString); + } Character c = inString.char...
true
Other
spring-projects
spring-framework
18033486aec5de46833a2437026a0494c6485460.json
Check STOMP headers against ending backslash Issue: SPR-12418
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/BufferingStompDecoderTests.java
@@ -185,6 +185,13 @@ public void incompleteCommand() throws InterruptedException { assertEquals(0, messages.size()); } + @Test(expected = StompConversionException.class) // SPR-12418 + public void endingBackslashHeaderValueCheck() throws InterruptedException { + BufferingStompDecoder stompDecoder = new Bufferin...
true
Other
spring-projects
spring-framework
794566abf59f0b719137a4dd4cd977ab0f3e97c5.json
Fix failing test
spring-test/src/test/java/org/springframework/test/web/client/MockClientHttpRequestFactoryTests.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. @@ -29,7 +29,8 @@ import static org.springfram...
false
Other
spring-projects
spring-framework
7f4bf41c2320aa8e552ca3c6d568cfa65adc7f65.json
Improve exception message Issue: SPR-12230
spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
@@ -216,7 +216,7 @@ private RequestMatcherClientHttpRequest createRequestInternal(URI uri, HttpMetho this.requestIterator = MockRestServiceServer.this.expectedRequests.iterator(); } if (!this.requestIterator.hasNext()) { - throw new AssertionError("No further requests expected"); + throw new Assertio...
false
Other
spring-projects
spring-framework
e24ebd6dbb1b2e3d5ce25c275c3ce900ddf8869b.json
Add connect/read timeout to Netty RequestFactory Added connectTimeout and readTimeout properties to the Netty4ClientHttpRequestFactory. Issue: SPR-12612
spring-web/src/main/java/org/springframework/http/client/Netty4ClientHttpRequestFactory.java
@@ -18,17 +18,22 @@ import java.io.IOException; import java.net.URI; +import java.net.URLConnection; +import java.util.concurrent.TimeUnit; import io.netty.bootstrap.Bootstrap; +import io.netty.channel.ChannelConfig; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelPipeline; import i...
false
Other
spring-projects
spring-framework
c48858c9728031c29db9e1a3508cf24b48e06226.json
Prevent ISE in the MockMvc PrintingResultHandler Issue: SPR-12735
spring-test/src/main/java/org/springframework/test/web/servlet/result/PrintingResultHandler.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ import java.util.Enumerati...
true
Other
spring-projects
spring-framework
c48858c9728031c29db9e1a3508cf24b48e06226.json
Prevent ISE in the MockMvc PrintingResultHandler Issue: SPR-12735
spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java
@@ -16,6 +16,7 @@ package org.springframework.test.web.servlet.samples.standalone; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.M...
true
Other
spring-projects
spring-framework
e13c300b536bce2c30fc38d89d4c3a4d489a35be.json
Fix white space issues
spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/AsyncTests.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,11 @@ */ package org.springfram...
false
Other
spring-projects
spring-framework
6b07c53c61ed1c2dcd6c74bd64db7477bdafa424.json
Allow file locations for resource handling Prior to this change, location checks for serving resources would append `/` to the location path it didn't already have one. This commit makes sure not to append a `/` if the provided location is actually a file. Issue: SPR-12747
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/PathResourceResolver.java
@@ -179,7 +179,8 @@ else if (resource instanceof ServletContextResource) { resourcePath = resource.getURL().getPath(); locationPath = StringUtils.cleanPath(location.getURL().getPath()); } - locationPath = (locationPath.endsWith("/") || locationPath.isEmpty() ? locationPath : locationPath + "/"); + location...
true
Other
spring-projects
spring-framework
6b07c53c61ed1c2dcd6c74bd64db7477bdafa424.json
Allow file locations for resource handling Prior to this change, location checks for serving resources would append `/` to the location path it didn't already have one. This commit makes sure not to append a `/` if the provided location is actually a file. Issue: SPR-12747
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PathResourceResolverTests.java
@@ -117,4 +117,11 @@ public void checkRelativeLocation() throws Exception { assertNotNull(this.resolver.resolveResource(null, "main.css", Arrays.asList(location), null)); } + // SPR-12747 + @Test + public void checkFileLocation() throws Exception { + Resource resource = new ClassPathResource("test/main.css", Pa...
true
Other
spring-projects
spring-framework
64467b4f59751fa3571968d0ce61864b650e64bb.json
Provide accessors to scheduled tasks Updated ScheduledTaskRegistrar to offer accessors to the tasks it is responsible to schedule. Issue: SPR-12748
spring-context/src/main/java/org/springframework/scheduling/config/ScheduledTaskRegistrar.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,6 +17,7 @@ package org.springframework....
true
Other
spring-projects
spring-framework
64467b4f59751fa3571968d0ce61864b650e64bb.json
Provide accessors to scheduled tasks Updated ScheduledTaskRegistrar to offer accessors to the tasks it is responsible to schedule. Issue: SPR-12748
spring-context/src/test/java/org/springframework/scheduling/config/ScheduledTaskRegistrarTest.java
@@ -0,0 +1,74 @@ +/* + * Copyright 2002-2015 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + ...
true
Other
spring-projects
spring-framework
44075d7205e36ff580a55132eb266391eaeaf505.json
Add missing test Add test that wasn't committed because it matches the ignore list.
spring-aop/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceProxyTests-context.xml
@@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd"> + +<beans> + + <bean id="testBeanTarget" class="org.springframework.tests.sample.beans.TestBean" scope="prototype"/> + + <bean id="targetSource" clas...
true
Other
spring-projects
spring-framework
44075d7205e36ff580a55132eb266391eaeaf505.json
Add missing test Add test that wasn't committed because it matches the ignore list.
spring-aop/src/test/java/org/springframework/aop/target/CommonsPool2TargetSourceProxyTests.java
@@ -0,0 +1,47 @@ +/* + * Copyright 2002-2015 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + ...
true
Other
spring-projects
spring-framework
500179e5c0c7892e21a6255314554f5919e8a4a5.json
Allow custom RequestMappingHandlerMapping Extract the creation of RequestMappingHandlerMapping into protected method to allow easier use of custom subclasses. Issue: SPR-12746
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -223,7 +223,7 @@ public void setServletConte...
false
Other
spring-projects
spring-framework
018adb04f26ba51e680449eb60b357de0b9c960f.json
Add converter support for Stream Add StreamConverter to provide full support for converting java.util.stream.Stream instances to and from collections or arrays. Also attempt to convert the element type if necessary. StreamConverter is registered by default in the DefaultConversionService as long as Java8 is availabl...
spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,9 +23,11 @@ import java.util.Collection...
true
Other
spring-projects
spring-framework
018adb04f26ba51e680449eb60b357de0b9c960f.json
Add converter support for Stream Add StreamConverter to provide full support for converting java.util.stream.Stream instances to and from collections or arrays. Also attempt to convert the element type if necessary. StreamConverter is registered by default in the DefaultConversionService as long as Java8 is availabl...
spring-core/src/main/java/org/springframework/core/convert/support/DefaultConversionService.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,6 +33,7 @@ * * @author Chris Beams ...
true
Other
spring-projects
spring-framework
018adb04f26ba51e680449eb60b357de0b9c960f.json
Add converter support for Stream Add StreamConverter to provide full support for converting java.util.stream.Stream instances to and from collections or arrays. Also attempt to convert the element type if necessary. StreamConverter is registered by default in the DefaultConversionService as long as Java8 is availabl...
spring-core/src/main/java/org/springframework/core/convert/support/StreamConverter.java
@@ -0,0 +1,124 @@ +/* + * Copyright 2002-2015 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 +...
true
Other
spring-projects
spring-framework
018adb04f26ba51e680449eb60b357de0b9c960f.json
Add converter support for Stream Add StreamConverter to provide full support for converting java.util.stream.Stream instances to and from collections or arrays. Also attempt to convert the element type if necessary. StreamConverter is registered by default in the DefaultConversionService as long as Java8 is availabl...
spring-core/src/test/java/org/springframework/core/convert/support/DefaultConversionTests.java
@@ -36,6 +36,7 @@ import java.util.Optional; import java.util.Properties; import java.util.Set; +import java.util.stream.Stream; import org.junit.Test; @@ -53,6 +54,7 @@ /** * @author Keith Donald * @author Juergen Hoeller + * @author Stephane Nicoll */ public class DefaultConversionTests { @@ -81,24 ...
true
Other
spring-projects
spring-framework
018adb04f26ba51e680449eb60b357de0b9c960f.json
Add converter support for Stream Add StreamConverter to provide full support for converting java.util.stream.Stream instances to and from collections or arrays. Also attempt to convert the element type if necessary. StreamConverter is registered by default in the DefaultConversionService as long as Java8 is availabl...
spring-core/src/test/java/org/springframework/core/convert/support/StreamConverterTest.java
@@ -0,0 +1,188 @@ +/* + * Copyright 2002-2015 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 +...
true
Other
spring-projects
spring-framework
b94c6fdf7ae1305516166db710070acf4f967f21.json
Add tests for SPR-12738
spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java
@@ -22,8 +22,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import java.lang.reflect.Method; import java.util.Arrays; +import org.junit.Ignore; import org.junit.Test; import org.springframework.util.MultiValueMap; @@ -123,6 +125,3...
false
Other
spring-projects
spring-framework
40cbede7f36e4551189b2b0d60cc70aacec5f347.json
Improve error handling in WebUtils.isValidOrigin() With this commit, WebUtils.isValidOrigin() logs an error message instead of throwing an IllegalArgumentException when Origin header value is invalid (for example when it does not contain the scheme). Issue: SPR-12697
spring-web/src/main/java/org/springframework/web/util/WebUtils.java
@@ -33,6 +33,9 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import org.springframework.http.HttpRequest; import org.springframework.util.Assert; import org.springframework.util.Lin...
true
Other
spring-projects
spring-framework
40cbede7f36e4551189b2b0d60cc70aacec5f347.json
Improve error handling in WebUtils.isValidOrigin() With this commit, WebUtils.isValidOrigin() logs an error message instead of throwing an IllegalArgumentException when Origin header value is invalid (for example when it does not contain the scheme). Issue: SPR-12697
spring-web/src/test/java/org/springframework/web/util/WebUtilsTests.java
@@ -142,6 +142,10 @@ public void isValidOrigin() { request.getHeaders().set(HttpHeaders.ORIGIN, "https://mydomain1.com"); assertFalse(WebUtils.isValidOrigin(request, allowedOrigins)); + servletRequest.setServerName("invalid-origin"); + request.getHeaders().set(HttpHeaders.ORIGIN, "invalid-origin"); + assertF...
true
Other
spring-projects
spring-framework
1aec6a6cc29c54cd74a7e609a2fa08d39835abe1.json
Detect Order on target class as well Previously, the `@Order` annotation was managed in an inconsistent way when placed at the implementation level. For simple beans, it was discovered properly but wasn't for beans requiring a proxy. OrderComparator.SourceProvider now explicitly allows to return several order sources...
spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
@@ -1459,14 +1459,27 @@ public FactoryAwareOrderSourceProvider(Map<Object, String> instancesToBeanNames) @Override public Object getOrderSource(Object obj) { - return getFactoryMethod(this.instancesToBeanNames.get(obj)); + RootBeanDefinition beanDefinition = getRootBeanDefinition(this.instancesToBeanNames.g...
true
Other
spring-projects
spring-framework
1aec6a6cc29c54cd74a7e609a2fa08d39835abe1.json
Detect Order on target class as well Previously, the `@Order` annotation was managed in an inconsistent way when placed at the implementation level. For simple beans, it was discovered properly but wasn't for beans requiring a proxy. OrderComparator.SourceProvider now explicitly allows to return several order sources...
spring-context/src/test/java/org/springframework/context/annotation/Spr12636Tests.java
@@ -0,0 +1,117 @@ +/* + * Copyright 2002-2015 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 +...
true
Other
spring-projects
spring-framework
1aec6a6cc29c54cd74a7e609a2fa08d39835abe1.json
Detect Order on target class as well Previously, the `@Order` annotation was managed in an inconsistent way when placed at the implementation level. For simple beans, it was discovered properly but wasn't for beans requiring a proxy. OrderComparator.SourceProvider now explicitly allows to return several order sources...
spring-core/src/main/java/org/springframework/core/OrderComparator.java
@@ -21,6 +21,8 @@ import java.util.Comparator; import java.util.List; +import org.springframework.util.ObjectUtils; + /** * {@link Comparator} implementation for {@link Ordered} objects, * sorting by order value ascending (resp. by priority descending). @@ -89,7 +91,19 @@ else if (p2 && !p1) { private int ge...
true
Other
spring-projects
spring-framework
1aec6a6cc29c54cd74a7e609a2fa08d39835abe1.json
Detect Order on target class as well Previously, the `@Order` annotation was managed in an inconsistent way when placed at the implementation level. For simple beans, it was discovered properly but wasn't for beans requiring a proxy. OrderComparator.SourceProvider now explicitly allows to return several order sources...
spring-core/src/test/java/org/springframework/core/OrderComparatorTests.java
@@ -18,43 +18,90 @@ import java.util.Comparator; -import junit.framework.TestCase; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; /** * Unit tests for the {@link OrderComparator} class. * * @author Rick Evans + * @author Stephane Nicoll */ -public final class OrderComparatorTest...
true
Other
spring-projects
spring-framework
917eb1de0b2f4f75ea40ca46e32b164cd6b2338f.json
Ignore Pong messages in StompSubProtocolHandler Issue: SPR-12728
spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,6 +28,7 @@ import org.apache.commons....
false
Other
spring-projects
spring-framework
b4fa1c24cc782a90935bde9275bfb203d4c97b14.json
Pass SockJS session attributes to HandshakeHandler Before this change the WebSocketTransportHandler passed Collections.emptyMap as attributes to the HandshakeHandler because it didn't matter what attributes the underlying WebSocketSession has since it is wrapped by the SockJsSession and that's what exposed for use eve...
spring-websocket/src/main/java/org/springframework/web/socket/WebSocketSession.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,10 +52,12 @@ public interface WebSocketS...
true
Other
spring-projects
spring-framework
b4fa1c24cc782a90935bde9275bfb203d4c97b14.json
Pass SockJS session attributes to HandshakeHandler Before this change the WebSocketTransportHandler passed Collections.emptyMap as attributes to the HandshakeHandler because it didn't matter what attributes the underlying WebSocketSession has since it is wrapped by the SockJsSession and that's what exposed for use eve...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/handler/WebSocketTransportHandler.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ package org.springframewor...
true
Other
spring-projects
spring-framework
2df03d6316ce982528f5c8258dd2eb2aff47f9ba.json
Add interceptor to resourceHandlerMapping The resourceHandlerMapping in the MVC Java config is not configured with any interceptors, and in particular those added through the InterceptorRegistry, which are otherwise added to all other handler mapping beans created by the config. This means that the ResourceUrlProvider...
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
@@ -68,6 +68,7 @@ import org.springframework.web.method.support.HandlerMethodReturnValueHandler; import org.springframework.web.servlet.HandlerAdapter; import org.springframework.web.servlet.HandlerExceptionResolver; +import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet....
true
Other
spring-projects
spring-framework
2df03d6316ce982528f5c8258dd2eb2aff47f9ba.json
Add interceptor to resourceHandlerMapping The resourceHandlerMapping in the MVC Java config is not configured with any interceptors, and in particular those added through the InterceptorRegistry, which are otherwise added to all other handler mapping beans created by the config. This means that the ResourceUrlProvider...
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
@@ -140,6 +140,9 @@ public void handlerMappings() throws Exception { assertEquals(TestPathMatcher.class, handlerMapping.getPathMatcher().getClass()); chain = handlerMapping.getHandler(new MockHttpServletRequest("GET", "/resources/foo.gif")); assertNotNull(chain.getHandler()); + assertEquals(Arrays.toString(ch...
true
Other
spring-projects
spring-framework
2f54b273a51cf693f35a3d4e7f33f7d7e893dd19.json
Delete unused imports in spring-websocket module
spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupport.java
@@ -23,11 +23,9 @@ import org.springframework.messaging.simp.config.AbstractMessageBrokerConfiguration; import org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; -import org.springframework.util.Assert; import org.spring...
true
Other
spring-projects
spring-framework
2f54b273a51cf693f35a3d4e7f33f7d7e893dd19.json
Delete unused imports in spring-websocket module
spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebMvcStompWebSocketEndpointRegistrationTests.java
@@ -39,7 +39,6 @@ import org.springframework.web.socket.sockjs.transport.handler.WebSocketTransportHandler; import static org.junit.Assert.*; -import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; /**
true
Other
spring-projects
spring-framework
2f54b273a51cf693f35a3d4e7f33f7d7e893dd19.json
Delete unused imports in spring-websocket module
spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupportTests.java
@@ -56,7 +56,6 @@ import org.springframework.web.socket.server.support.WebSocketHttpRequestHandler; import static org.junit.Assert.*; -import static org.junit.Assert.assertEquals; /** * Test fixture for
true
Other
spring-projects
spring-framework
2f54b273a51cf693f35a3d4e7f33f7d7e893dd19.json
Delete unused imports in spring-websocket module
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/AbstractSockJsIntegrationTests.java
@@ -39,7 +39,6 @@ import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestName;
true
Other
spring-projects
spring-framework
9bc32ac199ad649b095ad5f8af63c82c2b9d7dc5.json
Delete unused imports in spring-messaging module
spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
@@ -26,8 +26,6 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.context.annotation.Bean; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageChannel; -import org.springframework.messaging.SubscribableChannel; import org.springframework....
false
Other
spring-projects
spring-framework
4a29e164a8ca222fd8b0d2043e1d44494e84544e.json
Allow binary messages in StompSubProtocolHandler Issue: SPR-12301
spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
@@ -49,6 +49,7 @@ import org.springframework.messaging.support.MessageHeaderAccessor; import org.springframework.messaging.support.MessageHeaderInitializer; import org.springframework.util.Assert; +import org.springframework.web.socket.BinaryMessage; import org.springframework.web.socket.CloseStatus; import org.sp...
false
Other
spring-projects
spring-framework
4cf19df46201f987779f0981652cbe1f5ec07f86.json
SockJs client: add an XhrTransport for Undertow This change adds a new XhrTransport for the SockJs client implementation. This transport is based on `UndertowClient`, Undertow's HTTP client. Note that this transport can be customized with an OptionMap that is used by the Xnio worker backing the I/O communications (se...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/UndertowXhrTransport.java
@@ -0,0 +1,466 @@ +/* + * 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
4cf19df46201f987779f0981652cbe1f5ec07f86.json
SockJs client: add an XhrTransport for Undertow This change adds a new XhrTransport for the SockJs client implementation. This transport is based on `UndertowClient`, Undertow's HTTP client. Note that this transport can be customized with an OptionMap that is used by the Xnio worker backing the I/O communications (se...
spring-websocket/src/test/java/org/springframework/web/socket/UndertowTestServer.java
@@ -16,6 +16,8 @@ package org.springframework.web.socket; +import java.io.IOException; + import javax.servlet.DispatcherType; import javax.servlet.Filter; import javax.servlet.Servlet; @@ -34,6 +36,9 @@ import org.springframework.util.SocketUtils; import org.springframework.web.context.WebApplicationContext; ...
true
Other
spring-projects
spring-framework
4cf19df46201f987779f0981652cbe1f5ec07f86.json
SockJs client: add an XhrTransport for Undertow This change adds a new XhrTransport for the SockJs client implementation. This transport is based on `UndertowClient`, Undertow's HTTP client. Note that this transport can be customized with an OptionMap that is used by the Xnio worker backing the I/O communications (se...
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/AbstractSockJsIntegrationTests.java
@@ -140,7 +140,6 @@ protected void initSockJsClient(Transport... transports) { // Temporarily @Ignore failures caused by suspected Jetty bug - @Ignore @Test public void echoWebSocket() throws Exception { testEcho(100, createWebSocketTransport()); @@ -158,7 +157,6 @@ public void echoXhr() throws Exception {...
true
Other
spring-projects
spring-framework
4cf19df46201f987779f0981652cbe1f5ec07f86.json
SockJs client: add an XhrTransport for Undertow This change adds a new XhrTransport for the SockJs client implementation. This transport is based on `UndertowClient`, Undertow's HTTP client. Note that this transport can be customized with an OptionMap that is used by the Xnio worker backing the I/O communications (se...
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/client/UndertowSockJsIntegrationTests.java
@@ -0,0 +1,66 @@ +/* + * 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
aaf69eb1f12e2bcd5c10c7d58ccb3fcdf543fb43.json
Fix outdated references to JobDetailBean Issue: SPR-12306
src/asciidoc/index.adoc
@@ -47690,30 +47690,30 @@ classes that simplify the usage of Quartz within Spring-based applications. [[scheduling-quartz-jobdetail]] -==== Using the JobDetailBean -`JobDetail` objects contain all information needed to run a job. The Spring Framework -provides a `JobDetailBean` that makes the `JobDetail` more of a...
false
Other
spring-projects
spring-framework
12a2813e2a18d7655358fe653fa9bb2e9d022121.json
Change gopivotal.com to pivotal.io This commit changes email addresses and URLs so that they point to pivotal.io instead of gopivotal.com.
.mailmap
@@ -1,14 +1,23 @@ -Juergen Hoeller <jhoeller@vmware.com> jhoeller <jhoeller@vmware.com> -<rstoyanchev@gopivotal.com> <rstoyanchev@vmware.com> -<pwebb@gopivotal.com> <pwebb@vmware.com> -<cbeams@gopivotal.com> <cbeams@vmware.com> -<cbeams@gopivotal.com> <cbeams@gmail.com> -<apoutsma@gopivotal.com> <apoutsma@vmware.com> -...
true
Other
spring-projects
spring-framework
12a2813e2a18d7655358fe653fa9bb2e9d022121.json
Change gopivotal.com to pivotal.io This commit changes email addresses and URLs so that they point to pivotal.io instead of gopivotal.com.
gradle/publish-maven.gradle
@@ -43,7 +43,7 @@ def customizePom(pom, gradleProject) { developer { id = "jhoeller" name = "Juergen Hoeller" - email = "jhoeller@gopivotal.com" + email = "jhoeller@pivotal.io" } } issueManagement {
true
Other
spring-projects
spring-framework
12a2813e2a18d7655358fe653fa9bb2e9d022121.json
Change gopivotal.com to pivotal.io This commit changes email addresses and URLs so that they point to pivotal.io instead of gopivotal.com.
src/dist/license.txt
@@ -269,7 +269,7 @@ sending a request, with your name and address to: San Francisco, CA 94103 United States of America -or email info@gopivotal.com. All such requests should clearly specify: +or email info@pivotal.io. All such requests should clearly specify: OPEN SOURCE FILES REQUEST Attentio...
true
Other
spring-projects
spring-framework
bd7d56ac546b4ad0c2dad44b2317e7cc84b9aeae.json
Fix VerifyError for SpEL ternary compilation The ternary expression node was failing to generate the necessary unboxing bytecode when the condition part of the expression returned a boxed Boolean rather than a primitive boolean. Also fixed here is an IllegalAccessError that was seen in the same expression due to gene...
spring-expression/src/main/java/org/springframework/expression/spel/CodeFlow.java
@@ -446,8 +446,10 @@ public static void insertCheckCast(MethodVisitor mv, String descriptor) { } } else { - // This is chopping off the 'L' to leave us with "java/lang/String" - mv.visitTypeInsn(CHECKCAST, descriptor.substring(1)); + if (!descriptor.equals("Ljava/lang/Object")) { + // This is ...
true
Other
spring-projects
spring-framework
bd7d56ac546b4ad0c2dad44b2317e7cc84b9aeae.json
Fix VerifyError for SpEL ternary compilation The ternary expression node was failing to generate the necessary unboxing bytecode when the condition part of the expression returned a boxed Boolean rather than a primitive boolean. Also fixed here is an IllegalAccessError that was seen in the same expression due to gene...
spring-expression/src/main/java/org/springframework/expression/spel/ast/Ternary.java
@@ -109,6 +109,9 @@ public void generateCode(MethodVisitor mv, CodeFlow codeflow) { computeExitTypeDescriptor(); codeflow.enterCompilationScope(); this.children[0].generateCode(mv, codeflow); + if (!CodeFlow.isPrimitive(codeflow.lastDescriptor())) { + CodeFlow.insertUnboxInsns(mv, 'Z', codeflow.lastDescript...
true
Other
spring-projects
spring-framework
bd7d56ac546b4ad0c2dad44b2317e7cc84b9aeae.json
Fix VerifyError for SpEL ternary compilation The ternary expression node was failing to generate the necessary unboxing bytecode when the condition part of the expression returned a boxed Boolean rather than a primitive boolean. Also fixed here is an IllegalAccessError that was seen in the same expression due to gene...
spring-expression/src/main/java/org/springframework/expression/spel/ast/VariableReference.java
@@ -16,6 +16,8 @@ package org.springframework.expression.spel.ast; +import java.lang.reflect.Modifier; + import org.springframework.asm.MethodVisitor; import org.springframework.expression.EvaluationContext; import org.springframework.expression.TypedValue; @@ -71,7 +73,17 @@ public TypedValue getValueInternal(...
true
Other
spring-projects
spring-framework
bd7d56ac546b4ad0c2dad44b2317e7cc84b9aeae.json
Fix VerifyError for SpEL ternary compilation The ternary expression node was failing to generate the necessary unboxing bytecode when the condition part of the expression returned a boxed Boolean rather than a primitive boolean. Also fixed here is an IllegalAccessError that was seen in the same expression due to gene...
spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
@@ -25,7 +25,6 @@ import java.util.StringTokenizer; import org.junit.Test; - import org.springframework.asm.MethodVisitor; import org.springframework.expression.AccessException; import org.springframework.expression.EvaluationContext; @@ -522,6 +521,19 @@ public void ternary() throws Exception { assertEquals(...
true
Other
spring-projects
spring-framework
b2d67914a8c908af1ff4ef2c45d2ce1b21f6fe7e.json
Fix javadoc glitch Issue: SPR-12282
spring-jdbc/src/main/java/org/springframework/jdbc/core/simple/ParameterizedRowMapper.java
@@ -28,7 +28,7 @@ * @since 2.0 * @see org.springframework.jdbc.core.simple.SimpleJdbcOperations * @deprecated along with {@link SimpleJdbcTemplate}, in favor of the regular - * {@link org.springframework.jdbc.core.SingleColumnRowMapper} + * {@link RowMapper} */ @Deprecated public interface ParameterizedRowMap...
false
Other
spring-projects
spring-framework
69998e3d507bcdc5c0b132cddeb4772e46cf8296.json
Remove outdated references to ContextLoaderServlet Issue: SPR-7725 (cherry picked from commit b45d08f)
spring-orm-hibernate4/src/main/java/org/springframework/orm/hibernate4/support/OpenSessionInViewFilter.java
@@ -63,9 +63,7 @@ * * <p>Looks up the SessionFactory in Spring's root web application context. * Supports a "sessionFactoryBeanName" filter init-param in {@code web.xml}; - * the default bean name is "sessionFactory". Looks up the SessionFactory on each - * request, to avoid initialization order issues (when usin...
true
Other
spring-projects
spring-framework
69998e3d507bcdc5c0b132cddeb4772e46cf8296.json
Remove outdated references to ContextLoaderServlet Issue: SPR-7725 (cherry picked from commit b45d08f)
spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewFilter.java
@@ -78,9 +78,7 @@ * * <p>Looks up the SessionFactory in Spring's root web application context. * Supports a "sessionFactoryBeanName" filter init-param in {@code web.xml}; - * the default bean name is "sessionFactory". Looks up the SessionFactory on each - * request, to avoid initialization order issues (when usin...
true
Other
spring-projects
spring-framework
69998e3d507bcdc5c0b132cddeb4772e46cf8296.json
Remove outdated references to ContextLoaderServlet Issue: SPR-7725 (cherry picked from commit b45d08f)
spring-orm/src/main/java/org/springframework/orm/jdo/support/OpenPersistenceManagerInViewFilter.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,7 @@ * * <p>Looks up the Persi...
true
Other
spring-projects
spring-framework
69998e3d507bcdc5c0b132cddeb4772e46cf8296.json
Remove outdated references to ContextLoaderServlet Issue: SPR-7725 (cherry picked from commit b45d08f)
spring-web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java
@@ -68,18 +68,16 @@ public abstract class WebApplicationContextUtils { /** - * Find the root WebApplicationContext for this web application, which is - * typically loaded via {@link org.springframework.web.context.ContextLoaderListener}. + * Find the root {@link WebApplicationContext} for this web app, typical...
true
Other
spring-projects
spring-framework
69998e3d507bcdc5c0b132cddeb4772e46cf8296.json
Remove outdated references to ContextLoaderServlet Issue: SPR-7725 (cherry picked from commit b45d08f)
spring-web/src/main/java/org/springframework/web/jsf/FacesContextUtils.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. @@ -38,8 +38,8 @@ public abstract class FacesC...
true
Other
spring-projects
spring-framework
69998e3d507bcdc5c0b132cddeb4772e46cf8296.json
Remove outdated references to ContextLoaderServlet Issue: SPR-7725 (cherry picked from commit b45d08f)
spring-web/src/main/java/org/springframework/web/multipart/support/MultipartFilter.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. @@ -34,9 +34,7 @@ * * <p>Looks up the Multi...
true
Other
spring-projects
spring-framework
69998e3d507bcdc5c0b132cddeb4772e46cf8296.json
Remove outdated references to ContextLoaderServlet Issue: SPR-7725 (cherry picked from commit b45d08f)
spring-webmvc-portlet/src/main/java/org/springframework/web/portlet/context/PortletApplicationContextUtils.java
@@ -57,8 +57,8 @@ public abstract class PortletApplicationContextUtils { /** - * Find the root WebApplicationContext for this portlet application, which is - * typically loaded via ContextLoaderListener or ContextLoaderServlet. + * Find the root {@link WebApplicationContext} for this web app, typically + * loa...
true
Other
spring-projects
spring-framework
77bbfb6e7ec16e2744f2c43bc12c9736fd6949cf.json
Add order attribute to MVC ViewResolver config The ViewResolverComposite that contains the ViewResolver's registered throug the MVC Java config and namespace can now be assigned an explicit order.
spring-webmvc/src/main/java/org/springframework/web/servlet/config/ViewResolversBeanDefinitionParser.java
@@ -133,14 +133,17 @@ else if (contentnNegotiationElements.size() == 1) { beanDef.getPropertyValues().add("viewResolvers", resolvers); ManagedList<Object> list = new ManagedList<Object>(1); list.add(beanDef); - compositeResolverBeanDef.getPropertyValues().add("order", Ordered.HIGHEST_PRECEDENCE); co...
true
Other
spring-projects
spring-framework
77bbfb6e7ec16e2744f2c43bc12c9736fd6949cf.json
Add order attribute to MVC ViewResolver config The ViewResolverComposite that contains the ViewResolver's registered throug the MVC Java config and namespace can now be assigned an explicit order.
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ViewResolverRegistry.java
@@ -57,7 +57,7 @@ public class ViewResolverRegistry { private final List<ViewResolver> viewResolvers = new ArrayList<ViewResolver>(4); - private int order = Ordered.LOWEST_PRECEDENCE; + private Integer order; private ContentNegotiationManager contentNegotiationManager; @@ -112,7 +112,7 @@ public void enable...
true
Other
spring-projects
spring-framework
77bbfb6e7ec16e2744f2c43bc12c9736fd6949cf.json
Add order attribute to MVC ViewResolver config The ViewResolverComposite that contains the ViewResolver's registered throug the MVC Java config and namespace can now be assigned an explicit order.
spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-4.1.xsd
@@ -949,6 +949,20 @@ </xsd:annotation> </xsd:element> </xsd:choice> + <xsd:attribute name="order" type="xsd:int"> + <xsd:annotation> + <xsd:documentation><![CDATA[ + ViewResolver's registered through this element are encapsulated in an + instance of org.springframework.web.servlet.view.ViewRes...
true
Other
spring-projects
spring-framework
77bbfb6e7ec16e2744f2c43bc12c9736fd6949cf.json
Add order attribute to MVC ViewResolver config The ViewResolverComposite that contains the ViewResolver's registered throug the MVC Java config and namespace can now be assigned an explicit order.
spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
@@ -767,6 +767,16 @@ public void testViewResolutionWithContentNegotiation() throws Exception { assertSame(manager, this.appContext.getBean(ContentNegotiationManager.class)); } + @Test + public void testViewResolutionWithOrderSet() throws Exception { + loadBeanDefinitions("mvc-config-view-resolution-custom-order...
true
Other
spring-projects
spring-framework
77bbfb6e7ec16e2744f2c43bc12c9736fd6949cf.json
Add order attribute to MVC ViewResolver config The ViewResolverComposite that contains the ViewResolver's registered throug the MVC Java config and namespace can now be assigned an explicit order.
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
@@ -246,6 +246,20 @@ public void mvcViewResolverWithExistingResolver() throws Exception { assertNull(resolver.resolveViewName("anyViewName", Locale.ENGLISH)); } + @Test + public void mvcViewResolverWithOrderSet() { + ApplicationContext context = initContext(CustomViewResolverOrderConfig.class); + ViewResolverC...
true
Other
spring-projects
spring-framework
77bbfb6e7ec16e2744f2c43bc12c9736fd6949cf.json
Add order attribute to MVC ViewResolver config The ViewResolverComposite that contains the ViewResolver's registered throug the MVC Java config and namespace can now be assigned an explicit order.
spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-view-resolution-custom-order.xml
@@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:mvc="http://www.springframework.org/schema/mvc" + xsi:schemaLocation=" + http://www.springframework.org/schema/mvc http://www.spr...
true
Other
spring-projects
spring-framework
bc0e59f689242537a7983075c5120dbb51e53edf.json
Fix condition vs. conditional typo in documenation Issue: SPR-12273
src/asciidoc/index.adoc
@@ -49227,7 +49227,7 @@ result in an exception as a custom `CacheManager` will be ignored by the ===== Conditional caching Sometimes, a method might not be suitable for caching all the time (for example, it might depend on the given arguments). The cache annotations support such functionality -through the `condition...
false
Other
spring-projects
spring-framework
4e24d66ff70b8dc6e2184b2f723a57e387da523d.json
Create a builder for Jackson ObjectMapper Jackson2ObjectMapperBuilder now allows to create ObjectMapper and XmlMapper instances easily thanks to its fluent API. This builder is used in Jackson message converters and views to instantiate default ObjectMapper and XmlMapper. This commit also add a createXmlMapper prope...
build.gradle
@@ -182,6 +182,7 @@ configure(allprojects) { project -> "http://quartz-scheduler.org/api/2.2.0/", "http://fasterxml.github.com/jackson-core/javadoc/2.3.0/", "http://fasterxml.github.com/jackson-databind/javadoc/2.3.0/", + "http://fasterxml.github.io/jackson-dataformat-xml/javadoc/2.3.0/", "http://hc.apache...
true
Other
spring-projects
spring-framework
4e24d66ff70b8dc6e2184b2f723a57e387da523d.json
Create a builder for Jackson ObjectMapper Jackson2ObjectMapperBuilder now allows to create ObjectMapper and XmlMapper instances easily thanks to its fluent API. This builder is used in Jackson message converters and views to instantiate default ObjectMapper and XmlMapper. This commit also add a createXmlMapper prope...
spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java
@@ -0,0 +1,483 @@ +/* + * 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
4e24d66ff70b8dc6e2184b2f723a57e387da523d.json
Create a builder for Jackson ObjectMapper Jackson2ObjectMapperBuilder now allows to create ObjectMapper and XmlMapper instances easily thanks to its fluent API. This builder is used in Jackson message converters and views to instantiate default ObjectMapper and XmlMapper. This commit also add a createXmlMapper prope...
spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
@@ -37,6 +37,7 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; import org.springframework.beans.BeanUtils; import org.spr...
true
Other
spring-projects
spring-framework
4e24d66ff70b8dc6e2184b2f723a57e387da523d.json
Create a builder for Jackson ObjectMapper Jackson2ObjectMapperBuilder now allows to create ObjectMapper and XmlMapper instances easily thanks to its fluent API. This builder is used in Jackson message converters and views to instantiate default ObjectMapper and XmlMapper. This commit also add a createXmlMapper prope...
spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java
@@ -32,6 +32,8 @@ * <p>By default, this converter supports {@code application/json}. This can be overridden by setting the * {@link #setSupportedMediaTypes supportedMediaTypes} property. * + * <p>The default constructor uses the default configuration provided by {@link Jackson2ObjectMapperBuilder}. + * * <p>Com...
true
Other
spring-projects
spring-framework
4e24d66ff70b8dc6e2184b2f723a57e387da523d.json
Create a builder for Jackson ObjectMapper Jackson2ObjectMapperBuilder now allows to create ObjectMapper and XmlMapper instances easily thanks to its fluent API. This builder is used in Jackson message converters and views to instantiate default ObjectMapper and XmlMapper. This commit also add a createXmlMapper prope...
spring-web/src/main/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverter.java
@@ -16,23 +16,52 @@ package org.springframework.http.converter.xml; +import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import org.springframework.http.MediaType; import org.springframework.http.converter.json.AbstractJackson2HttpMessageConverter; +impor...
true
Other
spring-projects
spring-framework
4e24d66ff70b8dc6e2184b2f723a57e387da523d.json
Create a builder for Jackson ObjectMapper Jackson2ObjectMapperBuilder now allows to create ObjectMapper and XmlMapper instances easily thanks to its fluent API. This builder is used in Jackson message converters and views to instantiate default ObjectMapper and XmlMapper. This commit also add a createXmlMapper prope...
spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java
@@ -0,0 +1,268 @@ +/* + * 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
4e24d66ff70b8dc6e2184b2f723a57e387da523d.json
Create a builder for Jackson ObjectMapper Jackson2ObjectMapperBuilder now allows to create ObjectMapper and XmlMapper instances easily thanks to its fluent API. This builder is used in Jackson message converters and views to instantiate default ObjectMapper and XmlMapper. This commit also add a createXmlMapper prope...
spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBeanTests.java
@@ -260,6 +260,7 @@ public void completeSetup() { assertFalse(objectMapper.getSerializationConfig().isEnabled(MapperFeature.AUTO_DETECT_GETTERS)); assertTrue(objectMapper.getDeserializationConfig().isEnabled(MapperFeature.DEFAULT_VIEW_INCLUSION)); + assertTrue(objectMapper.getDeserializationConfig().isEnabled(...
true
Other
spring-projects
spring-framework
4e24d66ff70b8dc6e2184b2f723a57e387da523d.json
Create a builder for Jackson ObjectMapper Jackson2ObjectMapperBuilder now allows to create ObjectMapper and XmlMapper instances easily thanks to its fluent API. This builder is used in Jackson message converters and views to instantiate default ObjectMapper and XmlMapper. This commit also add a createXmlMapper prope...
spring-web/src/test/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverterTests.java
@@ -253,8 +253,8 @@ public void jsonView() throws Exception { String result = outputMessage.getBodyAsString(Charset.forName("UTF-8")); assertThat(result, containsString("\"withView1\":\"with\"")); - assertThat(result, containsString("\"withoutView\":\"without\"")); assertThat(result, not(containsString("\"w...
true
Other
spring-projects
spring-framework
4e24d66ff70b8dc6e2184b2f723a57e387da523d.json
Create a builder for Jackson ObjectMapper Jackson2ObjectMapperBuilder now allows to create ObjectMapper and XmlMapper instances easily thanks to its fluent API. This builder is used in Jackson message converters and views to instantiate default ObjectMapper and XmlMapper. This commit also add a createXmlMapper prope...
spring-web/src/test/java/org/springframework/http/converter/xml/MappingJackson2XmlHttpMessageConverterTests.java
@@ -22,6 +22,7 @@ import java.nio.charset.Charset; import com.fasterxml.jackson.annotation.JsonView; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; import static org.junit.Assert.assertEquals; @@ -123,8 +124,14 @@ public void j...
true
Other
spring-projects
spring-framework
4e24d66ff70b8dc6e2184b2f723a57e387da523d.json
Create a builder for Jackson ObjectMapper Jackson2ObjectMapperBuilder now allows to create ObjectMapper and XmlMapper instances easily thanks to its fluent API. This builder is used in Jackson message converters and views to instantiate default ObjectMapper and XmlMapper. This commit also add a createXmlMapper prope...
spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/AbstractJackson2View.java
@@ -103,7 +103,7 @@ public final JsonEncoding getEncoding() { } /** - * Whether to use the default pretty printer when writing JSON. + * Whether to use the default pretty printer when writing the output. * This is a shortcut for setting up an {@code ObjectMapper} as follows: * <pre class="code"> * Obje...
true
Other
spring-projects
spring-framework
4e24d66ff70b8dc6e2184b2f723a57e387da523d.json
Create a builder for Jackson ObjectMapper Jackson2ObjectMapperBuilder now allows to create ObjectMapper and XmlMapper instances easily thanks to its fluent API. This builder is used in Jackson message converters and views to instantiate default ObjectMapper and XmlMapper. This commit also add a createXmlMapper prope...
spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java
@@ -30,6 +30,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.http.converter.json.MappingJacksonValue; import org.springframework.util.CollectionUtils; ...
true
Other
spring-projects
spring-framework
4e24d66ff70b8dc6e2184b2f723a57e387da523d.json
Create a builder for Jackson ObjectMapper Jackson2ObjectMapperBuilder now allows to create ObjectMapper and XmlMapper instances easily thanks to its fluent API. This builder is used in Jackson message converters and views to instantiate default ObjectMapper and XmlMapper. This commit also add a createXmlMapper prope...
spring-webmvc/src/main/java/org/springframework/web/servlet/view/xml/MappingJackson2XmlView.java
@@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonView; import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; import org.springframework.validation.BindingResult; import org.springframework.web.servlet.View; import org.spri...
true
Other
spring-projects
spring-framework
4e24d66ff70b8dc6e2184b2f723a57e387da523d.json
Create a builder for Jackson ObjectMapper Jackson2ObjectMapperBuilder now allows to create ObjectMapper and XmlMapper instances easily thanks to its fluent API. This builder is used in Jackson message converters and views to instantiate default ObjectMapper and XmlMapper. This commit also add a createXmlMapper prope...
spring-webmvc/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java
@@ -78,13 +78,13 @@ public void testMessageCodesResolver() { @Test public void testPathMatchingConfiguration() { - loadBeanDefinitions("mvc-config-path-matching.xml"); - RequestMappingHandlerMapping hm = appContext.getBean(RequestMappingHandlerMapping.class); - assertNotNull(hm); + loadBeanDefinition...
true
Other
spring-projects
spring-framework
4e24d66ff70b8dc6e2184b2f723a57e387da523d.json
Create a builder for Jackson ObjectMapper Jackson2ObjectMapperBuilder now allows to create ObjectMapper and XmlMapper instances easily thanks to its fluent API. This builder is used in Jackson message converters and views to instantiate default ObjectMapper and XmlMapper. This commit also add a createXmlMapper prope...
spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java
@@ -16,6 +16,10 @@ package org.springframework.web.servlet.config; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; import static org.jun...
true
Other
spring-projects
spring-framework
4e24d66ff70b8dc6e2184b2f723a57e387da523d.json
Create a builder for Jackson ObjectMapper Jackson2ObjectMapperBuilder now allows to create ObjectMapper and XmlMapper instances easily thanks to its fluent API. This builder is used in Jackson message converters and views to instantiate default ObjectMapper and XmlMapper. This commit also add a createXmlMapper prope...
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java
@@ -16,14 +16,15 @@ package org.springframework.web.servlet.config.annotation; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; +import com.fasterxml.jackson.databind.DeserializationFeature; import java.util.Arrays; import...
true
Other
spring-projects
spring-framework
4e24d66ff70b8dc6e2184b2f723a57e387da523d.json
Create a builder for Jackson ObjectMapper Jackson2ObjectMapperBuilder now allows to create ObjectMapper and XmlMapper instances easily thanks to its fluent API. This builder is used in Jackson message converters and views to instantiate default ObjectMapper and XmlMapper. This commit also add a createXmlMapper prope...
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java
@@ -21,6 +21,10 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; im...
true
Other
spring-projects
spring-framework
de1a41ac275da81ead9dfd241c6ca1266adab75a.json
Fix issue with RequestBody(required=true) Issue: SPR-11828
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.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. @@ -153,41 +153,45 @@ protected <T> Object read...
true
Other
spring-projects
spring-framework
de1a41ac275da81ead9dfd241c6ca1266adab75a.json
Fix issue with RequestBody(required=true) Issue: SPR-11828
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorMockTests.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ import java.io.IOException...
true
Other
spring-projects
spring-framework
de1a41ac275da81ead9dfd241c6ca1266adab75a.json
Fix issue with RequestBody(required=true) Issue: SPR-11828
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.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 org.springframework.h...
true