diff --git a/spring-context/src/test/java/org/springframework/context/annotation/AutoProxyLazyInitTests.java b/spring-context/src/test/java/org/springframework/context/annotation/AutoProxyLazyInitTests.java index 5c87b920433..ba36ffe6e3e 100644 --- a/spring-context/src/test/java/org/springframework/context/annotation/AutoProxyLazyInitTests.java +++ b/spring-context/src/test/java/org/springframework/context/annotation/AutoProxyLazyInitTests.java @@ -41,7 +41,7 @@ public class AutoProxyLazyInitTests { ApplicationContext ctx = new AnnotationConfigApplicationContext(ConfigWithStatic.class); MyBean bean = ctx.getBean("myBean", MyBean.class); - + assertFalse(MyBeanImpl.initialized); bean.doIt(); assertTrue(MyBeanImpl.initialized); diff --git a/spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java b/spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java index 0d6400be264..a04b32ce5b6 100644 --- a/spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java +++ b/spring-core/src/main/java/org/springframework/core/annotation/AnnotatedElementUtils.java @@ -67,7 +67,7 @@ import org.springframework.util.MultiValueMap; *
  • Searching on methods in interfaces, if the annotated element is a method *
  • Searching on methods in superclasses, if the annotated element is a method * - * + * *

    Support for {@code @Inherited}

    *

    Methods following get semantics will honor the contract of * Java's {@link java.lang.annotation.Inherited @Inherited} annotation. diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java index 03192f7414d..6b16aefe5a0 100644 --- a/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java +++ b/spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java @@ -56,7 +56,7 @@ import static org.junit.Assert.*; /** * Unit tests for the {@link GenericConversionService}. * - *

    For tests involving the {@link DefaultConversionService}, see + *

    For tests involving the {@link DefaultConversionService}, see * {@link DefaultConversionServiceTests}. * * @author Keith Donald diff --git a/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java b/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java index 19090111861..e14bc73e585 100644 --- a/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java +++ b/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java @@ -320,12 +320,12 @@ public class SettableListenableFutureTests { private static class InterruptableSettableListenableFuture extends SettableListenableFuture { private boolean interrupted = false; - + @Override protected void interruptTask() { interrupted = true; } - + boolean calledInterruptTask() { return interrupted; } diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/CodeFlow.java b/spring-expression/src/main/java/org/springframework/expression/spel/CodeFlow.java index db59a23915d..2597ba5690e 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/CodeFlow.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/CodeFlow.java @@ -222,7 +222,7 @@ public class CodeFlow implements Opcodes { mv.visitTypeInsn(CHECKCAST, "java/lang/Number"); } mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Number", "doubleValue", "()D", false); - break; + break; case 'F': if (stackDescriptor.equals("Ljava/lang/Object")) { mv.visitTypeInsn(CHECKCAST, "java/lang/Number"); diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java index 0f8b49ff7a4..1fd4e51c86a 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java @@ -628,7 +628,7 @@ class InternalSpelExpressionParser extends TemplateAwareExpressionParser { // '}' - end of list // ',' - more expressions in this list // ':' - this is a map! - + if (peekToken(TokenKind.RCURLY)) { // list with one item in it List listElements = new ArrayList(); listElements.add(firstExpression); @@ -644,7 +644,7 @@ class InternalSpelExpressionParser extends TemplateAwareExpressionParser { while (peekToken(TokenKind.COMMA,true)); closingCurly = eatToken(TokenKind.RCURLY); expr = new InlineList(toPos(t.startPos,closingCurly.endPos),listElements.toArray(new SpelNodeImpl[listElements.size()])); - + } else if (peekToken(TokenKind.COLON, true)) { // map! List mapElements = new ArrayList(); diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java index ce23b3e881e..e0d443eea26 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/support/ReflectiveMethodExecutor.java @@ -81,7 +81,7 @@ public class ReflectiveMethodExecutor implements MethodExecutor { clazz.getDeclaredMethod(method.getName(), method.getParameterTypes()); return clazz; } catch (NoSuchMethodException nsme) { - + } } Class[] intfaces = clazz.getInterfaces(); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/MapTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/MapTests.java index 73e4b14f958..6ab1f64c9e1 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/MapTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/MapTests.java @@ -136,7 +136,7 @@ public class MapTests extends AbstractExpressionTests { // list should be unmodifiable evaluate("{a:1, b:2, c:3, d:4, e:5}[a]=6", "[a:1,b: 2,c: 3,d: 4,e: 5]", unmodifiableClass); } - + @Test public void testMapKeysThatAreAlsoSpELKeywords() { SpelExpressionParser parser = new SpelExpressionParser(); @@ -166,7 +166,7 @@ public class MapTests extends AbstractExpressionTests { expression = (SpelExpression) parser.parseExpression("foo['abc.def']"); o = expression.getValue(new MapHolder()); assertEquals("value", o); - + expression = (SpelExpression)parser.parseExpression("foo[foo[NEW]]"); o = expression.getValue(new MapHolder()); assertEquals("37",o); @@ -174,7 +174,7 @@ public class MapTests extends AbstractExpressionTests { expression = (SpelExpression)parser.parseExpression("foo[foo[new]]"); o = expression.getValue(new MapHolder()); assertEquals("38",o); - + expression = (SpelExpression)parser.parseExpression("foo[foo[foo[T]]]"); o = expression.getValue(new MapHolder()); assertEquals("value",o); diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java index cf7662c0e5c..7efe96036f3 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelCompilationCoverageTests.java @@ -123,7 +123,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { assertEquals(String.class,expression.getValue()); assertCanCompile(expression); assertEquals(String.class,expression.getValue()); - + expression = parse("T(java.io.IOException)"); assertEquals(IOException.class,expression.getValue()); assertCanCompile(expression); @@ -2999,7 +2999,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { context.setVariable("it", person); expression.setEvaluationContext(context); assertTrue(expression.getValue(Boolean.class)); - assertTrue(expression.getValue(Boolean.class)); + assertTrue(expression.getValue(Boolean.class)); assertCanCompile(expression); assertTrue(expression.getValue(Boolean.class)); } @@ -3108,7 +3108,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { assertTrue((Boolean)ex.getValue(context)); assertTrue((Boolean)ex.getValue(context)); } - + public class Person { private int age; @@ -3127,7 +3127,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { } public class Person3 { - + private int age; public Person3(String name, int age) { @@ -3899,7 +3899,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { float[] fs = new float[]{6.0f,7.0f,8.0f}; byte[] bs = new byte[]{(byte)2,(byte)3,(byte)4}; char[] cs = new char[]{'a','b','c'}; - + // Access String (reference type) array expression = parser.parseExpression("[0]"); assertEquals("a",expression.getValue(sss)); @@ -5022,7 +5022,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { for (String[] varg: vargs) { s+="{"; for (String v: varg) { - s+=v; + s+=v; } s+="}"; } @@ -5038,7 +5038,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { for (int[] varg: vargs) { s+="{"; for (int v: varg) { - s+=Integer.toString(v); + s+=Integer.toString(v); } s+="}"; } @@ -5104,7 +5104,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { } public TestClass8() { - + } public TestClass8(Integer i) { @@ -5150,7 +5150,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { } output = b.toString(); } - + public Obj3(String s, Float f, int... ints) { StringBuilder b = new StringBuilder(); b.append(s); @@ -5163,9 +5163,9 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { output = b.toString(); } } - + public static class Obj4 { - + public final String output; public Obj4(int[] params) { diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java index 7d0028caeee..8c411e430bc 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaders.java @@ -104,9 +104,9 @@ public class StompHeaders implements MultiValueMap, Serializable * Create a new instance to be populated with new header values. */ public StompHeaders() { - this(new LinkedMultiValueMap(4), false); + this(new LinkedMultiValueMap(4), false); } - + private StompHeaders(Map> headers, boolean readOnly) { Assert.notNull(headers, "'headers' must not be null"); if (readOnly) { diff --git a/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java b/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java index 4bdb423c5bc..004217f16ec 100644 --- a/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java +++ b/spring-test/src/main/java/org/springframework/test/annotation/DirtiesContext.java @@ -36,7 +36,7 @@ import java.lang.annotation.Target; * *

    {@code @DirtiesContext} may be used as a class-level and method-level * annotation within the same class or class hierarchy. In such scenarios, the - * {@code ApplicationContext} will be marked as dirty before or + * {@code ApplicationContext} will be marked as dirty before or * after any such annotated method as well as before or after the current test * class, depending on the configured {@link #methodMode} and {@link #classMode}. * diff --git a/spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTestNGTests.java b/spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTestNGTests.java index 76e5a3fa624..e6bf9e5238e 100644 --- a/spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTestNGTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/cache/ClassLevelDirtiesContextTestNGTests.java @@ -45,7 +45,7 @@ import static org.springframework.test.context.cache.ContextCacheTestUtils.*; * JUnit 4 based integration test which verifies correct {@linkplain ContextCache * application context caching} in conjunction with Spring's TestNG support * and {@link DirtiesContext @DirtiesContext} at the class level. - * + * *

    This class is a direct copy of {@link ClassLevelDirtiesContextTests}, * modified to verify behavior in conjunction with TestNG. *