diff --git a/spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java b/spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java index 5516c53c61..87f74a2573 100644 --- a/spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java +++ b/spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java @@ -479,7 +479,7 @@ public class AntPathMatcherTests { // longer is better assertEquals(1, comparator.compare("/hotels", "/hotels2")); - + //SPR-13139 assertEquals(-1, comparator.compare("*", "*/**")); assertEquals(1, comparator.compare("*/**", "*")); diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/ExpressionState.java b/spring-expression/src/main/java/org/springframework/expression/spel/ExpressionState.java index a300643bcd..0b1ee9964b 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/ExpressionState.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/ExpressionState.java @@ -184,7 +184,7 @@ public class ExpressionState { public void enterScope() { ensureVariableScopesInitialized(); this.variableScopes.push(new VariableScope(Collections.emptyMap())); - this.scopeRootObjects.push(getActiveContextObject()); + this.scopeRootObjects.push(getActiveContextObject()); } public void enterScope(String name, Object value) { 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 b3c5005455..0d6483b422 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 @@ -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)); } @@ -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+="}"; } @@ -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); @@ -5165,7 +5165,7 @@ public class SpelCompilationCoverageTests extends AbstractExpressionTests { } public static class Obj4 { - + public final String output; public Obj4(int[] params) { diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java index ec7f8523c9..fc12a5ba49 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/user/DefaultUserDestinationResolverTests.java @@ -129,7 +129,7 @@ public class DefaultUserDestinationResolverTests { @Test public void handleMessageToOtherUser() { - + TestSimpUser otherSimpUser = new TestSimpUser("anna"); otherSimpUser.addSessions(new TestSimpSession("456")); when(this.registry.getUser("anna")).thenReturn(otherSimpUser); diff --git a/spring-web/src/test/java/org/springframework/http/client/OkHttpAsyncClientHttpRequestFactoryTests.java b/spring-web/src/test/java/org/springframework/http/client/OkHttpAsyncClientHttpRequestFactoryTests.java index d09171341b..0ee63b8cf0 100644 --- a/spring-web/src/test/java/org/springframework/http/client/OkHttpAsyncClientHttpRequestFactoryTests.java +++ b/spring-web/src/test/java/org/springframework/http/client/OkHttpAsyncClientHttpRequestFactoryTests.java @@ -24,7 +24,7 @@ import org.springframework.http.HttpMethod; * @author Luciano Leggieri */ public class OkHttpAsyncClientHttpRequestFactoryTests extends AbstractAsyncHttpRequestFactoryTestCase { - + @Override protected AsyncClientHttpRequestFactory createRequestFactory() { return new OkHttpClientHttpRequestFactory(); diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java index 3793f5505c..3e80756f61 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilderTests.java @@ -238,11 +238,11 @@ public class Jackson2ObjectMapperBuilderTests { @Test public void defaultModules() throws JsonProcessingException, UnsupportedEncodingException { ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json().build(); - + Long timestamp = 1322903730000L; DateTime dateTime = new DateTime(timestamp, DateTimeZone.UTC); assertEquals(timestamp.toString(), new String(objectMapper.writeValueAsBytes(dateTime), "UTF-8")); - + Optional optional = Optional.of("test"); assertEquals("\"test\"", new String(objectMapper.writeValueAsBytes(optional), "UTF-8")); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java index 9d020e74dc..3c5dd8a5d8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilder.java @@ -701,7 +701,7 @@ public class MvcUriComponentsBuilder { ControllerMethodInvocationInterceptor(Class controllerType) { this.controllerType = controllerType; } - + @Override public Object intercept(Object obj, Method method, Object[] args, MethodProxy proxy) { if (getControllerMethod.equals(method)) { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java index 42ab5fc658..9a6bc3cdcc 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportExtensionTests.java @@ -407,7 +407,7 @@ public class WebMvcConfigurationSupportExtensionTests { public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/resources/**"); } - + } private class TestPathHelper extends UrlPathHelper {}