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 | 028e15faa33888673bfc7b55eaa65eb93f7bca0c.json | Add options to configure content negotiation
The MVC Java config and the MVC namespace now support options to
configure content negotiation. By default both support checking path
extensions first and the "Accept" header second. For path extensions
.json, .xml, .atom, and .rss are recognized out of the box if the
Jacks... | spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd | @@ -120,6 +120,22 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="content-negotiation-manager" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation source="java:org.springframework.web.accept.ContentNegotiationManager"><![CDATA[
+ The bean name of a ContentNegot... | true |
Other | spring-projects | spring-framework | 028e15faa33888673bfc7b55eaa65eb93f7bca0c.json | Add options to configure content negotiation
The MVC Java config and the MVC namespace now support options to
configure content negotiation. By default both support checking path
extensions first and the "Accept" header second. For path extensions
.json, .xml, .atom, and .rss are recognized out of the box if the
Jacks... | spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java | @@ -19,6 +19,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Method;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Locale;
@@ -38,6 +39,7 @@
import org.springframework.format.annotation.DateTimeFormat;
i... | true |
Other | spring-projects | spring-framework | 028e15faa33888673bfc7b55eaa65eb93f7bca0c.json | Add options to configure content negotiation
The MVC Java config and the MVC namespace now support options to
configure content negotiation. By default both support checking path
extensions first and the "Accept" header second. For path extensions
.json, .xml, .atom, and .rss are recognized out of the box if the
Jacks... | spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurerTests.java | @@ -0,0 +1,112 @@
+/*
+ * Copyright 2002-2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+... | true |
Other | spring-projects | spring-framework | 028e15faa33888673bfc7b55eaa65eb93f7bca0c.json | Add options to configure content negotiation
The MVC Java config and the MVC namespace now support options to
configure content negotiation. By default both support checking path
extensions first and the "Accept" header second. For path extensions
.json, .xml, .atom, and .rss are recognized out of the box if the
Jacks... | spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java | @@ -67,11 +67,13 @@ public void setUp() {
@Test
public void requestMappingHandlerAdapter() throws Exception {
Capture<List<HttpMessageConverter<?>>> converters = new Capture<List<HttpMessageConverter<?>>>();
+ Capture<ContentNegotiationConfigurer> contentNegotiationConfigurer = new Capture<ContentNegotiationCon... | true |
Other | spring-projects | spring-framework | 028e15faa33888673bfc7b55eaa65eb93f7bca0c.json | Add options to configure content negotiation
The MVC Java config and the MVC namespace now support options to
configure content negotiation. By default both support checking path
extensions first and the "Accept" header second. For path extensions
.json, .xml, .atom, and .rss are recognized out of the box if the
Jacks... | spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java | @@ -21,6 +21,7 @@
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
@@ -34,6 +35,7 @@
import org.springframework.core.io.FileSystemResourceLoader;
import org.springframework.format.FormatterRegi... | true |
Other | spring-projects | spring-framework | 028e15faa33888673bfc7b55eaa65eb93f7bca0c.json | Add options to configure content negotiation
The MVC Java config and the MVC namespace now support options to
configure content negotiation. By default both support checking path
extensions first and the "Accept" header second. For path extensions
.json, .xml, .atom, and .rss are recognized out of the box if the
Jacks... | spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-content-negotiation-manager.xml | @@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:mvc="http://www.springframework.org/schema/mvc"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.... | true |
Other | spring-projects | spring-framework | 028e15faa33888673bfc7b55eaa65eb93f7bca0c.json | Add options to configure content negotiation
The MVC Java config and the MVC namespace now support options to
configure content negotiation. By default both support checking path
extensions first and the "Accept" header second. For path extensions
.json, .xml, .atom, and .rss are recognized out of the box if the
Jacks... | src/dist/changelog.txt | @@ -26,6 +26,7 @@ Changes in version 3.2 M2 (2012-08-xx)
* use reflection to instantiate StandardServletAsyncWebRequest
* fix issue with forward before async request processing
* add exclude patterns for mapped interceptors in MVC namespace and MVC Java config
+* support content negotiation options in MVC namespace ... | true |
Other | spring-projects | spring-framework | 028e15faa33888673bfc7b55eaa65eb93f7bca0c.json | Add options to configure content negotiation
The MVC Java config and the MVC namespace now support options to
configure content negotiation. By default both support checking path
extensions first and the "Accept" header second. For path extensions
.json, .xml, .atom, and .rss are recognized out of the box if the
Jacks... | src/reference/docbook/mvc.xml | @@ -4478,6 +4478,54 @@ public class WebConfig extends WebMvcConfigurerAdapter {
</section>
+ <section id="mvc-config-content-negotiation">
+ <title>Configuring Content Negotiation</title>
+
+ <para>You can configure how Spring MVC determines requested media types for content negotiation purposes.
... | true |
Other | spring-projects | spring-framework | 92759ed1f881fcb1a92aa661d80c53a2827e67db.json | Add exclude patterns for mapped interceptors
Add the ability provide exclude patterns for mapped interceptors in the
MVC namespace and in the MVC Java config.
Issue: SPR-6570 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/InterceptorsBeanDefinitionParser.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
/**
* {@link org.springfra... | true |
Other | spring-projects | spring-framework | 92759ed1f881fcb1a92aa661d80c53a2827e67db.json | Add exclude patterns for mapped interceptors
Add the ability provide exclude patterns for mapped interceptors in the
MVC namespace and in the MVC Java config.
Issue: SPR-6570 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/InterceptorRegistration.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,22 +21,24 @@
import java.util.List;
... | true |
Other | spring-projects | spring-framework | 92759ed1f881fcb1a92aa661d80c53a2827e67db.json | Add exclude patterns for mapped interceptors
Add the ability provide exclude patterns for mapped interceptors in the
MVC namespace and in the MVC Java config.
Issue: SPR-6570 | spring-webmvc/src/main/java/org/springframework/web/servlet/handler/MappedInterceptor.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,38 +29,58 @@
* @since 3.0
*/
public... | true |
Other | spring-projects | spring-framework | 92759ed1f881fcb1a92aa661d80c53a2827e67db.json | Add exclude patterns for mapped interceptors
Add the ability provide exclude patterns for mapped interceptors in the
MVC namespace and in the MVC Java config.
Issue: SPR-6570 | spring-webmvc/src/main/resources/org/springframework/web/servlet/config/spring-mvc-3.2.xsd | @@ -273,6 +273,18 @@
</xsd:attribute>
</xsd:complexType>
</xsd:element>
+ <xsd:element name="exclude-mapping" minOccurs="0" maxOccurs="unbounded">
+ <xsd:complexType>
+ <xsd:attribute name="path" type="xsd:string" use="required">
+ <xsd:annotation>
+ <x... | true |
Other | spring-projects | spring-framework | 92759ed1f881fcb1a92aa661d80c53a2827e67db.json | Add exclude patterns for mapped interceptors
Add the ability provide exclude patterns for mapped interceptors in the
MVC namespace and in the MVC Java config.
Issue: SPR-6570 | spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java | @@ -80,7 +80,7 @@
public class MvcNamespaceTests {
private GenericWebApplicationContext appContext;
-
+
private TestController handler;
private HandlerMethod handlerMethod;
@@ -90,7 +90,7 @@ public void setUp() throws Exception {
appContext = new GenericWebApplicationContext();
appContext.setServletCo... | true |
Other | spring-projects | spring-framework | 92759ed1f881fcb1a92aa661d80c53a2827e67db.json | Add exclude patterns for mapped interceptors
Add the ability provide exclude patterns for mapped interceptors in the
MVC namespace and in the MVC Java config.
Issue: SPR-6570 | spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
import java.util.ArrayList... | true |
Other | spring-projects | spring-framework | 92759ed1f881fcb1a92aa661d80c53a2827e67db.json | Add exclude patterns for mapped interceptors
Add the ability provide exclude patterns for mapped interceptors in the
MVC namespace and in the MVC Java config.
Issue: SPR-6570 | spring-webmvc/src/test/java/org/springframework/web/servlet/handler/MappedInterceptorTests.java | @@ -0,0 +1,72 @@
+/*
+ * Copyright 2002-2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ ... | true |
Other | spring-projects | spring-framework | 92759ed1f881fcb1a92aa661d80c53a2827e67db.json | Add exclude patterns for mapped interceptors
Add the ability provide exclude patterns for mapped interceptors in the
MVC namespace and in the MVC Java config.
Issue: SPR-6570 | spring-webmvc/src/test/resources/org/springframework/web/servlet/config/mvc-config-interceptors.xml | @@ -3,7 +3,7 @@
xmlns:mvc="http://www.springframework.org/schema/mvc"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/mvc http://www.spring... | true |
Other | spring-projects | spring-framework | 92759ed1f881fcb1a92aa661d80c53a2827e67db.json | Add exclude patterns for mapped interceptors
Add the ability provide exclude patterns for mapped interceptors in the
MVC namespace and in the MVC Java config.
Issue: SPR-6570 | src/dist/changelog.txt | @@ -25,6 +25,7 @@ Changes in version 3.2 M2 (2012-08-xx)
* parameterize DeferredResult type
* use reflection to instantiate StandardServletAsyncWebRequest
* fix issue with forward before async request processing
+* add exclude patterns for mapped interceptors in MVC namespace and MVC Java config
Changes in vers... | true |
Other | spring-projects | spring-framework | 92759ed1f881fcb1a92aa661d80c53a2827e67db.json | Add exclude patterns for mapped interceptors
Add the ability provide exclude patterns for mapped interceptors in the
MVC namespace and in the MVC Java config.
Issue: SPR-6570 | src/reference/docbook/mvc.xml | @@ -4453,7 +4453,8 @@ public class WebConfig extends WebMvcConfigurerAdapter {
@Override
public void addInterceptors(InterceptorRegistry registry) {
- registry.addInterceptor(new LocalInterceptor());
+ registry.addInterceptor(new LocaleInterceptor());
+ registry.addInterceptor(new ThemeIntercepto... | true |
Other | spring-projects | spring-framework | 5a365074c2bddb3e4517ec5eceb39d4e6ca85b56.json | Fix issue with failing test from previous commit
Issue: SPR-9611 | spring-orm/src/main/java/org/springframework/orm/hibernate3/support/OpenSessionInViewFilter.java | @@ -217,7 +217,7 @@ protected void doFilterInternal(
closeSession(sessionHolder.getSession(), sessionFactory);
}
else {
- if (!chain.pop()) {
+ if (chain.isAsyncStarted()) {
throw new IllegalStateException("Deferred close is not supported with async requests.");
}
// deferred ... | false |
Other | spring-projects | spring-framework | 33a3681975751692ef2937f058fb5eed4fb343e3.json | Fix DeferredResult typo in changelog | src/dist/changelog.txt | @@ -22,7 +22,7 @@ Changes in version 3.2 M2 (2012-08-xx)
* add @ExceptionResolver annotation to detect classes with @ExceptionHandler methods
* move RSS/Atom message converter registration ahead of jackson/jaxb2
* handle BindException in DefaultHandlerExceptionResolver
-* parameterize DefaultResult type
+* parameter... | false |
Other | spring-projects | spring-framework | 55bd99fa161624ec7bf69ab51d7a9e3a5f657a64.json | Fix typos in Spring MVC chapter of reference docs | src/reference/docbook/mvc.xml | @@ -3666,7 +3666,7 @@ public class SimpleController {
}</programlisting>
<para>The <classname>@ExceptionHandler</classname> value can be set to
- an array of Exception types. If an exception is thrown matches one of
+ an array of Exception types. If an exception is thrown that matches one of
... | false |
Other | spring-projects | spring-framework | 59d80ec19e7e6333a2af64b98f68d3efecc58a97.json | Fix minor issue in MockHttpServletRequest
Previously MockHttpServletRequest#sendRedirect did not set the HTTP status
or the Location header. This does not conform to the HttpServletRequest
interface.
MockHttpServletRequest will now:
- Set the HTTP status to 302 on sendRedirect
- Set the Location header on sendRe... | spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -54,6 +54,8 @@ public class MockHttpServletR... | true |
Other | spring-projects | spring-framework | 59d80ec19e7e6333a2af64b98f68d3efecc58a97.json | Fix minor issue in MockHttpServletRequest
Previously MockHttpServletRequest#sendRedirect did not set the HTTP status
or the Location header. This does not conform to the HttpServletRequest
interface.
MockHttpServletRequest will now:
- Set the HTTP status to 302 on sendRedirect
- Set the Location header on sendRe... | spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,43 +16,54 @@
package org.springframew... | true |
Other | spring-projects | spring-framework | cf147a82ef0c5592041ddfdde3d1340fd47e89aa.json | Fix issue with incorrect class import
Issue: SPR-9112 | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java | @@ -18,6 +18,7 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
@@ -58,8 +59,6 @@
import org.springframework.web.servlet.View;
import org.springframework.web.servlet.handler.AbstractHa... | false |
Other | spring-projects | spring-framework | c846198e4697f2ac5d79f0f4f62d25fa7d62fa26.json | Add support for global @ExceptionHandler methods
Before this change @ExceptionHandler methods could be located in and
apply locally within a controller. The change makes it possible to have
such methods applicable globally regardless of the controller that
raised the exception.
The easiest way to do that is to add th... | spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionHandler.java | @@ -76,6 +76,15 @@
* {@link org.springframework.web.servlet.RequestToViewNameTranslator}.
* <li>A {@link org.springframework.web.servlet.View} object.
* <li>A {@link java.lang.String} value which is interpreted as view name.
+ * <li>{@link ResponseBody @ResponseBody} annotated methods (Servlet-only)
+ * to set th... | true |
Other | spring-projects | spring-framework | c846198e4697f2ac5d79f0f4f62d25fa7d62fa26.json | Add support for global @ExceptionHandler methods
Before this change @ExceptionHandler methods could be located in and
apply locally within a controller. The change makes it possible to have
such methods applicable globally regardless of the controller that
raised the exception.
The easiest way to do that is to add th... | spring-web/src/main/java/org/springframework/web/bind/annotation/ExceptionResolver.java | @@ -0,0 +1,57 @@
+/*
+ * Copyright 2002-2012 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ ... | true |
Other | spring-projects | spring-framework | c846198e4697f2ac5d79f0f4f62d25fa7d62fa26.json | Add support for global @ExceptionHandler methods
Before this change @ExceptionHandler methods could be located in and
apply locally within a controller. The change makes it possible to have
such methods applicable globally regardless of the controller that
raised the exception.
The easiest way to do that is to add th... | spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java | @@ -18,22 +18,31 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.http.HttpServletRequest;
i... | true |
Other | spring-projects | spring-framework | c846198e4697f2ac5d79f0f4f62d25fa7d62fa26.json | Add support for global @ExceptionHandler methods
Before this change @ExceptionHandler methods could be located in and
apply locally within a controller. The change makes it possible to have
such methods applicable globally regardless of the controller that
raised the exception.
The easiest way to do that is to add th... | spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,11 +30,17 @@
import org.junit.Before;
... | true |
Other | spring-projects | spring-framework | c846198e4697f2ac5d79f0f4f62d25fa7d62fa26.json | Add support for global @ExceptionHandler methods
Before this change @ExceptionHandler methods could be located in and
apply locally within a controller. The change makes it possible to have
such methods applicable globally regardless of the controller that
raised the exception.
The easiest way to do that is to add th... | src/dist/changelog.txt | @@ -18,6 +18,8 @@ Changes in version 3.2 M2 (2012-08-xx)
* added support for the HTTP PATCH method to Spring MVC and to RestTemplate (SPR-7985)
* enable smart suffix pattern match in @RequestMapping methods (SPR-7632)
* DispatcherPortlet does not forward event exceptions to the render phase by default (SPR-9287)
+* ... | true |
Other | spring-projects | spring-framework | c846198e4697f2ac5d79f0f4f62d25fa7d62fa26.json | Add support for global @ExceptionHandler methods
Before this change @ExceptionHandler methods could be located in and
apply locally within a controller. The change makes it possible to have
such methods applicable globally regardless of the controller that
raised the exception.
The easiest way to do that is to add th... | src/reference/docbook/mvc.xml | @@ -3620,18 +3620,91 @@ public String onSubmit(<emphasis role="bold">@RequestPart("meta-data") MetaData
<interfacename>HandlerExceptionResolver</interfacename> interface, which
is only a matter of implementing the
<literal>resolveException(Exception, Handler)</literal> method and
- returning a... | true |
Other | spring-projects | spring-framework | 2ec7834124dfa32d7b90afbb23805433a4567bf5.json | Resolve nested placeholders via PropertyResolver
Prior to this change, PropertySourcesPropertyResolver (and therefore
all AbstractEnvironment) implementations failed to resolve nested
placeholders as in the following example:
p1=v1
p2=v2
p3=${v1}:{$v2}
Calls to PropertySource#getProperty for keys 'p1' an... | spring-core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java | @@ -72,6 +72,9 @@ public <T> T getProperty(String key, Class<T> targetValueType) {
Object value;
if ((value = propertySource.getProperty(key)) != null) {
Class<?> valueType = value.getClass();
+ if (String.class.equals(valueType)) {
+ value = this.resolveRequiredPlaceholders((String) value);
+ }
... | true |
Other | spring-projects | spring-framework | 2ec7834124dfa32d7b90afbb23805433a4567bf5.json | Resolve nested placeholders via PropertyResolver
Prior to this change, PropertySourcesPropertyResolver (and therefore
all AbstractEnvironment) implementations failed to resolve nested
placeholders as in the following example:
p1=v1
p2=v2
p3=${v1}:{$v2}
Calls to PropertySource#getProperty for keys 'p1' an... | spring-core/src/main/java/org/springframework/util/PropertyPlaceholderHelper.java | @@ -171,7 +171,8 @@ else if (this.ignoreUnresolvablePlaceholders) {
startIndex = buf.indexOf(this.placeholderPrefix, endIndex + this.placeholderSuffix.length());
}
else {
- throw new IllegalArgumentException("Could not resolve placeholder '" + placeholder + "'");
+ throw new IllegalArgumentExcep... | true |
Other | spring-projects | spring-framework | 2ec7834124dfa32d7b90afbb23805433a4567bf5.json | Resolve nested placeholders via PropertyResolver
Prior to this change, PropertySourcesPropertyResolver (and therefore
all AbstractEnvironment) implementations failed to resolve nested
placeholders as in the following example:
p1=v1
p2=v2
p3=${v1}:{$v2}
Calls to PropertySource#getProperty for keys 'p1' an... | spring-core/src/test/java/org/springframework/core/env/PropertySourcesPropertyResolverTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,22 +16,20 @@
package org.springframew... | true |
Other | spring-projects | spring-framework | b9786ccacac2cf90e7fa10a9a74a42c603376f4c.json | Fix minor issue in HandlerMethod
Before this change HandlerMethod used ClassUtils.getUserClass(Class<?>)
to get the real user class, and not one generated by CGlib. However it
failed to that under all circumstances. This change fixes that.
Issue: SPR-9490 | spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java | @@ -124,21 +124,18 @@ public Method getMethod() {
* Note that if the bean type is a CGLIB-generated class, the original, user-defined class is returned.
*/
public Class<?> getBeanType() {
- if (bean instanceof String) {
- String beanName = (String) bean;
- return beanFactory.getType(beanName);
- }
- else... | false |
Other | spring-projects | spring-framework | 00a86c37222d92b1477f2480b7bdfaebd12c2d1a.json | Detect split packages at build time
Split packages are a well-known anti-pattern for OSGi and a blocker for
Eclipse Virgo (which prevents split packages being accessed via its
Import-Library construct).
Split packages are also unhelpful with a traditional linear classpath
as a split package name does not uniquely ide... | build.gradle | @@ -8,6 +8,11 @@ buildscript {
}
}
+configure(rootProject) {
+ def splitFound = new org.springframework.build.gradle.SplitPackageDetector('.', logger).diagnoseSplitPackages();
+ assert !splitFound // see error log messages for details of split packages
+}
+
configure(allprojects) { project ->
group = "org... | true |
Other | spring-projects | spring-framework | 00a86c37222d92b1477f2480b7bdfaebd12c2d1a.json | Detect split packages at build time
Split packages are a well-known anti-pattern for OSGi and a blocker for
Eclipse Virgo (which prevents split packages being accessed via its
Import-Library construct).
Split packages are also unhelpful with a traditional linear classpath
as a split package name does not uniquely ide... | buildSrc/src/main/groovy/org/springframework/build/gradle/SplitPackageDetector.groovy | @@ -0,0 +1,85 @@
+/*
+ * Copyright 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 | cf68cc5f0b2650bb1cd34064d7e43747f79285a4.json | Eliminate AJ @Async warning in test case
Prior to this commit, ClassWithAsyncAnnotation#return5 forced an
unsuppressable warning in Eclipse, making it virtually impossible to
get to a zero-warnings state in the codebase.
The 'solution' here is simply to comment out the method and it's
associated test case. The 'decla... | spring-aspects/src/test/java/org/springframework/scheduling/aspectj/AnnotationAsyncExecutionAspectTests.java | @@ -49,14 +49,14 @@ public class AnnotationAsyncExecutionAspectTests {
@Before
public void setUp() {
+ Assume.group(TestGroup.PERFORMANCE);
+
executor = new CountingExecutor();
AnnotationAsyncExecutionAspect.aspectOf().setExecutor(executor);
}
@Test
public void asyncMethodGetsRoutedAsynchronously()... | false |
Other | spring-projects | spring-framework | 15e9fe638c631c8c75d3499a083c103ddef594a8.json | Remove duplicate test resources
The files deleted in this commit existed in identical form in two places
within a given module; typically in src/test/java and
src/test/resources. The version within src/test/resources has been
favored in all cases.
This change was prompted by associated Eclipse warnings, which have no... | spring-jdbc/src/test/java/org/springframework/jdbc/support/custom-error-codes.xml | @@ -1,24 +0,0 @@
-<?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>
-
- <!--
- Whacky error codes for testing
- -->
- <bean id="Oracle" class="org.springframework.jdbc.support.SQLErrorCodes">
- <prope... | true |
Other | spring-projects | spring-framework | 15e9fe638c631c8c75d3499a083c103ddef594a8.json | Remove duplicate test resources
The files deleted in this commit existed in identical form in two places
within a given module; typically in src/test/java and
src/test/resources. The version within src/test/resources has been
favored in all cases.
This change was prompted by associated Eclipse warnings, which have no... | spring-jdbc/src/test/java/org/springframework/jdbc/support/test-error-codes.xml | @@ -1,14 +0,0 @@
-<?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>
-
- <!--
- Whacky error codes for testing
- -->
- <bean id="Oracle" class="org.springframework.jdbc.support.SQLErrorCodes">
- <prope... | true |
Other | spring-projects | spring-framework | 15e9fe638c631c8c75d3499a083c103ddef594a8.json | Remove duplicate test resources
The files deleted in this commit existed in identical form in two places
within a given module; typically in src/test/java and
src/test/resources. The version within src/test/resources has been
favored in all cases.
This change was prompted by associated Eclipse warnings, which have no... | spring-jdbc/src/test/java/org/springframework/jdbc/support/wildcard-error-codes.xml | @@ -1,38 +0,0 @@
-<?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>
-
- <!--
- Whacky error codes for testing
- -->
- <bean id="Oracle" class="org.springframework.jdbc.support.SQLErrorCodes">
- <prope... | true |
Other | spring-projects | spring-framework | 15e9fe638c631c8c75d3499a083c103ddef594a8.json | Remove duplicate test resources
The files deleted in this commit existed in identical form in two places
within a given module; typically in src/test/java and
src/test/resources. The version within src/test/resources has been
favored in all cases.
This change was prompted by associated Eclipse warnings, which have no... | spring-orm/src/test/java/org/springframework/orm/hibernate3/filterDefinitions.xml | @@ -1,30 +0,0 @@
-<?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="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBeanTests$FilterTestLocalSessionFactoryBean">
- ... | true |
Other | spring-projects | spring-framework | 15e9fe638c631c8c75d3499a083c103ddef594a8.json | Remove duplicate test resources
The files deleted in this commit existed in identical form in two places
within a given module; typically in src/test/java and
src/test/resources. The version within src/test/resources has been
favored in all cases.
This change was prompted by associated Eclipse warnings, which have no... | spring-orm/src/test/java/org/springframework/orm/hibernate3/typeDefinitions.xml | @@ -1,32 +0,0 @@
-<?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="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBeanTests$TypeTestLocalSessionFactoryBean">
- <... | true |
Other | spring-projects | spring-framework | 15e9fe638c631c8c75d3499a083c103ddef594a8.json | Remove duplicate test resources
The files deleted in this commit existed in identical form in two places
within a given module; typically in src/test/java and
src/test/resources. The version within src/test/resources has been
favored in all cases.
This change was prompted by associated Eclipse warnings, which have no... | spring-orm/src/test/java/org/springframework/orm/jdo/test.properties | @@ -1 +0,0 @@
-myKey=myValue | true |
Other | spring-projects | spring-framework | 15e9fe638c631c8c75d3499a083c103ddef594a8.json | Remove duplicate test resources
The files deleted in this commit existed in identical form in two places
within a given module; typically in src/test/java and
src/test/resources. The version within src/test/resources has been
favored in all cases.
This change was prompted by associated Eclipse warnings, which have no... | spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/empty-servlet.xml | @@ -1,12 +0,0 @@
-<?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="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver"/>
-
- <bean id="servletContextA... | true |
Other | spring-projects | spring-framework | 15e9fe638c631c8c75d3499a083c103ddef594a8.json | Remove duplicate test resources
The files deleted in this commit existed in identical form in two places
within a given module; typically in src/test/java and
src/test/resources. The version within src/test/resources has been
favored in all cases.
This change was prompted by associated Eclipse warnings, which have no... | spring-webmvc/src/test/java/org/springframework/web/context/WEB-INF/sessionContext.xml | @@ -1,16 +0,0 @@
-<?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="rob" class="org.springframework.tests.sample.beans.TestBean">
- <property name="name" value="dummy"/>
- <property name="age... | true |
Other | spring-projects | spring-framework | 15e9fe638c631c8c75d3499a083c103ddef594a8.json | Remove duplicate test resources
The files deleted in this commit existed in identical form in two places
within a given module; typically in src/test/java and
src/test/resources. The version within src/test/resources has been
favored in all cases.
This change was prompted by associated Eclipse warnings, which have no... | spring-webmvc/src/test/java/org/springframework/web/servlet/complexviews.properties | @@ -1,3 +0,0 @@
-form.(class)=org.springframework.web.servlet.view.InternalResourceView
-form.requestContextAttribute=rc
-form.url=myform.jsp | true |
Other | spring-projects | spring-framework | 51b307681a8ee7d89180f58f967856b9c4bf9232.json | Fix warnings due to unused import statements
Issue: SPR-9431 | spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,8 +24,6 @@
import static org.mockito.Mo... | true |
Other | spring-projects | spring-framework | 51b307681a8ee7d89180f58f967856b9c4bf9232.json | Fix warnings due to unused import statements
Issue: SPR-9431 | spring-aop/src/test/java/org/springframework/aop/interceptor/SimpleTraceInterceptorTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,8 +24,6 @@
import static org.mockito.Mo... | true |
Other | spring-projects | spring-framework | 51b307681a8ee7d89180f58f967856b9c4bf9232.json | Fix warnings due to unused import statements
Issue: SPR-9431 | spring-beans/src/test/java/org/springframework/beans/factory/support/BeanFactoryGenericsTests.java | @@ -47,8 +47,6 @@
import org.springframework.tests.Assume;
import org.springframework.tests.TestGroup;
-import org.springframework.tests.Assume;
-import org.springframework.tests.TestGroup;
import org.springframework.tests.sample.beans.GenericBean;
import org.springframework.tests.sample.beans.GenericIntegerBean;... | true |
Other | spring-projects | spring-framework | 51b307681a8ee7d89180f58f967856b9c4bf9232.json | Fix warnings due to unused import statements
Issue: SPR-9431 | spring-beans/src/test/java/org/springframework/beans/support/PagedListHolderTests.java | @@ -24,8 +24,6 @@
import org.springframework.tests.Assume;
import org.springframework.tests.TestGroup;
-import org.springframework.tests.Assume;
-import org.springframework.tests.TestGroup;
import org.springframework.tests.sample.beans.TestBean;
import static org.junit.Assert.*; | true |
Other | spring-projects | spring-framework | 51b307681a8ee7d89180f58f967856b9c4bf9232.json | Fix warnings due to unused import statements
Issue: SPR-9431 | spring-beans/src/test/java/org/springframework/tests/beans/CollectingReaderEventListener.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,7 +29,6 @@
import org.springframework.b... | true |
Other | spring-projects | spring-framework | 51b307681a8ee7d89180f58f967856b9c4bf9232.json | Fix warnings due to unused import statements
Issue: SPR-9431 | spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
import static org.junit.As... | true |
Other | spring-projects | spring-framework | 51b307681a8ee7d89180f58f967856b9c4bf9232.json | Fix warnings due to unused import statements
Issue: SPR-9431 | spring-jdbc/src/test/java/org/springframework/jdbc/core/AbstractRowMapperTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
import java.sql.Connection;
... | true |
Other | spring-projects | spring-framework | 51b307681a8ee7d89180f58f967856b9c4bf9232.json | Fix warnings due to unused import statements
Issue: SPR-9431 | spring-jdbc/src/test/java/org/springframework/jdbc/core/simple/TableMetaDataContextTests.java | @@ -1,3 +1,19 @@
+/*
+ * 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 | 51b307681a8ee7d89180f58f967856b9c4bf9232.json | Fix warnings due to unused import statements
Issue: SPR-9431 | spring-webmvc-portlet/src/test/java/org/springframework/web/portlet/bind/PortletRequestUtilsTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
package org.springframewor... | true |
Other | spring-projects | spring-framework | 51b307681a8ee7d89180f58f967856b9c4bf9232.json | Fix warnings due to unused import statements
Issue: SPR-9431 | spring-webmvc/src/test/java/org/springframework/web/context/support/ServletContextSupportTests.java | @@ -41,7 +41,6 @@
import org.springframework.beans.factory.support.ManagedMap;
import org.springframework.beans.factory.support.ManagedSet;
import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframewor... | true |
Other | spring-projects | spring-framework | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/beans/DerivedTestBean.java | @@ -1,87 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- ... | true |
Other | spring-projects | spring-framework | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/beans/GenericBean.java | @@ -1,237 +0,0 @@
-/*
- * Copyright 2002-2008 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 | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/beans/ITestBean.java | @@ -1,71 +0,0 @@
-/*
- * Copyright 2002-2007 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 | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/beans/IndexedTestBean.java | @@ -1,145 +0,0 @@
-/*
- * Copyright 2002-2006 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 | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/beans/NestedTestBean.java | @@ -1,61 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- ... | true |
Other | spring-projects | spring-framework | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/beans/TestBean.java | @@ -1,442 +0,0 @@
-/*
- * Copyright 2002-2012 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
-... | true |
Other | spring-projects | spring-framework | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/core/ConventionsTests.java | @@ -23,31 +23,31 @@
import junit.framework.TestCase;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.objects.TestObject;
/**
* @author Rob Harrop
*/
public class ConventionsTests extends TestCase {
public void testSimpleObject() {
- TestBean testBean = new TestBean... | true |
Other | spring-projects | spring-framework | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/core/GenericCollectionTypeResolverTests.java | @@ -25,8 +25,8 @@
import java.util.Map;
import java.util.Set;
-import org.springframework.beans.GenericBean;
import org.springframework.core.io.Resource;
+import org.springframework.tests.sample.objects.GenericObject;
/**
* @author Serge Bogatyrjov
@@ -93,11 +93,11 @@ public void testE3() throws Exception {
... | true |
Other | spring-projects | spring-framework | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/core/LocalVariableTableParameterNameDiscovererTests.java | @@ -25,7 +25,7 @@
import junit.framework.TestCase;
import org.junit.Ignore;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.objects.TestObject;
/**
* @author Adrian Colyer
@@ -35,29 +35,29 @@ public class LocalVariableTableParameterNameDiscovererTests extends TestCase {
p... | true |
Other | spring-projects | spring-framework | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/core/PrioritizedParameterNameDiscovererTests.java | @@ -22,7 +22,7 @@
import junit.framework.TestCase;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.objects.TestObject;
public class PrioritizedParameterNameDiscovererTests extends TestCase {
@@ -56,7 +56,7 @@ public String[] getParameterNames(Constructor ctor) {
private ... | true |
Other | spring-projects | spring-framework | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/tests/sample/objects/DerivedTestObject.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,17 +14,11 @@
* limitations under the L... | true |
Other | spring-projects | spring-framework | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/tests/sample/objects/GenericObject.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,23 +14,23 @@
* limitations under the L... | true |
Other | spring-projects | spring-framework | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/tests/sample/objects/ITestInterface.java | @@ -1,6 +1,5 @@
-
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,10 +14,11 @@
* limitations under the... | true |
Other | spring-projects | spring-framework | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/tests/sample/objects/ITestObject.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,10 +14,20 @@
* limitations under the L... | true |
Other | spring-projects | spring-framework | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/tests/sample/objects/TestObject.java | @@ -0,0 +1,72 @@
+/*
+ * 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 | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/tests/sample/objects/package-info.java | @@ -0,0 +1,4 @@
+/**
+ * General purpose sample objects that can be used with tests.
+ */
+package org.springframework.tests.sample.objects; | true |
Other | spring-projects | spring-framework | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java | @@ -20,7 +20,7 @@
import junit.framework.*;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.objects.TestObject;
/**
* @author Rob Harrop
@@ -29,11 +29,11 @@
public class AutoPopulatingListTests extends TestCase {
public void testWithClass() throws Exception {
- doTes... | true |
Other | spring-projects | spring-framework | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java | @@ -28,10 +28,10 @@
import junit.framework.TestCase;
-import org.springframework.beans.DerivedTestBean;
-import org.springframework.beans.IOther;
-import org.springframework.beans.ITestBean;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.objects.DerivedTestObject;
+import org.... | true |
Other | spring-projects | spring-framework | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/util/ReflectionUtilsTests.java | @@ -35,7 +35,7 @@
import org.junit.Ignore;
import org.junit.Test;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.objects.TestObject;
/**
* @author Rob Harrop
@@ -47,19 +47,19 @@ public class ReflectionUtilsTests {
@Test
public void findField() {
- Field field = Refl... | true |
Other | spring-projects | spring-framework | 2a30fa07ea545c5187788825febd6e5eb7460275.json | Replace test beans with test objects
Refactor spring-core tests to replace test beans from
'org.springframework.beans' with lighter test objects in
'org.springframework.tests.sample.objects'. | spring-core/src/test/java/org/springframework/util/SerializationTestUtils.java | @@ -17,7 +17,7 @@
import junit.framework.TestCase;
-import org.springframework.beans.TestBean;
+import org.springframework.tests.sample.objects.TestObject;
/**
* Utilities for testing serializability of objects.
@@ -64,7 +64,7 @@ public SerializationTestUtils(String s) {
}
public void testWithNonSeriali... | true |
Other | spring-projects | spring-framework | 9f9f1ed2533110081c4a62b20d2b5658c8a68496.json | Fix ClassCastException when setting media types
Issue: SPR-10019 | spring-web/src/main/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBean.java | @@ -20,6 +20,7 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Properties;
import javax.servlet.ServletContext;
@@ -52,7 +53,7 @@
private boolean ignoreAcceptHeader = false;
- private Properties mediaTypes = new Properties();
+ private ... | true |
Other | spring-projects | spring-framework | 9f9f1ed2533110081c4a62b20d2b5658c8a68496.json | Fix ClassCastException when setting media types
Issue: SPR-10019 | spring-web/src/test/java/org/springframework/web/accept/ContentNegotiationManagerFactoryBeanTests.java | @@ -19,7 +19,8 @@
import java.util.Arrays;
import java.util.Collections;
-import java.util.Properties;
+import java.util.HashMap;
+import java.util.Map;
import org.junit.Before;
import org.junit.Test;
@@ -74,9 +75,9 @@ public void defaultSettings() throws Exception {
@Test
public void addMediaTypes() thro... | true |
Other | spring-projects | spring-framework | 9f9f1ed2533110081c4a62b20d2b5658c8a68496.json | Fix ClassCastException when setting media types
Issue: SPR-10019 | spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ContentNegotiationConfigurer.java | @@ -15,6 +15,7 @@
*/
package org.springframework.web.servlet.config.annotation;
+import java.util.HashMap;
import java.util.Map;
import javax.servlet.ServletContext;
@@ -36,7 +37,9 @@
*/
public class ContentNegotiationConfigurer {
- private ContentNegotiationManagerFactoryBean factoryBean = new ContentNeg... | true |
Other | spring-projects | spring-framework | 9f9f1ed2533110081c4a62b20d2b5658c8a68496.json | Fix ClassCastException when setting media types
Issue: SPR-10019 | spring-webmvc/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java | @@ -23,6 +23,7 @@
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import javax.activation.FileTypeMap;
@@ -196,7 +197,9 @@ public void setIgnoreAcceptHeader(boolean ignoreAcceptHeader) {
@Deprecated
public void setMediaTypes(Map<String... | true |
Other | spring-projects | spring-framework | 830d73b4a7cc046d80068318389891562ed47076.json | Eliminate EBR dependencies and repository config
Swap the following EBR-specific dependencies for their equivalents at
Maven Central:
- atinject-tck
- jaxb
- xmlbeans
Remove the /ebr-maven-external repository from the build script entirely
such that all dependencies are now resolved against a single repository:
... | build.gradle | @@ -72,7 +72,6 @@ configure(allprojects) { project ->
repositories {
maven { url "http://repo.springsource.org/libs-release" }
- maven { url "http://repo.springsource.org/ebr-maven-external" }
}
dependencies {
@@ -332,7 +331,7 @@ project("spring-context") {
optional("org.aspectj:aspectjweaver:${aspectj... | true |
Other | spring-projects | spring-framework | 830d73b4a7cc046d80068318389891562ed47076.json | Eliminate EBR dependencies and repository config
Swap the following EBR-specific dependencies for their equivalents at
Maven Central:
- atinject-tck
- jaxb
- xmlbeans
Remove the /ebr-maven-external repository from the build script entirely
such that all dependencies are now resolved against a single repository:
... | spring-oxm/oxm.gradle | @@ -7,8 +7,8 @@ configurations {
dependencies {
castor "org.codehaus.castor:castor-anttasks:1.2"
castor "velocity:velocity:1.5"
- xjc "com.sun.xml:com.springsource.com.sun.tools.xjc:2.1.7"
- xmlbeans "org.apache.xmlbeans:com.springsource.org.apache.xmlbeans:2.4.0"
+ xjc "com.sun.xml.bind:jaxb-xjc:2.1.7"
+ xmlbeans... | true |
Other | spring-projects | spring-framework | c892b8185270daec50f84fcf4cefd88e74b8e195.json | Exclude spring-build-src from maven publish | build.gradle | @@ -111,7 +111,7 @@ configure(allprojects.findAll{it.name in ["spring", "spring-jms", "spring-orm",
}
}
-configure(subprojects) { subproject ->
+configure(subprojects - project(":spring-build-src")) { subproject ->
apply plugin: "merge"
apply from: "${gradleScriptDir}/publish-maven.gradle"
| false |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | build.gradle | @@ -111,7 +111,7 @@ configure(allprojects.findAll{it.name in ["spring", "spring-jms", "spring-orm",
}
}
-configure(subprojects - project(":spring-build-junit")) { subproject ->
+configure(subprojects) { subproject ->
apply plugin: "merge"
apply from: "${gradleScriptDir}/publish-maven.gradle"
@@ -160,15 +160,... | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | settings.gradle | @@ -22,7 +22,6 @@ include "spring-web"
include "spring-webmvc"
include "spring-webmvc-portlet"
include "spring-webmvc-tiles3"
-include "spring-build-junit"
// Exposes gradle buildSrc for IDE support
include "buildSrc" | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-aop/src/test/java/org/springframework/aop/target/dynamic/RefreshableTargetSourceTests.java | @@ -19,8 +19,8 @@
import static org.junit.Assert.*;
import org.junit.Test;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
/**
* @author Rob Harrop | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-beans/src/test/java/org/springframework/beans/BeanWrapperTests.java | @@ -49,8 +49,8 @@
import org.springframework.beans.propertyeditors.StringArrayPropertyEditor;
import org.springframework.beans.propertyeditors.StringTrimmerEditor;
import org.springframework.beans.support.DerivedFromProtectedBaseBean;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.... | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java | @@ -72,8 +72,8 @@
import org.springframework.beans.factory.xml.ConstructorDependenciesBean;
import org.springframework.beans.factory.xml.DependenciesBean;
import org.springframework.beans.propertyeditors.CustomNumberEditor;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestG... | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-context-support/src/test/java/org/springframework/scheduling/quartz/QuartzSupportTests.java | @@ -56,8 +56,8 @@
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.factory.support.StaticListableBeanFactory;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.... | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-context/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJAutoProxyCreatorTests.java | @@ -51,8 +51,8 @@
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.j... | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-context/src/test/java/org/springframework/context/annotation/AnnotationProcessorPerformanceTests.java | @@ -31,8 +31,8 @@
import org.springframework.beans.factory.config.RuntimeBeanReference;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.j... | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-context/src/test/java/org/springframework/context/expression/ApplicationContextExpressionTests.java | @@ -38,8 +38,8 @@
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.GenericBeanDefinition;
import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.build.junit.Assume;
-import org.springframework.build... | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-context/src/test/java/org/springframework/scheduling/annotation/EnableSchedulingTests.java | @@ -22,8 +22,8 @@
import org.junit.Before;
import org.junit.Test;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
+import org.springframework.tests.Assume;
+import org.springframework.tests.TestGroup;
import org.springframework.context.annotation.AnnotationConfigA... | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java | @@ -35,8 +35,6 @@
import org.junit.Test;
-import org.springframework.build.junit.Assume;
-import org.springframework.build.junit.TestGroup;
import org.springframework.core.convert.ConversionFailedException;
import org.springframework.core.convert.ConverterNotFoundException;
import org.springframework.core.conve... | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-core/src/test/java/org/springframework/tests/Assume.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the Lic... | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-core/src/test/java/org/springframework/tests/JavaVersion.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the Lic... | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-core/src/test/java/org/springframework/tests/JavaVersionTests.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the Lic... | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-core/src/test/java/org/springframework/tests/Matchers.java | @@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.build.test.hamcrest;
+package org.springframework.tests;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description; | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-core/src/test/java/org/springframework/tests/MockitoUtils.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the Lic... | true |
Other | spring-projects | spring-framework | 65fb26f847a2249792fa8024c04980fc7a49cd5c.json | Move spring-build-junit into spring-core
Move code from spring-build-junit into spring-core/src/test along with
several other test utility classes. This commit removes the temporary
spring-build-junit project introduced in commit
b083bbdec720d3f5b1c7f065dfe8ccb7a7f3b201. | spring-core/src/test/java/org/springframework/tests/TestGroup.java | @@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the Lic... | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.