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
8e38b7ede6756feda759db28f876f70d484e4320.json
Add section on web security Issue: SPR-6125
src/asciidoc/index.adoc
@@ -31703,6 +31703,24 @@ or in a JSP: ---- +[[mvc-web-security]] +=== Web Security + +The http://projects.spring.io/spring-security/[Spring Security] project provides features +to protect web applications from malicious exploits. Check out the reference documentation in the sections on +http://docs.spring.io/sprin...
false
Other
spring-projects
spring-framework
d917b8a92343f43feee27b21395e7398f25a012a.json
Extract base interface for VersionStrategy This change splits out a base VersionPathStrategy interface that focuses on where in the URL path the version is embedded.
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AbstractVersionStrategy.java
@@ -6,6 +6,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.util.Assert; import org.springframework.util.StringUtils; /** @@ -20,73 +21,106 @@ * version string. * * @author Brian Clozel + * @author Rossen Stoyanchev * @since 4.1 */ ...
true
Other
spring-projects
spring-framework
d917b8a92343f43feee27b21395e7398f25a012a.json
Extract base interface for VersionStrategy This change splits out a base VersionPathStrategy interface that focuses on where in the URL path the version is embedded.
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ContentBasedVersionStrategy.java
@@ -1,81 +0,0 @@ -/* - * 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
d917b8a92343f43feee27b21395e7398f25a012a.json
Extract base interface for VersionStrategy This change splits out a base VersionPathStrategy interface that focuses on where in the URL path the version is embedded.
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ContentVersionStrategy.java
@@ -0,0 +1,53 @@ +/* + * 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
d917b8a92343f43feee27b21395e7398f25a012a.json
Extract base interface for VersionStrategy This change splits out a base VersionPathStrategy interface that focuses on where in the URL path the version is embedded.
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/FixedVersionStrategy.java
@@ -15,28 +15,18 @@ */ package org.springframework.web.servlet.resource; -import java.util.List; -import java.util.concurrent.Callable; - import org.springframework.core.io.Resource; -import org.springframework.util.Assert; /** - * A {@code VersionStrategy} that handles unique, static, application-wide version...
true
Other
spring-projects
spring-framework
d917b8a92343f43feee27b21395e7398f25a012a.json
Extract base interface for VersionStrategy This change splits out a base VersionPathStrategy interface that focuses on where in the URL path the version is embedded.
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionPathStrategy.java
@@ -0,0 +1,51 @@ +/* + * 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
d917b8a92343f43feee27b21395e7398f25a012a.json
Extract base interface for VersionStrategy This change splits out a base VersionPathStrategy interface that focuses on where in the URL path the version is embedded.
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java
@@ -50,6 +50,7 @@ public class VersionResourceResolver extends AbstractResourceResolver { private Map<String, VersionStrategy> versionStrategyMap = Collections.emptyMap(); + /** * Set a Map with URL paths as keys and {@code VersionStrategy} * as values. @@ -59,10 +60,11 @@ public class VersionResourceReso...
true
Other
spring-projects
spring-framework
d917b8a92343f43feee27b21395e7398f25a012a.json
Extract base interface for VersionStrategy This change splits out a base VersionPathStrategy interface that focuses on where in the URL path the version is embedded.
spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionStrategy.java
@@ -15,50 +15,24 @@ */ package org.springframework.web.servlet.resource; -import java.util.List; - import org.springframework.core.io.Resource; /** - * A strategy for handling version strings in request paths when resolving - * static resources with a {@link VersionResourceResolver}. + * An extension of {@link...
true
Other
spring-projects
spring-framework
d917b8a92343f43feee27b21395e7398f25a012a.json
Extract base interface for VersionStrategy This change splits out a base VersionPathStrategy interface that focuses on where in the URL path the version is embedded.
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/AppCacheManifestTransformerTests.java
@@ -78,7 +78,7 @@ public void transformManifest() throws Exception { VersionResourceResolver versionResourceResolver = new VersionResourceResolver(); versionResourceResolver - .setVersionStrategyMap(Collections.singletonMap("/**", new ContentBasedVersionStrategy())); + .setStrategyMap(Collections.singleto...
true
Other
spring-projects
spring-framework
d917b8a92343f43feee27b21395e7398f25a012a.json
Extract base interface for VersionStrategy This change splits out a base VersionPathStrategy interface that focuses on where in the URL path the version is embedded.
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ContentBasedVersionStrategyTests.java
@@ -15,10 +15,7 @@ */ package org.springframework.web.servlet.resource; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; -import java.util.List; import org.junit.Before; import org.junit.Test; @@ -31,65 +28,50 @@ import static org.junit.Assert.*; /** - * Unit tests for ...
true
Other
spring-projects
spring-framework
d917b8a92343f43feee27b21395e7398f25a012a.json
Extract base interface for VersionStrategy This change splits out a base VersionPathStrategy interface that focuses on where in the URL path the version is embedded.
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/CssLinkResourceTransformerTests.java
@@ -50,9 +50,9 @@ public class CssLinkResourceTransformerTests { @Before public void setUp() { Map<String, VersionStrategy> versionStrategyMap = new HashMap<>(); - versionStrategyMap.put("/**", new ContentBasedVersionStrategy()); + versionStrategyMap.put("/**", new ContentVersionStrategy()); VersionResource...
true
Other
spring-projects
spring-framework
d917b8a92343f43feee27b21395e7398f25a012a.json
Extract base interface for VersionStrategy This change splits out a base VersionPathStrategy interface that focuses on where in the URL path the version is embedded.
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/FixedVersionStrategyTests.java
@@ -15,16 +15,11 @@ */ package org.springframework.web.servlet.resource; -import java.util.Collections; -import java.util.concurrent.Callable; - import org.junit.Before; import org.junit.Test; import static org.junit.Assert.*; -import org.springframework.core.io.Resource; - /** * Unit tests for {@link or...
true
Other
spring-projects
spring-framework
d917b8a92343f43feee27b21395e7398f25a012a.json
Extract base interface for VersionStrategy This change splits out a base VersionPathStrategy interface that focuses on where in the URL path the version is embedded.
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/GzipResourceResolverTests.java
@@ -71,9 +71,9 @@ public static void createGzippedResources() throws IOException { @Before public void setUp() { Map<String, VersionStrategy> versionStrategyMap = new HashMap<>(); - versionStrategyMap.put("/**", new ContentBasedVersionStrategy()); + versionStrategyMap.put("/**", new ContentVersionStrategy()); ...
true
Other
spring-projects
spring-framework
d917b8a92343f43feee27b21395e7398f25a012a.json
Extract base interface for VersionStrategy This change splits out a base VersionPathStrategy interface that focuses on where in the URL path the version is embedded.
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderJavaConfigTests.java
@@ -115,9 +115,9 @@ static class WebConfig extends WebMvcConfigurationSupport { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { Map<String, VersionStrategy> versionStrategyMap = new HashMap<>(); - versionStrategyMap.put("/**", new ContentBasedVersionStrategy()); + versionStra...
true
Other
spring-projects
spring-framework
d917b8a92343f43feee27b21395e7398f25a012a.json
Extract base interface for VersionStrategy This change splits out a base VersionPathStrategy interface that focuses on where in the URL path the version is embedded.
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/ResourceUrlProviderTests.java
@@ -68,9 +68,9 @@ public void getStaticResourceUrl() { @Test public void getFingerprintedResourceUrl() { Map<String, VersionStrategy> versionStrategyMap = new HashMap<>(); - versionStrategyMap.put("/**", new ContentBasedVersionStrategy()); + versionStrategyMap.put("/**", new ContentVersionStrategy()); Versi...
true
Other
spring-projects
spring-framework
d917b8a92343f43feee27b21395e7398f25a012a.json
Extract base interface for VersionStrategy This change splits out a base VersionPathStrategy interface that focuses on where in the URL path the version is embedded.
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/VersionResourceResolverTests.java
@@ -40,7 +40,7 @@ public class VersionResourceResolverTests { private List<Resource> locations; - private VersionResourceResolver versionResourceResolver; + private VersionResourceResolver resolver; private ResourceResolverChain chain; @@ -49,126 +49,118 @@ public class VersionResourceResolverTests { @B...
true
Other
spring-projects
spring-framework
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
build.gradle
@@ -929,6 +929,7 @@ project("spring-test") { optional("javax.portlet:portlet-api:2.0") optional("javax.el:javax.el-api:2.2.5") optional("org.aspectj:aspectjweaver:${aspectjVersion}") + optional("org.codehaus.groovy:groovy-all:${groovyVersion}") optional("org.hamcrest:hamcrest-core:1.3") optional("com.ja...
true
Other
spring-projects
spring-framework
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/main/java/org/springframework/test/context/ContextConfiguration.java
@@ -27,48 +27,52 @@ import org.springframework.context.ConfigurableApplicationContext; /** - * {@code @ContextConfiguration} defines class-level metadata that is - * used to determine how to load and configure an - * {@link org.springframework.context.ApplicationContext ApplicationContext} - * for integration tests...
true
Other
spring-projects
spring-framework
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/main/java/org/springframework/test/context/support/AbstractContextLoader.java
@@ -55,6 +55,7 @@ * @author Juergen Hoeller * @since 2.5 * @see #generateDefaultLocations + * @see #getResourceSuffixes * @see #modifyLocations */ public abstract class AbstractContextLoader implements SmartContextLoader { @@ -144,14 +145,14 @@ protected void prepareContext(ConfigurableApplicationContext con...
true
Other
spring-projects
spring-framework
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/main/java/org/springframework/test/context/support/AbstractDelegatingSmartContextLoader.java
@@ -35,26 +35,33 @@ * {@code AbstractDelegatingSmartContextLoader} serves as an abstract base class * for implementations of the {@link SmartContextLoader} SPI that delegate to a * set of <em>candidate</em> SmartContextLoaders (i.e., one that supports XML - * configuration files and one that supports annotated cl...
true
Other
spring-projects
spring-framework
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
@@ -49,6 +49,8 @@ * @see #processContextConfiguration(ContextConfigurationAttributes) * @see #detectDefaultConfigurationClasses(Class) * @see #loadBeanDefinitions(GenericApplicationContext, MergedContextConfiguration) + * @see GenericXmlContextLoader + * @see GenericGroovyXmlContextLoader */ public class Annot...
true
Other
spring-projects
spring-framework
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.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. @@ -16,25 +16,55 @@ package org.springframew...
true
Other
spring-projects
spring-framework
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/main/java/org/springframework/test/context/support/GenericGroovyXmlContextLoader.java
@@ -0,0 +1,69 @@ +/* + * 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
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/main/java/org/springframework/test/context/support/GenericXmlContextLoader.java
@@ -26,23 +26,29 @@ * Concrete implementation of {@link AbstractGenericContextLoader} that reads * bean definitions from XML resources. * + * <p>Default resource locations are detected using the suffix + * {@code "-context.xml"}. + * * @author Sam Brannen * @since 2.5 + * @see XmlBeanDefinitionReader + * @see...
true
Other
spring-projects
spring-framework
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/main/java/org/springframework/test/context/web/AnnotationConfigWebContextLoader.java
@@ -50,6 +50,8 @@ * @see #processContextConfiguration(ContextConfigurationAttributes) * @see #detectDefaultConfigurationClasses(Class) * @see #loadBeanDefinitions(GenericWebApplicationContext, WebMergedContextConfiguration) + * @see GenericXmlWebContextLoader + * @see GenericGroovyXmlWebContextLoader */ public...
true
Other
spring-projects
spring-framework
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/main/java/org/springframework/test/context/web/GenericGroovyXmlWebContextLoader.java
@@ -0,0 +1,69 @@ +/* + * 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
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/main/java/org/springframework/test/context/web/GenericXmlWebContextLoader.java
@@ -25,8 +25,13 @@ * Concrete implementation of {@link AbstractGenericWebContextLoader} that loads * bean definitions from XML resources. * + * <p>Default resource locations are detected using the suffix + * {@code "-context.xml"}. + * * @author Sam Brannen * @since 3.2 + * @see GenericGroovyXmlWebContextLoad...
true
Other
spring-projects
spring-framework
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/main/java/org/springframework/test/context/web/WebDelegatingSmartContextLoader.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. @@ -16,13 +16,16 @@ package org.springframew...
true
Other
spring-projects
spring-framework
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/test/java/org/springframework/test/context/groovy/AbsolutePathGroovySpringContextTests.java
@@ -0,0 +1,35 @@ +/* + * 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
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/test/java/org/springframework/test/context/groovy/DefaultScriptDetectionGroovySpringContextTests.java
@@ -0,0 +1,63 @@ +/* + * 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
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/test/java/org/springframework/test/context/groovy/DefaultScriptDetectionGroovySpringContextTestsContext.groovy
@@ -0,0 +1,40 @@ +/* + * 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
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/test/java/org/springframework/test/context/groovy/DefaultScriptDetectionXmlSupersedesGroovySpringContextTests-context.xml
@@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean id="foo" cl...
true
Other
spring-projects
spring-framework
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/test/java/org/springframework/test/context/groovy/DefaultScriptDetectionXmlSupersedesGroovySpringContextTests.java
@@ -0,0 +1,47 @@ +/* + * 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
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/test/java/org/springframework/test/context/groovy/DefaultScriptDetectionXmlSupersedesGroovySpringContextTestsContext.groovy
@@ -0,0 +1,30 @@ +/* + * 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
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/test/java/org/springframework/test/context/groovy/GroovyControlGroupTests.java
@@ -0,0 +1,63 @@ +/* + * 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
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/test/java/org/springframework/test/context/groovy/GroovySpringContextTests.java
@@ -0,0 +1,122 @@ +/* + * 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
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/test/java/org/springframework/test/context/groovy/MixedXmlAndGroovySpringContextTests.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
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/test/java/org/springframework/test/context/groovy/RelativePathGroovySpringContextTests.java
@@ -0,0 +1,35 @@ +/* + * 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
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/test/java/org/springframework/test/context/groovy/context.groovy
@@ -0,0 +1,40 @@ +/* + * 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
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/test/java/org/springframework/test/context/groovy/contextA.groovy
@@ -0,0 +1,30 @@ +/* + * 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
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/test/java/org/springframework/test/context/groovy/contextB.xml
@@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + + <bean id="employ...
true
Other
spring-projects
spring-framework
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/test/java/org/springframework/test/context/web/BasicGroovyWacTests.java
@@ -0,0 +1,38 @@ +/* + * 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
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/test/java/org/springframework/test/context/web/BasicGroovyWacTestsContext.groovy
@@ -0,0 +1,3 @@ +package org.springframework.test.context.web + +beans { foo String, 'Groovy Foo' } \ No newline at end of file
true
Other
spring-projects
spring-framework
35c372f200258f74721a82441a03313ee21fb315.json
Support Groovy scripts in the TCF Spring Framework 4.0 introduced first-class support for a Groovy-based DSL for defining the beans for an ApplicationContext. However, prior to this commit, the Spring TestContext Framework (TCF) did not provide any out-of-the-box support for using Groovy scripts as path-based resource...
spring-test/src/test/resources/log4j.properties
@@ -1,6 +1,6 @@ log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n +log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%-5p] [%c] - %m%n log4j.appender.file...
true
Other
spring-projects
spring-framework
8d8d47fb4e36a667c02f79c1936c882b60c4584e.json
Fix compiler warning
spring-context-support/src/test/java/org/springframework/cache/jcache/support/TestableCacheKeyGenerator.java
@@ -23,6 +23,7 @@ public GeneratedCacheKey generateCacheKey(CacheKeyInvocationContext<? extends An } + @SuppressWarnings("serial") private static class SimpleGeneratedCacheKey extends SimpleKey implements GeneratedCacheKey { public SimpleGeneratedCacheKey(Object... elements) {
false
Other
spring-projects
spring-framework
e849bc3e9029b6e572dc3b501c5779ea1da3b726.json
Fix potential NPE This commit fixes a potential NPE when determining the priority of a bean instance in case multiple candidates exist and no bean was marked as @Primary Issue: SPR-12024
spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
@@ -1205,7 +1205,7 @@ else if (candidatePriority < highestPriority) { * Return whether the bean definition for the given bean name has been * marked as a primary bean. * @param beanName the name of the bean - * @param beanInstance the corresponding bean instance + * @param beanInstance the corresponding bean...
true
Other
spring-projects
spring-framework
e849bc3e9029b6e572dc3b501c5779ea1da3b726.json
Fix potential NPE This commit fixes a potential NPE when determining the priority of a bean instance in case multiple candidates exist and no bean was marked as @Primary Issue: SPR-12024
spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java
@@ -1403,6 +1403,17 @@ public void testGetBeanByTypeWithMultiplePriority() throws Exception { lbf.getBean(TestBean.class); } + @Test + public void testGetBeanByTypeWithPriorityAndNullInstance() throws Exception { + DefaultListableBeanFactory lbf = new DefaultListableBeanFactory(); + RootBeanDefinition bd1 = ne...
true
Other
spring-projects
spring-framework
73267d75230dfb90097133017f203ca15ef813db.json
Ensure Undertow 1.1 compatibility Issue: SPR-11914
spring-websocket/src/main/java/org/springframework/web/socket/server/standard/UndertowRequestUpgradeStrategy.java
@@ -16,9 +16,12 @@ package org.springframework.web.socket.server.standard; +import java.lang.reflect.Constructor; import java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import javax.servlet.http.HttpServletRequest; i...
false
Other
spring-projects
spring-framework
3013558e3d3166695907f7a9293b0726b68f6109.json
Update Javadoc for SqlScriptsTestExecutionListener
spring-test/src/main/java/org/springframework/test/context/jdbc/SqlScriptsTestExecutionListener.java
@@ -55,20 +55,25 @@ * {@linkplain java.lang.reflect.Method test method}, depending on the configured * value of the {@link Sql#executionPhase executionPhase} flag. * - * <p>Scripts will be executed either within an existing Spring-managed transaction - * or within an isolated transaction, depending on the configu...
false
Other
spring-projects
spring-framework
b16e6cc44e2fbc92ad7c648b052e4f11d2b3f674.json
Improve documentation for tx support in the TCF Overhauled class-level Javadoc for TransactionalTestExecutionListener: - Reorganized content. - Added headings to paragraphs. - Documented TestTransaction support. Issue: SPR-11941
spring-test/src/main/java/org/springframework/test/context/transaction/TestTransaction.java
@@ -23,7 +23,8 @@ * {@code TestTransaction} provides a collection of static utility methods for * programmatic interaction with <em>test-managed transactions</em>. * - * <p>Test-managed transactions are transactions that are managed by the <em>Spring TestContext Framework</em>. + * <p>Test-managed transactions ar...
true
Other
spring-projects
spring-framework
b16e6cc44e2fbc92ad7c648b052e4f11d2b3f674.json
Improve documentation for tx support in the TCF Overhauled class-level Javadoc for TransactionalTestExecutionListener: - Reorganized content. - Added headings to paragraphs. - Documented TestTransaction support. Issue: SPR-11941
spring-test/src/main/java/org/springframework/test/context/transaction/TransactionalTestExecutionListener.java
@@ -28,7 +28,6 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.BeanFactoryAnnotationUtils; -import org.springframework.context.ApplicationContext; import org.springframework.core.annotation.AnnotatedElement...
true
Other
spring-projects
spring-framework
a40e42479c36859009b4561f98fdfab0eafdd679.json
Fix SpEL handling of function reference These changes provide more robust handling of function reference compilation in SpEL expressions. Prior to this change the isCompilable check was not performing enough visibility checks on the proposed target function, causing bytecode to be generated that would lead to an Illeg...
spring-expression/src/main/java/org/springframework/expression/spel/ast/FunctionReference.java
@@ -53,6 +53,8 @@ public class FunctionReference extends SpelNodeImpl { // Captures the most recently used method for the function invocation *if* the method // can safely be used for compilation (i.e. no argument conversion is going on) private Method method; + + private boolean argumentConversionOccurred; ...
true
Other
spring-projects
spring-framework
a40e42479c36859009b4561f98fdfab0eafdd679.json
Fix SpEL handling of function reference These changes provide more robust handling of function reference compilation in SpEL expressions. Prior to this change the isCompilable check was not performing enough visibility checks on the proposed target function, causing bytecode to be generated that would lead to an Illeg...
spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectionHelper.java
@@ -25,7 +25,6 @@ import org.springframework.expression.EvaluationException; import org.springframework.expression.TypeConverter; import org.springframework.expression.spel.SpelEvaluationException; -import org.springframework.expression.spel.SpelMessage; import org.springframework.util.Assert; import org.springfra...
true
Other
spring-projects
spring-framework
a40e42479c36859009b4561f98fdfab0eafdd679.json
Fix SpEL handling of function reference These changes provide more robust handling of function reference compilation in SpEL expressions. Prior to this change the isCompilable check was not performing enough visibility checks on the proposed target function, causing bytecode to be generated that would lead to an Illeg...
spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
@@ -706,6 +706,49 @@ public static String join(String...strings) { return buf.toString(); } + @Test + public void compiledExpressionShouldWorkWhenUsingCustomFunctionWithVarargs() throws Exception { + StandardEvaluationContext context = null; + + // Here the target method takes Object... and we are passing a s...
true
Other
spring-projects
spring-framework
a40e42479c36859009b4561f98fdfab0eafdd679.json
Fix SpEL handling of function reference These changes provide more robust handling of function reference compilation in SpEL expressions. Prior to this change the isCompilable check was not performing enough visibility checks on the proposed target function, causing bytecode to be generated that would lead to an Illeg...
spring-expression/src/test/java/org/springframework/expression/spel/support/ReflectionHelperTests.java
@@ -30,8 +30,6 @@ import org.springframework.expression.PropertyAccessor; import org.springframework.expression.TypedValue; import org.springframework.expression.spel.AbstractExpressionTests; -import org.springframework.expression.spel.SpelEvaluationException; -import org.springframework.expression.spel.SpelMessage;...
true
Other
spring-projects
spring-framework
a0c210457bda606eba58f367678bdefc69d5cd15.json
Use response encoding when escaping HTML With SPR-9293, it is now possible to HTML escape text while taking into account the current response encoding. When using UTF-* encodings, only XML markup significant characters are escaped, since UTF-* natively support those characters. This commit adds a new servlet context ...
spring-web/src/main/java/org/springframework/web/util/WebUtils.java
@@ -106,6 +106,12 @@ public abstract class WebUtils { */ public static final String HTML_ESCAPE_CONTEXT_PARAM = "defaultHtmlEscape"; + /** + * Use of response encoding for HTML escaping parameter at the servlet context level + * (i.e. a context-param in {@code web.xml}): "responseEncodedHtmlEscape". + */ + pu...
true
Other
spring-projects
spring-framework
a0c210457bda606eba58f367678bdefc69d5cd15.json
Use response encoding when escaping HTML With SPR-9293, it is now possible to HTML escape text while taking into account the current response encoding. When using UTF-* encodings, only XML markup significant characters are escaped, since UTF-* natively support those characters. This commit adds a new servlet context ...
spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.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. @@ -115,6 +115,8 @@ public class RequestContext...
true
Other
spring-projects
spring-framework
a0c210457bda606eba58f367678bdefc69d5cd15.json
Use response encoding when escaping HTML With SPR-9293, it is now possible to HTML escape text while taking into account the current response encoding. When using UTF-* encodings, only XML markup significant characters are escaped, since UTF-* natively support those characters. This commit adds a new servlet context ...
spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EscapeBodyTag.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. @@ -21,7 +21,6 @@ import javax.servlet.jsp.tag...
true
Other
spring-projects
spring-framework
a0c210457bda606eba58f367678bdefc69d5cd15.json
Use response encoding when escaping HTML With SPR-9293, it is now possible to HTML escape text while taking into account the current response encoding. When using UTF-* encodings, only XML markup significant characters are escaped, since UTF-* natively support those characters. This commit adds a new servlet context ...
spring-webmvc/src/main/java/org/springframework/web/servlet/tags/EvalTag.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,7 +34,6 @@ import org.springframework.e...
true
Other
spring-projects
spring-framework
a0c210457bda606eba58f367678bdefc69d5cd15.json
Use response encoding when escaping HTML With SPR-9293, it is now possible to HTML escape text while taking into account the current response encoding. When using UTF-* encodings, only XML markup significant characters are escaped, since UTF-* natively support those characters. This commit adds a new servlet context ...
spring-webmvc/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.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,8 @@ import javax.servlet.jsp.J...
true
Other
spring-projects
spring-framework
a0c210457bda606eba58f367678bdefc69d5cd15.json
Use response encoding when escaping HTML With SPR-9293, it is now possible to HTML escape text while taking into account the current response encoding. When using UTF-* encodings, only XML markup significant characters are escaped, since UTF-* natively support those characters. This commit adds a new servlet context ...
spring-webmvc/src/main/java/org/springframework/web/servlet/tags/MessageTag.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,6 @@ import org.springframework.c...
true
Other
spring-projects
spring-framework
a0c210457bda606eba58f367678bdefc69d5cd15.json
Use response encoding when escaping HTML With SPR-9293, it is now possible to HTML escape text while taking into account the current response encoding. When using UTF-* encodings, only XML markup significant characters are escaped, since UTF-* natively support those characters. This commit adds a new servlet context ...
spring-webmvc/src/main/java/org/springframework/web/servlet/tags/TransformTag.java
@@ -105,7 +105,7 @@ protected final int doStartTagInternal() throws JspException { // Else, just do a toString. result = this.value.toString(); } - result = isHtmlEscape() ? HtmlUtils.htmlEscape(result) : result; + result = htmlEscape(result); if (this.var != null) { pageContext.setAttribute(...
true
Other
spring-projects
spring-framework
a0c210457bda606eba58f367678bdefc69d5cd15.json
Use response encoding when escaping HTML With SPR-9293, it is now possible to HTML escape text while taking into account the current response encoding. When using UTF-* encodings, only XML markup significant characters are escaped, since UTF-* natively support those characters. This commit adds a new servlet context ...
spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
@@ -226,7 +226,7 @@ private String createUrl() throws JspException { } // HTML and/or JavaScript escape, if demanded. - urlStr = isHtmlEscape() ? HtmlUtils.htmlEscape(urlStr) : urlStr; + urlStr = htmlEscape(urlStr); urlStr = this.javaScriptEscape ? JavaScriptUtils.javaScriptEscape(urlStr) : urlStr; re...
true
Other
spring-projects
spring-framework
a0c210457bda606eba58f367678bdefc69d5cd15.json
Use response encoding when escaping HTML With SPR-9293, it is now possible to HTML escape text while taking into account the current response encoding. When using UTF-* encodings, only XML markup significant characters are escaped, since UTF-* natively support those characters. This commit adds a new servlet context ...
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,6 +29,7 @@ import org.springframework.w...
true
Other
spring-projects
spring-framework
d5eb6694163dbe3202114a0a86f63435ccedf176.json
Add mention of java.util.Optional in @MVC Issue: SPR-12370
spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMapping.java
@@ -160,6 +160,12 @@ * context path, and the literal part of the servlet mapping. * </ul> * + * <p><strong>Note: </strong> JDK 1.8's {@code java.util.Optional} is supported + * as a method parameter type with annotations that provide a {@code required} + * attribute (e.g. {@code @RequestParam}, {@code @RequestHea...
true
Other
spring-projects
spring-framework
d5eb6694163dbe3202114a0a86f63435ccedf176.json
Add mention of java.util.Optional in @MVC Issue: SPR-12370
src/asciidoc/index.adoc
@@ -30887,6 +30887,13 @@ this working you have to reorder the parameters as follows: public String processSubmit(**@ModelAttribute("pet") Pet pet**, **BindingResult result**, Model model) { ... } ---- +[NOTE] +==== +JDK 1.8's `java.util.Optional` is supported as a method parameter type with annotations +that have ...
true
Other
spring-projects
spring-framework
d5bf6713edc9225023141d06692633a6f8b196d6.json
Add author attribution for htmlEscape methods Issue: SPR-9293
spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java
@@ -34,6 +34,7 @@ * * @author Juergen Hoeller * @author Martin Kersten + * @author Craig Andrews * @since 1.2.1 */ class HtmlCharacterEntityReferences {
true
Other
spring-projects
spring-framework
d5bf6713edc9225023141d06692633a6f8b196d6.json
Add author attribution for htmlEscape methods Issue: SPR-9293
spring-web/src/main/java/org/springframework/web/util/HtmlUtils.java
@@ -34,6 +34,7 @@ * * @author Juergen Hoeller * @author Martin Kersten + * @author Craig Andrews * @since 01.03.2003 * @see org.apache.commons.lang.StringEscapeUtils */
true
Other
spring-projects
spring-framework
df090235bb3b5693065b9e36e18150ee26c9d199.json
Update documentation for Map arguments Issue: SPR-12347
spring-web/src/main/java/org/springframework/web/bind/annotation/MatrixVariable.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. @@ -27,6 +27,15 @@ * name-value pair within a...
true
Other
spring-projects
spring-framework
df090235bb3b5693065b9e36e18150ee26c9d199.json
Update documentation for Map arguments Issue: SPR-12347
spring-web/src/main/java/org/springframework/web/bind/annotation/PathVariable.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. @@ -27,6 +27,10 @@ * variable. Supported for ...
true
Other
spring-projects
spring-framework
df090235bb3b5693065b9e36e18150ee26c9d199.json
Update documentation for Map arguments Issue: SPR-12347
spring-web/src/main/java/org/springframework/web/bind/annotation/RequestHeader.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. @@ -26,6 +26,11 @@ * Annotation which indicat...
true
Other
spring-projects
spring-framework
df090235bb3b5693065b9e36e18150ee26c9d199.json
Update documentation for Map arguments Issue: SPR-12347
src/asciidoc/index.adoc
@@ -30829,6 +30829,7 @@ multiple requests are allowed to access a session concurrently. <<mvc-ann-requestparam>>. * `@RequestHeader` annotated parameters for access to specific Servlet request HTTP headers. Parameter values are converted to the declared method argument type. + See <<mvc-ann-requestheader>>. * ...
true
Other
spring-projects
spring-framework
aae221cb159b9b0de4d4bc7cc0174d12a015b510.json
Fix SpEL compilation of constructor invocation The argument processing for compiling constructor references was very basic and this fix removes that and ensures the comprehensive logic written for method argument processing (under SPR-12328) is now used for both method and constructor argument handling. This fixes the...
spring-expression/src/main/java/org/springframework/expression/spel/CodeFlow.java
@@ -17,6 +17,7 @@ package org.springframework.expression.spel; import java.lang.reflect.Constructor; +import java.lang.reflect.Member; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; @@ -837,12 +838,23 @@ public static void insertNewArrayCode(MethodVisitor mv, int size, String...
true
Other
spring-projects
spring-framework
aae221cb159b9b0de4d4bc7cc0174d12a015b510.json
Fix SpEL compilation of constructor invocation The argument processing for compiling constructor references was very basic and this fix removes that and ensures the comprehensive logic written for method argument processing (under SPR-12328) is now used for both method and constructor argument handling. This fixes the...
spring-expression/src/main/java/org/springframework/expression/spel/ast/ConstructorReference.java
@@ -437,29 +437,21 @@ public boolean isCompilable() { ReflectiveConstructorExecutor executor = (ReflectiveConstructorExecutor) this.cachedExecutor; Constructor<?> constructor = executor.getConstructor(); - return (!constructor.isVarArgs() && Modifier.isPublic(constructor.getModifiers()) && + return (Modifier....
true
Other
spring-projects
spring-framework
aae221cb159b9b0de4d4bc7cc0174d12a015b510.json
Fix SpEL compilation of constructor invocation The argument processing for compiling constructor references was very basic and this fix removes that and ensures the comprehensive logic written for method argument processing (under SPR-12328) is now used for both method and constructor argument handling. This fixes the...
spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
@@ -295,6 +295,10 @@ public void generateCode(MethodVisitor mv, CodeFlow cf) { if (descriptor == null && !isStaticMethod) { cf.loadTarget(mv); } + + if (CodeFlow.isPrimitive(descriptor)) { + CodeFlow.insertBoxIfNecessary(mv, descriptor.charAt(0)); + } boolean itf = method.getDeclaringClass().isInte...
true
Other
spring-projects
spring-framework
aae221cb159b9b0de4d4bc7cc0174d12a015b510.json
Fix SpEL compilation of constructor invocation The argument processing for compiling constructor references was very basic and this fix removes that and ensures the comprehensive logic written for method argument processing (under SPR-12328) is now used for both method and constructor argument handling. This fixes the...
spring-expression/src/main/java/org/springframework/expression/spel/standard/SpelExpression.java
@@ -221,7 +221,8 @@ public Object getValue(EvaluationContext context) throws EvaluationException { Assert.notNull(context, "The EvaluationContext is required"); if (compiledAst!= null) { try { - Object result = this.compiledAst.getValue(null,context); + TypedValue contextRoot = context == null ? null : ...
true
Other
spring-projects
spring-framework
aae221cb159b9b0de4d4bc7cc0174d12a015b510.json
Fix SpEL compilation of constructor invocation The argument processing for compiling constructor references was very basic and this fix removes that and ensures the comprehensive logic written for method argument processing (under SPR-12328) is now used for both method and constructor argument handling. This fixes the...
spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java
@@ -38,6 +38,7 @@ import org.springframework.expression.spel.standard.SpelExpression; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; +import org.springframework.expression.spel.testdata.PersonInOtherPackage; i...
true
Other
spring-projects
spring-framework
aae221cb159b9b0de4d4bc7cc0174d12a015b510.json
Fix SpEL compilation of constructor invocation The argument processing for compiling constructor references was very basic and this fix removes that and ensures the comprehensive logic written for method argument processing (under SPR-12328) is now used for both method and constructor argument handling. This fixes the...
spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationPerformanceTests.java
@@ -156,7 +156,7 @@ public void stringConcatenation() throws Exception { Object o = expression.getValue(g); assertEquals("helloworld spring", o); - System.out.println("Performance check for SpEL expression: '{'abcde','ijklm'}[0].substring({1,3,4}[0],{1,3,4}[1])'"); + System.out.println("Performance check for ...
true
Other
spring-projects
spring-framework
aae221cb159b9b0de4d4bc7cc0174d12a015b510.json
Fix SpEL compilation of constructor invocation The argument processing for compiling constructor references was very basic and this fix removes that and ensures the comprehensive logic written for method argument processing (under SPR-12328) is now used for both method and constructor argument handling. This fixes the...
spring-expression/src/test/java/org/springframework/expression/spel/testdata/PersonInOtherPackage.java
@@ -0,0 +1,38 @@ +/* + * Copyright 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
c5e360d886931f761c2be5ff4b31d5df2042d415.json
Fix regression with raw ResponseEntity type This fix addresses a 4.1.1 regression where a raw ResponseEntity return value (used to return potentially a different kind of body) caused an exception. The regression came from the fact we now try to render a null body in order to give ResponseBodyAdvice a chance to substi...
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java
@@ -117,10 +117,6 @@ protected <T> void writeWithMessageConverters(T returnValue, MethodParameter ret throws IOException, HttpMediaTypeNotAcceptableException { Class<?> returnValueClass = getReturnValueType(returnValue, returnType); - if (returnValue == null && Void.class.equals(returnValueClass)) { - retur...
true
Other
spring-projects
spring-framework
c5e360d886931f761c2be5ff4b31d5df2042d415.json
Fix regression with raw ResponseEntity type This fix addresses a 4.1.1 regression where a raw ResponseEntity return value (used to return potentially a different kind of body) caused an exception. The regression came from the fact we now try to render a null body in order to give ResponseBodyAdvice a chance to substi...
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java
@@ -102,12 +102,17 @@ private Type getHttpEntityType(MethodParameter parameter) { Type parameterType = parameter.getGenericParameterType(); if (parameterType instanceof ParameterizedType) { ParameterizedType type = (ParameterizedType) parameterType; - if (type.getActualTypeArguments().length == 1) { - re...
true
Other
spring-projects
spring-framework
c5e360d886931f761c2be5ff4b31d5df2042d415.json
Fix regression with raw ResponseEntity type This fix addresses a 4.1.1 regression where a raw ResponseEntity return value (used to return potentially a different kind of body) caused an exception. The regression came from the fact we now try to render a null body in order to give ResponseBodyAdvice a chance to substi...
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java
@@ -194,9 +194,9 @@ public void handleReturnValue(Object returnValue, MethodParameter returnType, throws IOException, HttpMediaTypeNotAcceptableException { mavContainer.setRequestHandled(true); - if (returnValue != null || getAdviceChain().hasAdvice()) { - writeWithMessageConverters(returnValue, returnType,...
true
Other
spring-projects
spring-framework
c5e360d886931f761c2be5ff4b31d5df2042d415.json
Fix regression with raw ResponseEntity type This fix addresses a 4.1.1 regression where a raw ResponseEntity return value (used to return potentially a different kind of body) caused an exception. The regression came from the fact we now try to render a null body in order to give ResponseBodyAdvice a chance to substi...
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java
@@ -180,7 +180,7 @@ public void wrapConcurrentResult_ResponseEntity() throws Exception { List<HttpMessageConverter<?>> converters = new ArrayList<HttpMessageConverter<?>>(); converters.add(new StringHttpMessageConverter()); this.returnValueHandlers.addHandler(new HttpEntityMethodProcessor(converters)); - Serv...
true
Other
spring-projects
spring-framework
e82df99a22b7f511fc8e2c92a8a206e06d16bd62.json
Add SockJS client This change adds a new implementation of WebSocketClient that can connect to a SockJS server using one of the SockJS transports "websocket", "xhr_streaming", or "xhr". From a client perspective there is no implementation difference between "xhr_streaming" and "xhr". Just keep receiving and when the r...
build.gradle
@@ -670,6 +670,7 @@ project("spring-websocket") { exclude group: "javax.servlet", module: "javax.servlet" } optional("org.eclipse.jetty.websocket:websocket-client:${jettyVersion}") + optional("org.eclipse.jetty:jetty-client:${jettyVersion}") optional("io.undertow:undertow-core:1.0.15.Final") optional("...
true
Other
spring-projects
spring-framework
e82df99a22b7f511fc8e2c92a8a206e06d16bd62.json
Add SockJS client This change adds a new implementation of WebSocketClient that can connect to a SockJS server using one of the SockJS transports "websocket", "xhr_streaming", or "xhr". From a client perspective there is no implementation difference between "xhr_streaming" and "xhr". Just keep receiving and when the r...
spring-websocket/src/main/java/org/springframework/web/socket/CloseStatus.java
@@ -217,7 +217,7 @@ public boolean equalsCode(CloseStatus other) { @Override public String toString() { - return "CloseStatus [code=" + this.code + ", reason=" + this.reason + "]"; + return "CloseStatus[code=" + this.code + ", reason=" + this.reason + "]"; } }
true
Other
spring-projects
spring-framework
e82df99a22b7f511fc8e2c92a8a206e06d16bd62.json
Add SockJS client This change adds a new implementation of WebSocketClient that can connect to a SockJS server using one of the SockJS transports "websocket", "xhr_streaming", or "xhr". From a client perspective there is no implementation difference between "xhr_streaming" and "xhr". Just keep receiving and when the r...
spring-websocket/src/main/java/org/springframework/web/socket/client/AbstractWebSocketClient.java
@@ -73,10 +73,7 @@ public final ListenableFuture<WebSocketSession> doHandshake(WebSocketHandler web WebSocketHttpHeaders headers, URI uri) { Assert.notNull(webSocketHandler, "webSocketHandler must not be null"); - Assert.notNull(uri, "uri must not be null"); - - String scheme = uri.getScheme(); - Assert.isT...
true
Other
spring-projects
spring-framework
e82df99a22b7f511fc8e2c92a8a206e06d16bd62.json
Add SockJS client This change adds a new implementation of WebSocketClient that can connect to a SockJS server using one of the SockJS transports "websocket", "xhr_streaming", or "xhr". From a client perspective there is no implementation difference between "xhr_streaming" and "xhr". Just keep receiving and when the r...
spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java
@@ -194,7 +194,8 @@ public void handleMessageFromClient(WebSocketSession session, } } catch (Throwable ex) { - logger.error("Failed to parse WebSocket message to STOMP frame(s)", ex); + logger.error("Failed to parse WebSocket message to STOMP." + + "Sending STOMP ERROR to client, sessionId=" + session...
true
Other
spring-projects
spring-framework
e82df99a22b7f511fc8e2c92a8a206e06d16bd62.json
Add SockJS client This change adds a new implementation of WebSocketClient that can connect to a SockJS server using one of the SockJS transports "websocket", "xhr_streaming", or "xhr". From a client perspective there is no implementation difference between "xhr_streaming" and "xhr". Just keep receiving and when the r...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractClientSockJsSession.java
@@ -0,0 +1,338 @@ +/* + * 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
e82df99a22b7f511fc8e2c92a8a206e06d16bd62.json
Add SockJS client This change adds a new implementation of WebSocketClient that can connect to a SockJS server using one of the SockJS transports "websocket", "xhr_streaming", or "xhr". From a client perspective there is no implementation difference between "xhr_streaming" and "xhr". Just keep receiving and when the r...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/AbstractXhrTransport.java
@@ -0,0 +1,163 @@ +/* + * 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
e82df99a22b7f511fc8e2c92a8a206e06d16bd62.json
Add SockJS client This change adds a new implementation of WebSocketClient that can connect to a SockJS server using one of the SockJS transports "websocket", "xhr_streaming", or "xhr". From a client perspective there is no implementation difference between "xhr_streaming" and "xhr". Just keep receiving and when the r...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequest.java
@@ -0,0 +1,238 @@ +/* + * 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
e82df99a22b7f511fc8e2c92a8a206e06d16bd62.json
Add SockJS client This change adds a new implementation of WebSocketClient that can connect to a SockJS server using one of the SockJS transports "websocket", "xhr_streaming", or "xhr". From a client perspective there is no implementation difference between "xhr_streaming" and "xhr". Just keep receiving and when the r...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/InfoReceiver.java
@@ -0,0 +1,24 @@ +package org.springframework.web.socket.sockjs.client; + +import java.net.URI; + +/** + * A simple contract for executing the SockJS "Info" request before the SockJS + * session starts. The request is used to check server capabilities such as + * whether it permits use of the WebSocket transport. + * +...
true
Other
spring-projects
spring-framework
e82df99a22b7f511fc8e2c92a8a206e06d16bd62.json
Add SockJS client This change adds a new implementation of WebSocketClient that can connect to a SockJS server using one of the SockJS transports "websocket", "xhr_streaming", or "xhr". From a client perspective there is no implementation difference between "xhr_streaming" and "xhr". Just keep receiving and when the r...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/JettyXhrTransport.java
@@ -0,0 +1,252 @@ +/* + * 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
e82df99a22b7f511fc8e2c92a8a206e06d16bd62.json
Add SockJS client This change adds a new implementation of WebSocketClient that can connect to a SockJS server using one of the SockJS transports "websocket", "xhr_streaming", or "xhr". From a client perspective there is no implementation difference between "xhr_streaming" and "xhr". Just keep receiving and when the r...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/RestTemplateXhrTransport.java
@@ -0,0 +1,265 @@ +/* + * 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
e82df99a22b7f511fc8e2c92a8a206e06d16bd62.json
Add SockJS client This change adds a new implementation of WebSocketClient that can connect to a SockJS server using one of the SockJS transports "websocket", "xhr_streaming", or "xhr". From a client perspective there is no implementation difference between "xhr_streaming" and "xhr". Just keep receiving and when the r...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/SockJsClient.java
@@ -0,0 +1,259 @@ +/* + * 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
e82df99a22b7f511fc8e2c92a8a206e06d16bd62.json
Add SockJS client This change adds a new implementation of WebSocketClient that can connect to a SockJS server using one of the SockJS transports "websocket", "xhr_streaming", or "xhr". From a client perspective there is no implementation difference between "xhr_streaming" and "xhr". Just keep receiving and when the r...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/SockJsUrlInfo.java
@@ -0,0 +1,115 @@ +/* + * 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
e82df99a22b7f511fc8e2c92a8a206e06d16bd62.json
Add SockJS client This change adds a new implementation of WebSocketClient that can connect to a SockJS server using one of the SockJS transports "websocket", "xhr_streaming", or "xhr". From a client perspective there is no implementation difference between "xhr_streaming" and "xhr". Just keep receiving and when the r...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/Transport.java
@@ -0,0 +1,40 @@ +/* + * 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
e82df99a22b7f511fc8e2c92a8a206e06d16bd62.json
Add SockJS client This change adds a new implementation of WebSocketClient that can connect to a SockJS server using one of the SockJS transports "websocket", "xhr_streaming", or "xhr". From a client perspective there is no implementation difference between "xhr_streaming" and "xhr". Just keep receiving and when the r...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/TransportRequest.java
@@ -0,0 +1,53 @@ +package org.springframework.web.socket.sockjs.client; + +import org.springframework.http.HttpHeaders; +import org.springframework.web.socket.WebSocketSession; +import org.springframework.web.socket.sockjs.frame.SockJsMessageCodec; +import org.springframework.web.socket.sockjs.transport.TransportType; ...
true
Other
spring-projects
spring-framework
e82df99a22b7f511fc8e2c92a8a206e06d16bd62.json
Add SockJS client This change adds a new implementation of WebSocketClient that can connect to a SockJS server using one of the SockJS transports "websocket", "xhr_streaming", or "xhr". From a client perspective there is no implementation difference between "xhr_streaming" and "xhr". Just keep receiving and when the r...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/WebSocketClientSockJsSession.java
@@ -0,0 +1,136 @@ +/* + * 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
e82df99a22b7f511fc8e2c92a8a206e06d16bd62.json
Add SockJS client This change adds a new implementation of WebSocketClient that can connect to a SockJS server using one of the SockJS transports "websocket", "xhr_streaming", or "xhr". From a client perspective there is no implementation difference between "xhr_streaming" and "xhr". Just keep receiving and when the r...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/WebSocketTransport.java
@@ -0,0 +1,129 @@ +/* + * 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
e82df99a22b7f511fc8e2c92a8a206e06d16bd62.json
Add SockJS client This change adds a new implementation of WebSocketClient that can connect to a SockJS server using one of the SockJS transports "websocket", "xhr_streaming", or "xhr". From a client perspective there is no implementation difference between "xhr_streaming" and "xhr". Just keep receiving and when the r...
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/XhrClientSockJsSession.java
@@ -0,0 +1,111 @@ +/* + * 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