diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java index c2820c29c53..f98ce40e608 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -219,8 +219,7 @@ public class PropertyPlaceholderConfigurer extends PlaceholderConfigurerSupport throws BeansException { StringValueResolver valueResolver = new PlaceholderResolvingStringValueResolver(props); - - this.doProcessProperties(beanFactoryToProcess, valueResolver); + doProcessProperties(beanFactoryToProcess, valueResolver); } /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java index 39d73b68f71..ed6bc0661f8 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -269,7 +269,7 @@ public class BeanDefinitionBuilder { */ public BeanDefinitionBuilder addDependsOn(String beanName) { if (this.beanDefinition.getDependsOn() == null) { - this.beanDefinition.setDependsOn(new String[] {beanName}); + this.beanDefinition.setDependsOn(beanName); } else { String[] added = ObjectUtils.addObjectToArray(this.beanDefinition.getDependsOn(), beanName); diff --git a/spring-context/src/main/java/org/springframework/context/annotation/Role.java b/spring-context/src/main/java/org/springframework/context/annotation/Role.java index 3abdca32b17..f8dc81ca6d6 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/Role.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/Role.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2011 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,16 +28,16 @@ import org.springframework.beans.factory.config.BeanDefinition; * Indicates the 'role' hint for a given bean. * *

May be used on any class directly or indirectly annotated with - * {@link org.springframework.stereotype.Component} or on methods annotated with - * {@link Bean}. + * {@link org.springframework.stereotype.Component} or on methods + * annotated with {@link Bean}. * - *

If this annotation is not present on a Component or Bean definition, the - * default value of {@link BeanDefinition#ROLE_APPLICATION} will apply. + *

If this annotation is not present on a Component or Bean definition, + * the default value of {@link BeanDefinition#ROLE_APPLICATION} will apply. * - *

If Role is present on a {@link Configuration @Configuration} class, this - * indicates the role of the configuration class bean definition and does not - * cascade to all @{@code Bean} methods defined within. This behavior is - * different than that of the @{@link Lazy} annotation, for example. + *

If Role is present on a {@link Configuration @Configuration} class, + * this indicates the role of the configuration class bean definition and + * does not cascade to all @{@code Bean} methods defined within. This behavior + * is different than that of the @{@link Lazy} annotation, for example. * * @author Chris Beams * @since 3.1 diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.java index ecaf8b2d650..d85348f0d60 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.java +++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/ProxyAsyncConfiguration.java @@ -45,7 +45,7 @@ public class ProxyAsyncConfiguration extends AbstractAsyncConfiguration { public AsyncAnnotationBeanPostProcessor asyncAdvisor() { Assert.notNull(this.enableAsync, "@EnableAsync annotation metadata was not injected"); AsyncAnnotationBeanPostProcessor bpp = new AsyncAnnotationBeanPostProcessor(); - Class customAsyncAnnotation = enableAsync.getClass("annotation"); + Class customAsyncAnnotation = this.enableAsync.getClass("annotation"); if (customAsyncAnnotation != AnnotationUtils.getDefaultValue(EnableAsync.class, "annotation")) { bpp.setAsyncAnnotationType(customAsyncAnnotation); } diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/ByteBufferConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/ByteBufferConverterTests.java index 319b0274d86..e3ecf541ad0 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/ByteBufferConverterTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/ByteBufferConverterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,6 +35,7 @@ public class ByteBufferConverterTests { private GenericConversionService conversionService; + @Before public void setup() { this.conversionService = new GenericConversionService(); @@ -43,6 +44,7 @@ public class ByteBufferConverterTests { this.conversionService.addConverter(new OtherTypeToByteArrayConverter()); } + @Test public void byteArrayToByteBuffer() throws Exception { byte[] bytes = new byte[] { 1, 2, 3 }; @@ -78,6 +80,7 @@ public class ByteBufferConverterTests { assertThat(bytes, equalTo(convert.array())); } + private static class OtherType { private byte[] bytes; @@ -88,8 +91,8 @@ public class ByteBufferConverterTests { } - private static class ByteArrayToOtherTypeConverter implements - Converter { + + private static class ByteArrayToOtherTypeConverter implements Converter { @Override public OtherType convert(byte[] source) { @@ -97,8 +100,8 @@ public class ByteBufferConverterTests { } } - private static class OtherTypeToByteArrayConverter implements - Converter { + + private static class OtherTypeToByteArrayConverter implements Converter { @Override public byte[] convert(OtherType source) { diff --git a/spring-core/src/test/java/org/springframework/tests/TestGroup.java b/spring-core/src/test/java/org/springframework/tests/TestGroup.java index 63454fc976e..aaf310f4067 100644 --- a/spring-core/src/test/java/org/springframework/tests/TestGroup.java +++ b/spring-core/src/test/java/org/springframework/tests/TestGroup.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,6 @@ import static java.lang.String.*; */ public enum TestGroup { - /** * Tests that take a considerable amount of time to run. Any test lasting longer than * 500ms should be considered a candidate in order to avoid making the overall test @@ -68,6 +67,7 @@ public enum TestGroup { */ CUSTOM_COMPILATION; + /** * Parse the specified comma separated string of groups. * @param value the comma separated string of groups @@ -102,4 +102,5 @@ public enum TestGroup { } return groups; } + } diff --git a/spring-jms/src/main/java/org/springframework/jms/annotation/JmsBootstrapConfiguration.java b/spring-jms/src/main/java/org/springframework/jms/annotation/JmsBootstrapConfiguration.java index 5ee43048513..3ee0b0c08b8 100644 --- a/spring-jms/src/main/java/org/springframework/jms/annotation/JmsBootstrapConfiguration.java +++ b/spring-jms/src/main/java/org/springframework/jms/annotation/JmsBootstrapConfiguration.java @@ -29,7 +29,7 @@ import org.springframework.jms.config.JmsListenerEndpointRegistry; * a default {@link JmsListenerEndpointRegistry}. * *

This configuration class is automatically imported when using the @{@link EnableJms} - * annotation. See {@link EnableJms} Javadoc for complete usage. + * annotation. See the {@link EnableJms} javadocs for complete usage details. * * @author Stephane Nicoll * @since 4.1 diff --git a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java index 9373d3ea8b3..2397196d3e0 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorMarshallerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,55 +55,56 @@ public class CastorMarshallerTests extends AbstractMarshallerTests { /** * Represents the expected result that doesn't contain the xml declaration. */ - private static final String DOCUMENT_EXPECTED_STRING = "" - + "" - + "42"; + private static final String DOCUMENT_EXPECTED_STRING = "" + + "" + + "42"; /** * Represents the expected result that doesn't contain the xml namespaces. */ - private static final String SUPPRESSED_NAMESPACE_EXPECTED_STRING = "42"; + private static final String SUPPRESSED_NAMESPACE_EXPECTED_STRING = + "42"; /** * Represents the expected result with modified root element name. */ - private static final String ROOT_ELEMENT_EXPECTED_STRING = "" - + "" - + "42"; + private static final String ROOT_ELEMENT_EXPECTED_STRING = "" + + "" + + "42"; /** * Represents the expected result with 'xsi:type' attribute. */ - private static final String XSI_EXPECTED_STRING = "" - + "" - + "test8"; + private static final String XSI_EXPECTED_STRING = "" + + "" + + "test8"; /** * Represents the expected result with suppressed 'xsi:type' attribute. */ - private static final String SUPPRESSED_XSI_EXPECTED_STRING = "" - + "test8"; + private static final String SUPPRESSED_XSI_EXPECTED_STRING = "" + + "test8"; /** * Represents the expected result with 'xsi:type' attribute for root element. */ - private static final String ROOT_WITH_XSI_EXPECTED_STRING = "" - + "" - + "" - + "test8"; + private static final String ROOT_WITH_XSI_EXPECTED_STRING = "" + + "" + + "" + + "test8"; /** * Represents the expected result without 'xsi:type' attribute for root element. */ - private static final String ROOT_WITHOUT_XSI_EXPECTED_STRING = "" - + "" - + "test8"; + private static final String ROOT_WITHOUT_XSI_EXPECTED_STRING = "" + + "" + + "test8"; @Override @@ -277,9 +278,9 @@ public class CastorMarshallerTests extends AbstractMarshallerTests { } /** - * Asserts the values of xpath expression evaluation is exactly the same as expected value.

The xpath may contain - * the xml namespace prefixes, since namespaces from flight example are being registered. - * + * Asserts the values of xpath expression evaluation is exactly the same as expected value. + *

The xpath may contain the xml namespace prefixes, since namespaces from flight example + * are being registered. * @param msg the error message that will be used in case of test failure * @param expected the expected value * @param xpath the xpath to evaluate @@ -302,8 +303,6 @@ public class CastorMarshallerTests extends AbstractMarshallerTests { /** * Creates a instance of {@link CastorObject} for testing. - * - * @return a instance of {@link CastorObject} */ private CastorObject createCastorObject() { CastorObject castorObject = new CastorObject(); @@ -311,4 +310,5 @@ public class CastorMarshallerTests extends AbstractMarshallerTests { castorObject.setValue(8); return castorObject; } + } diff --git a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java index 1c55ef1af76..d77acd5202c 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/castor/CastorUnmarshallerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,15 +47,16 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests { */ protected static final String EXTRA_ATTRIBUTES_STRING = "" + - "42"; + "42"; /** * Represents the xml with additional element that is not mapped in Castor config. */ protected static final String EXTRA_ELEMENTS_STRING = "" + - "422011-06-14" + - ""; + "422011-06-14" + + ""; + @Override protected void testFlights(Object o) { @@ -237,7 +238,6 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests { @Test public void unmarshalSaxSourceExternalEntities() throws Exception { - final AtomicReference result = new AtomicReference(); CastorMarshaller marshaller = new CastorMarshaller() { @Override @@ -248,13 +248,11 @@ public class CastorUnmarshallerTests extends AbstractUnmarshallerTests { }; // 1. external-general-entities disabled (default) - marshaller.unmarshal(new SAXSource(new InputSource("1"))); assertNotNull(result.get()); assertEquals(false, result.get().getFeature("http://xml.org/sax/features/external-general-entities")); // 2. external-general-entities disabled (default) - result.set(null); marshaller.setProcessExternalEntities(true); marshaller.unmarshal(new SAXSource(new InputSource("1"))); diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestBody.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestBody.java index b04bb01567f..9a51146c48f 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestBody.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestBody.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2015 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,11 +33,11 @@ import org.springframework.http.converter.HttpMessageConverter; *

Supported for annotated handler methods in Servlet environments. * * @author Arjen Poutsma + * @since 3.0 * @see RequestHeader * @see ResponseBody * @see org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter * @see org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter - * @since 3.0 */ @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) @@ -49,6 +49,7 @@ public @interface RequestBody { *

Default is {@code true}, leading to an exception thrown in case * there is no body content. Switch this to {@code false} if you prefer * {@code null} to be passed when the body content is {@code null}. + * @since 3.2 */ boolean required() default true;