diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties.xml index 39c5321186..e39b872c9f 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertiesFactoryBeanTests-test.properties.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties.xml b/spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties.xml index 39c5321186..e39b872c9f 100644 --- a/spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties.xml +++ b/spring-beans/src/test/resources/org/springframework/beans/factory/config/PropertyResourceConfigurerTests-test.properties.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-context/src/test/resources/org/springframework/context/support/messages_de_DE.xml b/spring-context/src/test/resources/org/springframework/context/support/messages_de_DE.xml index 8007d998d7..fe84234b5f 100644 --- a/spring-context/src/test/resources/org/springframework/context/support/messages_de_DE.xml +++ b/spring-context/src/test/resources/org/springframework/context/support/messages_de_DE.xml @@ -1,5 +1,5 @@ - + diff --git a/spring-core/src/test/resources/org/springframework/core/io/example.xml b/spring-core/src/test/resources/org/springframework/core/io/example.xml index 766361fc47..1d638537e1 100644 --- a/spring-core/src/test/resources/org/springframework/core/io/example.xml +++ b/spring-core/src/test/resources/org/springframework/core/io/example.xml @@ -1,5 +1,5 @@ - + bar diff --git a/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java b/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java index 80e3a4d21b..fad9a7560e 100644 --- a/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java +++ b/spring-web/src/test/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverterTests.java @@ -69,7 +69,7 @@ public class RssChannelHttpMessageConverterTests { inputMessage.getHeaders().setContentType(new MediaType("application", "rss+xml", StandardCharsets.UTF_8)); Channel result = converter.read(Channel.class, inputMessage); assertEquals("title", result.getTitle()); - assertEquals("http://example.com", result.getLink()); + assertEquals("https://example.com", result.getLink()); assertEquals("description", result.getDescription()); List items = result.getItems(); diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java index 19b7dda662..96b380f93e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java @@ -920,14 +920,14 @@ public class MvcNamespaceTests { assertEquals(2, configs.size()); CorsConfiguration config = configs.get("/api/**"); assertNotNull(config); - assertArrayEquals(new String[]{"http://domain1.com", "http://domain2.com"}, config.getAllowedOrigins().toArray()); + assertArrayEquals(new String[]{"https://domain1.com", "https://domain2.com"}, config.getAllowedOrigins().toArray()); assertArrayEquals(new String[]{"GET", "PUT"}, config.getAllowedMethods().toArray()); assertArrayEquals(new String[]{"header1", "header2", "header3"}, config.getAllowedHeaders().toArray()); assertArrayEquals(new String[]{"header1", "header2"}, config.getExposedHeaders().toArray()); assertFalse(config.getAllowCredentials()); assertEquals(Long.valueOf(123), config.getMaxAge()); config = configs.get("/resources/**"); - assertArrayEquals(new String[]{"http://domain1.com"}, config.getAllowedOrigins().toArray()); + assertArrayEquals(new String[]{"https://domain1.com"}, config.getAllowedOrigins().toArray()); assertArrayEquals(new String[]{"GET", "HEAD", "POST"}, config.getAllowedMethods().toArray()); assertArrayEquals(new String[]{"*"}, config.getAllowedHeaders().toArray()); assertNull(config.getExposedHeaders()); diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java index 4d375aa611..bcf317b516 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/HandlersBeanDefinitionParserTests.java @@ -224,8 +224,8 @@ public class HandlersBeanDefinitionParserTests { List interceptors = transportService.getHandshakeInterceptors(); assertThat(interceptors, contains(instanceOf(OriginHandshakeInterceptor.class))); assertTrue(transportService.shouldSuppressCors()); - assertTrue(transportService.getAllowedOrigins().contains("http://mydomain1.com")); - assertTrue(transportService.getAllowedOrigins().contains("http://mydomain2.com")); + assertTrue(transportService.getAllowedOrigins().contains("https://mydomain1.com")); + assertTrue(transportService.getAllowedOrigins().contains("https://mydomain2.com")); } diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java index 234af56e98..5e7e487cad 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java @@ -184,8 +184,8 @@ public class MessageBrokerBeanDefinitionParserTests { interceptors = defaultSockJsService.getHandshakeInterceptors(); assertThat(interceptors, contains(instanceOf(FooTestInterceptor.class), instanceOf(BarTestInterceptor.class), instanceOf(OriginHandshakeInterceptor.class))); - assertTrue(defaultSockJsService.getAllowedOrigins().contains("http://mydomain3.com")); - assertTrue(defaultSockJsService.getAllowedOrigins().contains("http://mydomain4.com")); + assertTrue(defaultSockJsService.getAllowedOrigins().contains("https://mydomain3.com")); + assertTrue(defaultSockJsService.getAllowedOrigins().contains("https://mydomain4.com")); SimpUserRegistry userRegistry = this.appContext.getBean(SimpUserRegistry.class); assertNotNull(userRegistry); diff --git a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-simple.xml b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-simple.xml index 2d7457b232..dbb5fe44c7 100644 --- a/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-simple.xml +++ b/spring-websocket/src/test/resources/org/springframework/web/socket/config/websocket-config-broker-simple.xml @@ -17,7 +17,7 @@ - + @@ -25,7 +25,7 @@ - +