Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.3.x' into 1.4.x

Browse Source
This commit is contained in:
Andy Wilkinson
2019-03-27 12:11:46 +00:00
parent 61602c0851 35572b6aae
commit baec3d6e8e
101 changed files with 464 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java
View File

@@ -39,7 +39,7 @@ import org.springframework.util.Assert;
/**
* A server that can be used to tunnel TCP traffic over HTTP. Similar in design to the
* <a href="http://xmpp.org/extensions/xep-0124.html">Bidirectional-streams Over
* <a href="https://xmpp.org/extensions/xep-0124.html">Bidirectional-streams Over
* Synchronous HTTP (BOSH)</a> XMPP extension protocol, the server uses long polling with
* HTTP requests held open until a response is available. A typical traffic pattern would
* be as follows:

2
spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java
View File

@@ -70,7 +70,7 @@ public class ClassPathFileSystemWatcherTests {
Map<String, Object> properties = new HashMap<String, Object>();
File folder = this.temp.newFolder();
List<URL> urls = new ArrayList<URL>();
urls.add(new URL("http://spring.io"));
urls.add(new URL("https://spring.io"));
urls.add(folder.toURI().toURL());
properties.put("urls", urls);
MapPropertySource propertySource = new MapPropertySource("test", properties);

4
spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2019 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.
@@ -59,7 +59,7 @@ public class ChangeableUrlsTests {
@Test
public void httpUrl() throws Exception {
URL url = new URL("http://spring.io");
URL url = new URL("https://spring.io");
assertThat(ChangeableUrls.fromUrls(url).size()).isEqualTo(0);
}