diff --git a/spring-core/src/main/java/org/springframework/util/concurrent/CompletableToListenableFutureAdapter.java b/spring-core/src/main/java/org/springframework/util/concurrent/CompletableToListenableFutureAdapter.java index bec609d989..f42a88f4af 100644 --- a/spring-core/src/main/java/org/springframework/util/concurrent/CompletableToListenableFutureAdapter.java +++ b/spring-core/src/main/java/org/springframework/util/concurrent/CompletableToListenableFutureAdapter.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + package org.springframework.util.concurrent; - + import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; @@ -33,11 +33,11 @@ import org.springframework.lang.UsesJava8; */ @UsesJava8 public class CompletableToListenableFutureAdapter implements ListenableFuture { - + private final CompletableFuture completableFuture; - + private final ListenableFutureCallbackRegistry callbacks = new ListenableFutureCallbackRegistry(); - + public CompletableToListenableFutureAdapter(CompletableFuture completableFuture) { this.completableFuture = completableFuture; this.completableFuture.handle(new BiFunction() { @@ -53,38 +53,38 @@ public class CompletableToListenableFutureAdapter implements ListenableFuture } }); } - + @Override public void addCallback(ListenableFutureCallback callback) { this.callbacks.addCallback(callback); } - + @Override public void addCallback(SuccessCallback successCallback, FailureCallback failureCallback) { this.callbacks.addSuccessCallback(successCallback); this.callbacks.addFailureCallback(failureCallback); } - + @Override public boolean cancel(boolean mayInterruptIfRunning) { return this.completableFuture.cancel(mayInterruptIfRunning); } - + @Override public boolean isCancelled() { return this.completableFuture.isCancelled(); } - + @Override public boolean isDone() { return this.completableFuture.isDone(); } - + @Override public T get() throws InterruptedException, ExecutionException { return this.completableFuture.get(); } - + @Override public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { return this.completableFuture.get(timeout, unit); 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 2597ba5690..245989aacc 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/ExpressionState.java b/spring-expression/src/main/java/org/springframework/expression/spel/ExpressionState.java index 5a24e72801..a300643bcd 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 @@ -56,7 +56,7 @@ public class ExpressionState { // When entering a new scope there is a new base object which should be used // for '#this' references (or to act as a target for unqualified references). // This stack captures those objects at each nested scope level. - // For example: + // For example: // #list1.?[#list2.contains(#this)] // On entering the selection we enter a new scope, and #this is now the // element from list1 @@ -180,11 +180,11 @@ public class ExpressionState { this.variableScopes.push(new VariableScope(argMap)); this.scopeRootObjects.push(getActiveContextObject()); } - + 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/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/InternalSpelExpressionParser.java index 1fd4e51c86..8531aa0d42 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 @@ -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 e0d443eea2..da1fda3d02 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 6ab1f64c9e..37d6d8237e 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 @@ -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 7efe96036f..b3c5005455 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)); } @@ -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+="}"; } @@ -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-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java index ea3213afa3..16978892c9 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java @@ -1917,7 +1917,7 @@ public class SpelReproTests extends AbstractExpressionTests { sec.setVariable("no", "1.0"); assertTrue(expression.getValue(sec).toString().startsWith("Object")); } - + @Test @SuppressWarnings("rawtypes") public void SPR13055() throws Exception { @@ -1962,7 +1962,7 @@ public class SpelReproTests extends AbstractExpressionTests { assertTrue(expression2.getValue(new BeanClass(new ListOf(1.1), new ListOf(-2.2)), Boolean.class)); } - + static class CCC { public boolean method(Object o) { System.out.println(o); 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 5a062f9e4f..ec7f8523c9 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 @@ -126,10 +126,10 @@ public class DefaultUserDestinationResolverTests { } // SPR-12444 - + @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/main/java/org/springframework/web/cors/CorsConfiguration.java b/spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java index 51755db999..6f83751663 100644 --- a/spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java +++ b/spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java @@ -101,7 +101,7 @@ public class CorsConfiguration { List combined = new ArrayList(source); combined.addAll(other); return combined; - } + } /** * Configure origins to allow, e.g. "http://domain1.com". The special value 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 d7233db604..d09171341b 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 033c50a000..3793f5505c 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-web/src/test/java/org/springframework/web/cors/CorsConfigurationTests.java b/spring-web/src/test/java/org/springframework/web/cors/CorsConfigurationTests.java index 1881ddde9f..cf26bcf0b7 100644 --- a/spring-web/src/test/java/org/springframework/web/cors/CorsConfigurationTests.java +++ b/spring-web/src/test/java/org/springframework/web/cors/CorsConfigurationTests.java @@ -39,7 +39,7 @@ public class CorsConfigurationTests { public void setup() { config = new CorsConfiguration(); } - + @Test public void setNullValues() { config.setAllowedOrigins(null); @@ -55,7 +55,7 @@ public class CorsConfigurationTests { config.setMaxAge(null); assertNull(config.getMaxAge()); } - + @Test public void setValues() { config.addAllowedOrigin("*"); @@ -72,24 +72,24 @@ public class CorsConfigurationTests { config.setMaxAge(123L); assertEquals(new Long(123), config.getMaxAge()); } - + @Test(expected = IllegalArgumentException.class) public void asteriskWildCardOnAddExposedHeader() { config.addExposedHeader("*"); } - + @Test(expected = IllegalArgumentException.class) public void asteriskWildCardOnSetExposedHeaders() { config.setExposedHeaders(Arrays.asList("*")); } - + @Test public void combineWithNull() { config.setAllowedOrigins(Arrays.asList("*")); config.combine(null); assertEquals(Arrays.asList("*"), config.getAllowedOrigins()); } - + @Test public void combineWithNullProperties() { config.addAllowedOrigin("*"); @@ -107,7 +107,7 @@ public class CorsConfigurationTests { assertEquals(new Long(123), config.getMaxAge()); assertTrue(config.getAllowCredentials()); } - + @Test public void combineWithAsteriskWildCard() { config.addAllowedOrigin("*"); @@ -124,7 +124,7 @@ public class CorsConfigurationTests { assertEquals(Arrays.asList("header2"), config.getExposedHeaders()); assertEquals(Arrays.asList(HttpMethod.PUT.name()), config.getAllowedMethods()); } - + @Test public void combine() { config.addAllowedOrigin("http://domain1.com"); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/CorsConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/CorsConfigurer.java index b9f7e7c440..7fbb6e30b4 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/CorsConfigurer.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/CorsConfigurer.java @@ -26,19 +26,19 @@ import org.springframework.web.cors.CorsConfiguration; /** * Assist with the registration of {@link CorsConfiguration} mapped to one or more path patterns. * @author Sebastien Deleuze - * + * * @since 4.2 * @see CorsRegistration */ public class CorsConfigurer { - + private final List registrations = new ArrayList(); /** * Enable cross origin requests on the specified path patterns. If no path pattern is specified, * cross-origin request handling is mapped on "/**" . - * + * *

By default, all origins, all headers and credentials are allowed. Max age is set to 30 minutes.

*/ public CorsRegistration enableCors(String... pathPatterns) { @@ -46,7 +46,7 @@ public class CorsConfigurer { this.registrations.add(registration); return registration; } - + protected Map getCorsConfigurations() { Map configs = new LinkedHashMap(this.registrations.size()); for (CorsRegistration registration : this.registrations) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/CorsRegistration.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/CorsRegistration.java index 96b44aadca..24bf7351e8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/CorsRegistration.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/CorsRegistration.java @@ -25,19 +25,19 @@ import org.springframework.web.cors.CorsConfiguration; /** * Assists with the creation of a {@link CorsConfiguration} mapped to one or more path patterns. * If no path pattern is specified, cross-origin request handling is mapped on "/**" . - * + * *

By default, all origins, all headers, credentials and GET, HEAD, POST methods are allowed. * Max age is set to 30 minutes.

- * + * * @author Sebastien Deleuze * @since 4.2 */ public class CorsRegistration { - + private final String[] pathPatterns; - + private final CorsConfiguration config; - + public CorsRegistration(String... pathPatterns) { this.pathPatterns = (pathPatterns.length == 0 ? new String[]{ "/**" } : pathPatterns); // Same default values than @CrossOrigin annotation + allows simple methods @@ -50,43 +50,43 @@ public class CorsRegistration { this.config.setAllowCredentials(true); this.config.setMaxAge(1800L); } - + public CorsRegistration allowedOrigins(String... origins) { this.config.setAllowedOrigins(new ArrayList(Arrays.asList(origins))); return this; } - + public CorsRegistration allowedMethods(String... methods) { this.config.setAllowedMethods(new ArrayList(Arrays.asList(methods))); return this; } - + public CorsRegistration allowedHeaders(String... headers) { this.config.setAllowedHeaders(new ArrayList(Arrays.asList(headers))); return this; } - + public CorsRegistration exposedHeaders(String... headers) { this.config.setExposedHeaders(new ArrayList(Arrays.asList(headers))); return this; } - + public CorsRegistration maxAge(long maxAge) { this.config.setMaxAge(maxAge); return this; } - + public CorsRegistration allowCredentials(boolean allowCredentials) { this.config.setAllowCredentials(allowCredentials); return this; } - + protected String[] getPathPatterns() { return this.pathPatterns; } - + protected CorsConfiguration getCorsConfiguration() { return this.config; } - + } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java index 521fe8343f..148ea07884 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java @@ -136,5 +136,5 @@ public class DelegatingWebMvcConfiguration extends WebMvcConfigurationSupport { protected void configureCors(CorsConfigurer configurer) { this.configurers.configureCors(configurer); } - + } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java index 2f63e8afc2..57edc7b840 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java @@ -200,7 +200,7 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv private ContentNegotiationManager contentNegotiationManager; private List> messageConverters; - + private Map corsConfigurations; @@ -881,7 +881,7 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv } return this.corsConfigurations; } - + /** * Override this method to configure cross-origin requests handling. * @since 4.2 diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java index 885b5eced6..71e689d09e 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurerAdapter.java @@ -172,5 +172,5 @@ public abstract class WebMvcConfigurerAdapter implements WebMvcConfigurer { @Override public void configureCors(CorsConfigurer configurer) { } - + } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java index 2ed1f48f94..d096216fb1 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java @@ -80,7 +80,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport private final List adaptedInterceptors = new ArrayList(); private CorsProcessor corsProcessor = new DefaultCorsProcessor(); - + private final Map corsConfiguration = new LinkedHashMap(); 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 666dde2656..ba9858004f 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 @@ -678,7 +678,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/CorsConfigurerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/CorsConfigurerTests.java index 4b12feba24..ccc0e9b0ba 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/CorsConfigurerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/CorsConfigurerTests.java @@ -28,30 +28,30 @@ import org.springframework.web.cors.CorsConfiguration; /** * Test fixture with a {@link CorsConfigurer}. - * + * * @author Sebastien Deleuze */ public class CorsConfigurerTests { - + private CorsConfigurer configurer; - + @Before public void setUp() { this.configurer = new CorsConfigurer(); } - + @Test public void noCorsConfigured() { assertTrue(this.configurer.getCorsConfigurations().isEmpty()); } - + @Test public void multipleCorsConfigured() { this.configurer.enableCors("/foo"); this.configurer.enableCors("/bar"); assertEquals(2, this.configurer.getCorsConfigurations().size()); } - + @Test public void defaultCorsRegistration() { this.configurer.enableCors(); @@ -64,7 +64,7 @@ public class CorsConfigurerTests { assertEquals(true, config.getAllowCredentials()); assertEquals(Long.valueOf(1800), config.getMaxAge()); } - + @Test public void customizedCorsRegistration() { this.configurer.enableCors("/foo").allowedOrigins("http://domain2.com", "http://domain2.com") @@ -80,5 +80,5 @@ public class CorsConfigurerTests { assertEquals(false, config.getAllowCredentials()); assertEquals(Long.valueOf(3600), config.getMaxAge()); } - + } 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 d61fc90e84..312b197ad4 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 @@ -271,7 +271,7 @@ public class WebMvcConfigurationSupportExtensionTests { assertEquals("/", accessor.getPropertyValue("prefix")); assertEquals(".jsp", accessor.getPropertyValue("suffix")); } - + @Test public void crossOrigin() { Map configs = this.config.getCorsConfigurations(); @@ -407,7 +407,7 @@ public class WebMvcConfigurationSupportExtensionTests { public void configureCors(CorsConfigurer registry) { registry.enableCors("/resources/**"); } - + } private class TestPathHelper extends UrlPathHelper {} diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/CorsAbstractHandlerMappingTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/CorsAbstractHandlerMappingTests.java index 944f6e14bd..e07e03a87d 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/CorsAbstractHandlerMappingTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/handler/CorsAbstractHandlerMappingTests.java @@ -113,7 +113,7 @@ public class CorsAbstractHandlerMappingTests { assertNotNull(config); assertArrayEquals(config.getAllowedOrigins().toArray(), new String[]{"*"}); } - + @Test public void actualRequestWithMappedCorsConfiguration() throws Exception { CorsConfiguration config = new CorsConfiguration(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java index a1f73c079b..49f204efd3 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/MvcUriComponentsBuilderTests.java @@ -236,7 +236,7 @@ public class MvcUriComponentsBuilderTests { assertThat(uriComponents.toUriString(), startsWith("http://localhost")); assertThat(uriComponents.toUriString(), endsWith("/extended/else")); } - + @Test public void testFromMethodCallWithTypeLevelUriVars() { UriComponents uriComponents = fromMethodCall(on( @@ -430,7 +430,7 @@ public class MvcUriComponentsBuilderTests { static class ExtendedController extends ControllerWithMethods { } - + @RequestMapping("/user/{userId}/contacts") static class UserContactController {