diff --git a/pom.xml b/pom.xml index 4a20274893..0e9f48599c 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ spring-boot spring-boot-autoconfigure spring-boot-actuator - spring-boot-developer-tools + spring-boot-devtools spring-boot-docs spring-boot-starters spring-boot-cli diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index d45f026c2f..a6f9dc429c 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -186,7 +186,7 @@ org.springframework.boot - spring-boot-developer-tools + spring-boot-devtools 1.3.0.BUILD-SNAPSHOT diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/package-info.java b/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/package-info.java deleted file mode 100644 index cb92f58568..0000000000 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2012-2015 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Auto-configuration for {@code spring-boot-developer-tools}. - */ -package org.springframework.boot.developertools.autoconfigure; - diff --git a/spring-boot-developer-tools/src/main/resources/META-INF/spring.factories b/spring-boot-developer-tools/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 69e53238a2..0000000000 --- a/spring-boot-developer-tools/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,12 +0,0 @@ -# Application Initializers -org.springframework.context.ApplicationContextInitializer=\ -org.springframework.boot.developertools.restart.RestartScopeInitializer - -# Application Listeners -org.springframework.context.ApplicationListener=\ -org.springframework.boot.developertools.restart.RestartApplicationListener - -# Auto Configure -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.boot.developertools.autoconfigure.LocalDeveloperToolsAutoConfiguration,\ -org.springframework.boot.developertools.autoconfigure.RemoteDeveloperToolsAutoConfiguration diff --git a/spring-boot-developer-tools/pom.xml b/spring-boot-devtools/pom.xml similarity index 86% rename from spring-boot-developer-tools/pom.xml rename to spring-boot-devtools/pom.xml index 31acb05aa4..58a07b2ba0 100644 --- a/spring-boot-developer-tools/pom.xml +++ b/spring-boot-devtools/pom.xml @@ -8,7 +8,7 @@ 1.3.0.BUILD-SNAPSHOT ../spring-boot-parent - spring-boot-developer-tools + spring-boot-devtools Spring Boot Developer Tools Spring Boot Developer Tools http://projects.spring.io/spring-boot/ @@ -74,17 +74,4 @@ test - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - org.springframework.boot.developertools.tunnel.server.RemoteDebugPortProvider - - - - - diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/RemoteSpringApplication.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteSpringApplication.java similarity index 89% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/RemoteSpringApplication.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteSpringApplication.java index 98b54a1c34..5ed574f35c 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/RemoteSpringApplication.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteSpringApplication.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.developertools; +package org.springframework.boot.devtools; import org.springframework.boot.Banner; import org.springframework.boot.ResourceBanner; import org.springframework.boot.SpringApplication; -import org.springframework.boot.developertools.remote.client.RemoteClientConfiguration; -import org.springframework.boot.developertools.restart.RestartInitializer; -import org.springframework.boot.developertools.restart.Restarter; +import org.springframework.boot.devtools.remote.client.RemoteClientConfiguration; +import org.springframework.boot.devtools.restart.RestartInitializer; +import org.springframework.boot.devtools.restart.Restarter; import org.springframework.core.io.ClassPathResource; /** diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/RemoteUrlPropertyExtractor.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractor.java similarity index 97% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/RemoteUrlPropertyExtractor.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractor.java index 0741b44532..b5d5b938fe 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/RemoteUrlPropertyExtractor.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools; +package org.springframework.boot.devtools; import java.net.URI; import java.net.URISyntaxException; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/DeveloperToolsProperties.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java similarity index 87% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/DeveloperToolsProperties.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java index 6e2dd83415..e21e4b870d 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/DeveloperToolsProperties.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.autoconfigure; +package org.springframework.boot.devtools.autoconfigure; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -24,8 +24,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Phillip Webb * @since 1.3.0 */ -@ConfigurationProperties(prefix = "spring.developertools") -public class DeveloperToolsProperties { +@ConfigurationProperties(prefix = "spring.devtools") +public class DevToolsProperties { private static final String DEFAULT_RESTART_EXCLUDES = "META-INF/resources/**,resource/**,static/**,public/**,templates/**"; @@ -33,7 +33,7 @@ public class DeveloperToolsProperties { private Livereload livereload = new Livereload(); - private RemoteDeveloperToolsProperties remote = new RemoteDeveloperToolsProperties(); + private RemoteDevToolsProperties remote = new RemoteDevToolsProperties(); public Restart getRestart() { return this.restart; @@ -43,7 +43,7 @@ public class DeveloperToolsProperties { return this.livereload; } - public RemoteDeveloperToolsProperties getRemote() { + public RemoteDevToolsProperties getRemote() { return this.remote; } diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/LocalDeveloperPropertyDefaultsPostProcessor.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsPropertyDefaultsPostProcessor.java similarity index 92% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/LocalDeveloperPropertyDefaultsPostProcessor.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsPropertyDefaultsPostProcessor.java index 971be717c3..d2960a7b40 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/LocalDeveloperPropertyDefaultsPostProcessor.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsPropertyDefaultsPostProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.autoconfigure; +package org.springframework.boot.devtools.autoconfigure; import java.util.Collections; import java.util.HashMap; @@ -30,12 +30,12 @@ import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.PropertySource; /** - * {@link BeanFactoryPostProcessor} to add properties that make sense when working - * locally. + * {@link BeanFactoryPostProcessor} to add properties that make sense when working at + * development time. * * @author Phillip Webb */ -class LocalDeveloperPropertyDefaultsPostProcessor implements BeanFactoryPostProcessor, +class DevToolsPropertyDefaultsPostProcessor implements BeanFactoryPostProcessor, EnvironmentAware { private static final Map PROPERTIES; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/LocalDeveloperToolsAutoConfiguration.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java similarity index 69% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/LocalDeveloperToolsAutoConfiguration.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java index 922389c3c3..880d76b3e8 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/LocalDeveloperToolsAutoConfiguration.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.autoconfigure; +package org.springframework.boot.devtools.autoconfigure; import java.net.URL; @@ -23,14 +23,14 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.developertools.classpath.ClassPathChangedEvent; -import org.springframework.boot.developertools.classpath.ClassPathFileSystemWatcher; -import org.springframework.boot.developertools.classpath.ClassPathRestartStrategy; -import org.springframework.boot.developertools.classpath.PatternClassPathRestartStrategy; -import org.springframework.boot.developertools.livereload.LiveReloadServer; -import org.springframework.boot.developertools.restart.ConditionalOnInitializedRestarter; -import org.springframework.boot.developertools.restart.RestartScope; -import org.springframework.boot.developertools.restart.Restarter; +import org.springframework.boot.devtools.classpath.ClassPathChangedEvent; +import org.springframework.boot.devtools.classpath.ClassPathFileSystemWatcher; +import org.springframework.boot.devtools.classpath.ClassPathRestartStrategy; +import org.springframework.boot.devtools.classpath.PatternClassPathRestartStrategy; +import org.springframework.boot.devtools.livereload.LiveReloadServer; +import org.springframework.boot.devtools.restart.ConditionalOnInitializedRestarter; +import org.springframework.boot.devtools.restart.RestartScope; +import org.springframework.boot.devtools.restart.Restarter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.event.ContextRefreshedEvent; @@ -44,25 +44,25 @@ import org.springframework.context.event.EventListener; */ @Configuration @ConditionalOnInitializedRestarter -@EnableConfigurationProperties(DeveloperToolsProperties.class) -public class LocalDeveloperToolsAutoConfiguration { +@EnableConfigurationProperties(DevToolsProperties.class) +public class LocalDevToolsAutoConfiguration { @Autowired - private DeveloperToolsProperties properties; + private DevToolsProperties properties; @Bean - public static LocalDeveloperPropertyDefaultsPostProcessor localDeveloperPropertyDefaultsPostProcessor() { - return new LocalDeveloperPropertyDefaultsPostProcessor(); + public static DevToolsPropertyDefaultsPostProcessor devToolsPropertyDefaultsPostProcessor() { + return new DevToolsPropertyDefaultsPostProcessor(); } /** * Local LiveReload configuration. */ - @ConditionalOnProperty(prefix = "spring.developertools.livereload", name = "enabled", matchIfMissing = true) + @ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", matchIfMissing = true) static class LiveReloadConfiguration { @Autowired - private DeveloperToolsProperties properties; + private DevToolsProperties properties; @Autowired(required = false) private LiveReloadServer liveReloadServer; @@ -97,11 +97,11 @@ public class LocalDeveloperToolsAutoConfiguration { /** * Local Restart Configuration. */ - @ConditionalOnProperty(prefix = "spring.developertools.restart", name = "enabled", matchIfMissing = true) + @ConditionalOnProperty(prefix = "spring.devtools.restart", name = "enabled", matchIfMissing = true) static class RestartConfiguration { @Autowired - private DeveloperToolsProperties properties; + private DevToolsProperties properties; @Bean @ConditionalOnMissingBean diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/OptionalLiveReloadServer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/OptionalLiveReloadServer.java similarity index 93% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/OptionalLiveReloadServer.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/OptionalLiveReloadServer.java index a9f4ad2539..ad91bca5cc 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/OptionalLiveReloadServer.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/OptionalLiveReloadServer.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.developertools.autoconfigure; +package org.springframework.boot.devtools.autoconfigure; import javax.annotation.PostConstruct; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.boot.developertools.livereload.LiveReloadServer; +import org.springframework.boot.devtools.livereload.LiveReloadServer; /** * Manages an optional {@link LiveReloadServer}. The {@link LiveReloadServer} may diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/RemoteDeveloperToolsAutoConfiguration.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java similarity index 62% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/RemoteDeveloperToolsAutoConfiguration.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java index 1a5239ddf8..e255a362ee 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/RemoteDeveloperToolsAutoConfiguration.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.autoconfigure; +package org.springframework.boot.devtools.autoconfigure; import java.util.Collection; @@ -29,22 +29,22 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.developertools.remote.server.AccessManager; -import org.springframework.boot.developertools.remote.server.Dispatcher; -import org.springframework.boot.developertools.remote.server.DispatcherFilter; -import org.springframework.boot.developertools.remote.server.Handler; -import org.springframework.boot.developertools.remote.server.HandlerMapper; -import org.springframework.boot.developertools.remote.server.HttpHeaderAccessManager; -import org.springframework.boot.developertools.remote.server.HttpStatusHandler; -import org.springframework.boot.developertools.remote.server.UrlHandlerMapper; -import org.springframework.boot.developertools.restart.server.DefaultSourceFolderUrlFilter; -import org.springframework.boot.developertools.restart.server.HttpRestartServer; -import org.springframework.boot.developertools.restart.server.HttpRestartServerHandler; -import org.springframework.boot.developertools.restart.server.SourceFolderUrlFilter; -import org.springframework.boot.developertools.tunnel.server.HttpTunnelServer; -import org.springframework.boot.developertools.tunnel.server.HttpTunnelServerHandler; -import org.springframework.boot.developertools.tunnel.server.RemoteDebugPortProvider; -import org.springframework.boot.developertools.tunnel.server.SocketTargetServerConnection; +import org.springframework.boot.devtools.remote.server.AccessManager; +import org.springframework.boot.devtools.remote.server.Dispatcher; +import org.springframework.boot.devtools.remote.server.DispatcherFilter; +import org.springframework.boot.devtools.remote.server.Handler; +import org.springframework.boot.devtools.remote.server.HandlerMapper; +import org.springframework.boot.devtools.remote.server.HttpHeaderAccessManager; +import org.springframework.boot.devtools.remote.server.HttpStatusHandler; +import org.springframework.boot.devtools.remote.server.UrlHandlerMapper; +import org.springframework.boot.devtools.restart.server.DefaultSourceFolderUrlFilter; +import org.springframework.boot.devtools.restart.server.HttpRestartServer; +import org.springframework.boot.devtools.restart.server.HttpRestartServerHandler; +import org.springframework.boot.devtools.restart.server.SourceFolderUrlFilter; +import org.springframework.boot.devtools.tunnel.server.HttpTunnelServer; +import org.springframework.boot.devtools.tunnel.server.HttpTunnelServerHandler; +import org.springframework.boot.devtools.tunnel.server.RemoteDebugPortProvider; +import org.springframework.boot.devtools.tunnel.server.SocketTargetServerConnection; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.server.ServerHttpRequest; @@ -57,35 +57,35 @@ import org.springframework.http.server.ServerHttpRequest; * @since 1.3.0 */ @Configuration -@ConditionalOnProperty(prefix = "spring.developertools.remote", name = "secret") +@ConditionalOnProperty(prefix = "spring.devtools.remote", name = "secret") @ConditionalOnClass({ Filter.class, ServerHttpRequest.class }) -@EnableConfigurationProperties(DeveloperToolsProperties.class) -public class RemoteDeveloperToolsAutoConfiguration { +@EnableConfigurationProperties(DevToolsProperties.class) +public class RemoteDevToolsAutoConfiguration { private static final Log logger = LogFactory - .getLog(RemoteDeveloperToolsAutoConfiguration.class); + .getLog(RemoteDevToolsAutoConfiguration.class); @Autowired - private DeveloperToolsProperties properties; + private DevToolsProperties properties; @Bean @ConditionalOnMissingBean - public AccessManager remoteDeveloperToolsAccessManager() { - RemoteDeveloperToolsProperties remoteProperties = this.properties.getRemote(); + public AccessManager remoteDevToolsAccessManager() { + RemoteDevToolsProperties remoteProperties = this.properties.getRemote(); return new HttpHeaderAccessManager(remoteProperties.getSecretHeaderName(), remoteProperties.getSecret()); } @Bean - public HandlerMapper remoteDeveloperToolsHealthCheckHandlerMapper() { + public HandlerMapper remoteDevToolsHealthCheckHandlerMapper() { Handler handler = new HttpStatusHandler(); return new UrlHandlerMapper(this.properties.getRemote().getContextPath(), handler); } @Bean @ConditionalOnMissingBean - public DispatcherFilter remoteDeveloperToolsDispatcherFilter( - AccessManager accessManager, Collection mappers) { + public DispatcherFilter remoteDevToolsDispatcherFilter(AccessManager accessManager, + Collection mappers) { Dispatcher dispatcher = new Dispatcher(accessManager, mappers); return new DispatcherFilter(dispatcher); } @@ -93,11 +93,11 @@ public class RemoteDeveloperToolsAutoConfiguration { /** * Configuration for remote update and restarts. */ - @ConditionalOnProperty(prefix = "spring.developertools.remote.restart", name = "enabled", matchIfMissing = true) + @ConditionalOnProperty(prefix = "spring.devtools.remote.restart", name = "enabled", matchIfMissing = true) static class RemoteRestartConfiguration { @Autowired - private DeveloperToolsProperties properties; + private DevToolsProperties properties; @Bean @ConditionalOnMissingBean @@ -126,11 +126,11 @@ public class RemoteDeveloperToolsAutoConfiguration { /** * Configuration for remote debug HTTP tunneling. */ - @ConditionalOnProperty(prefix = "spring.developertools.remote.debug", name = "enabled", matchIfMissing = true) + @ConditionalOnProperty(prefix = "spring.devtools.remote.debug", name = "enabled", matchIfMissing = true) static class RemoteDebugTunnelConfiguration { @Autowired - private DeveloperToolsProperties properties; + private DevToolsProperties properties; @Bean @ConditionalOnMissingBean(name = "remoteDebugHanderMapper") diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/RemoteDeveloperToolsProperties.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsProperties.java similarity index 95% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/RemoteDeveloperToolsProperties.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsProperties.java index a975dcb1af..8c7c92d3e1 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/autoconfigure/RemoteDeveloperToolsProperties.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.autoconfigure; +package org.springframework.boot.devtools.autoconfigure; /** * Configuration properties for remote Spring Boot applications. @@ -22,9 +22,9 @@ package org.springframework.boot.developertools.autoconfigure; * @author Phillip Webb * @author Rob Winch * @since 1.3.0 - * @see DeveloperToolsProperties + * @see DevToolsProperties */ -public class RemoteDeveloperToolsProperties { +public class RemoteDevToolsProperties { public static final String DEFAULT_CONTEXT_PATH = "/.~~spring-boot!~"; diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/package-info.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/package-info.java new file mode 100644 index 0000000000..d9e2a9f6fa --- /dev/null +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/package-info.java @@ -0,0 +1,21 @@ +/* + * Copyright 2012-2015 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * Auto-configuration for {@code spring-boot-devtools}. + */ +package org.springframework.boot.devtools.autoconfigure; + diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/ClassPathChangedEvent.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathChangedEvent.java similarity index 93% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/ClassPathChangedEvent.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathChangedEvent.java index ddd7004092..fa970854d4 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/ClassPathChangedEvent.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathChangedEvent.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.developertools.classpath; +package org.springframework.boot.devtools.classpath; import java.util.Set; -import org.springframework.boot.developertools.filewatch.ChangedFiles; +import org.springframework.boot.devtools.filewatch.ChangedFiles; import org.springframework.context.ApplicationEvent; import org.springframework.util.Assert; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/ClassPathFileChangeListener.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathFileChangeListener.java similarity index 89% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/ClassPathFileChangeListener.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathFileChangeListener.java index 13a231c47c..f02ff2e80f 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/ClassPathFileChangeListener.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathFileChangeListener.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.developertools.classpath; +package org.springframework.boot.devtools.classpath; import java.util.Set; -import org.springframework.boot.developertools.filewatch.ChangedFile; -import org.springframework.boot.developertools.filewatch.ChangedFiles; -import org.springframework.boot.developertools.filewatch.FileChangeListener; +import org.springframework.boot.devtools.filewatch.ChangedFile; +import org.springframework.boot.devtools.filewatch.ChangedFiles; +import org.springframework.boot.devtools.filewatch.FileChangeListener; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.util.Assert; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/ClassPathFileSystemWatcher.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcher.java similarity index 96% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/ClassPathFileSystemWatcher.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcher.java index 826373fa70..2a4148e784 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/ClassPathFileSystemWatcher.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.classpath; +package org.springframework.boot.devtools.classpath; import java.net.URL; @@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.BeansException; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; -import org.springframework.boot.developertools.filewatch.FileSystemWatcher; +import org.springframework.boot.devtools.filewatch.FileSystemWatcher; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.util.Assert; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/ClassPathRestartStrategy.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathRestartStrategy.java similarity index 90% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/ClassPathRestartStrategy.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathRestartStrategy.java index 0e5644f3e8..456dd4d5a9 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/ClassPathRestartStrategy.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathRestartStrategy.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.boot.developertools.classpath; +package org.springframework.boot.devtools.classpath; -import org.springframework.boot.developertools.filewatch.ChangedFile; +import org.springframework.boot.devtools.filewatch.ChangedFile; /** * Strategy interface used to determine when a changed classpath file should trigger a diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/PatternClassPathRestartStrategy.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/PatternClassPathRestartStrategy.java similarity index 91% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/PatternClassPathRestartStrategy.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/PatternClassPathRestartStrategy.java index 65af3b0f3f..a2e4b67118 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/PatternClassPathRestartStrategy.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/PatternClassPathRestartStrategy.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.boot.developertools.classpath; +package org.springframework.boot.devtools.classpath; -import org.springframework.boot.developertools.filewatch.ChangedFile; +import org.springframework.boot.devtools.filewatch.ChangedFile; import org.springframework.util.AntPathMatcher; import org.springframework.util.StringUtils; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/package-info.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/package-info.java similarity index 91% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/package-info.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/package-info.java index 4ce5e42b61..4045a3bd37 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/classpath/package-info.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/package-info.java @@ -17,5 +17,5 @@ /** * Support for classpath monitoring */ -package org.springframework.boot.developertools.classpath; +package org.springframework.boot.devtools.classpath; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/ChangedFile.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFile.java similarity index 98% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/ChangedFile.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFile.java index b3ffef3c6c..1b722b8a5f 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/ChangedFile.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.filewatch; +package org.springframework.boot.devtools.filewatch; import java.io.File; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/ChangedFiles.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFiles.java similarity index 97% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/ChangedFiles.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFiles.java index 87b2dfe442..67052e8fc4 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/ChangedFiles.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/ChangedFiles.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.filewatch; +package org.springframework.boot.devtools.filewatch; import java.io.File; import java.util.Collections; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/FileChangeListener.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileChangeListener.java similarity index 94% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/FileChangeListener.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileChangeListener.java index 1196028947..f6f3264575 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/FileChangeListener.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileChangeListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.filewatch; +package org.springframework.boot.devtools.filewatch; import java.util.Set; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/FileSnapshot.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSnapshot.java similarity index 97% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/FileSnapshot.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSnapshot.java index 567616c337..0bbd8f99ac 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/FileSnapshot.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSnapshot.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.filewatch; +package org.springframework.boot.devtools.filewatch; import java.io.File; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/FileSystemWatcher.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java similarity index 99% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/FileSystemWatcher.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java index 4ee5c31cad..a57966d894 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/FileSystemWatcher.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.filewatch; +package org.springframework.boot.devtools.filewatch; import java.io.File; import java.util.ArrayList; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/FolderSnapshot.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FolderSnapshot.java similarity index 96% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/FolderSnapshot.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FolderSnapshot.java index 87534b919a..0f3ea03363 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/FolderSnapshot.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FolderSnapshot.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.filewatch; +package org.springframework.boot.devtools.filewatch; import java.io.File; import java.util.Arrays; @@ -26,7 +26,7 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; -import org.springframework.boot.developertools.filewatch.ChangedFile.Type; +import org.springframework.boot.devtools.filewatch.ChangedFile.Type; import org.springframework.util.Assert; /** diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/package-info.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/package-info.java similarity index 92% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/package-info.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/package-info.java index 1bc251d01a..3636f3a485 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/filewatch/package-info.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/package-info.java @@ -17,5 +17,5 @@ /** * Class to watch the local filesystem for changes. */ -package org.springframework.boot.developertools.filewatch; +package org.springframework.boot.devtools.filewatch; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/Base64Encoder.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Base64Encoder.java similarity index 96% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/Base64Encoder.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Base64Encoder.java index 4453d01352..5aea8436a5 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/Base64Encoder.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Base64Encoder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.livereload; +package org.springframework.boot.devtools.livereload; import java.nio.charset.Charset; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/Connection.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Connection.java similarity index 98% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/Connection.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Connection.java index 04c36df8bd..12c46a0d98 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/Connection.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Connection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.livereload; +package org.springframework.boot.devtools.livereload; import java.io.IOException; import java.io.InputStream; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/ConnectionClosedException.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionClosedException.java similarity index 93% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/ConnectionClosedException.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionClosedException.java index 0916c3a4fa..dcc7df7370 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/ConnectionClosedException.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionClosedException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.livereload; +package org.springframework.boot.devtools.livereload; import java.io.IOException; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/ConnectionInputStream.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionInputStream.java similarity index 98% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/ConnectionInputStream.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionInputStream.java index a86c338fa4..69430ea9e1 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/ConnectionInputStream.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionInputStream.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.livereload; +package org.springframework.boot.devtools.livereload; import java.io.FilterInputStream; import java.io.IOException; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/ConnectionOutputStream.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionOutputStream.java similarity index 96% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/ConnectionOutputStream.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionOutputStream.java index 4a3f14fc82..313314719a 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/ConnectionOutputStream.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/ConnectionOutputStream.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.livereload; +package org.springframework.boot.devtools.livereload; import java.io.FilterOutputStream; import java.io.IOException; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/Frame.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Frame.java similarity index 98% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/Frame.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Frame.java index 138957d8dd..acd324e391 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/Frame.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/Frame.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.livereload; +package org.springframework.boot.devtools.livereload; import java.io.IOException; import java.io.OutputStream; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/LiveReloadServer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java similarity index 99% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/LiveReloadServer.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java index 49420b607b..d232479ada 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/LiveReloadServer.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.livereload; +package org.springframework.boot.devtools.livereload; import java.io.IOException; import java.io.InputStream; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/package-info.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/package-info.java similarity index 91% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/package-info.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/package-info.java index 64c1937a3f..d9faa37542 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/livereload/package-info.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/package-info.java @@ -17,5 +17,5 @@ /** * Support for the livereload protocol. */ -package org.springframework.boot.developertools.livereload; +package org.springframework.boot.devtools.livereload; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/package-info.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/package-info.java similarity index 93% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/package-info.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/package-info.java index 9c0f4c95ff..a2f7ae0f53 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/package-info.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/package-info.java @@ -17,5 +17,5 @@ /** * Spring Boot developer tools. */ -package org.springframework.boot.developertools; +package org.springframework.boot.devtools; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/ClassPathChangeUploader.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/ClassPathChangeUploader.java similarity index 90% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/ClassPathChangeUploader.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/ClassPathChangeUploader.java index 4a7485c0d0..91733b8d25 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/ClassPathChangeUploader.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/ClassPathChangeUploader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.client; +package org.springframework.boot.devtools.remote.client; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -29,12 +29,12 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.boot.developertools.classpath.ClassPathChangedEvent; -import org.springframework.boot.developertools.filewatch.ChangedFile; -import org.springframework.boot.developertools.filewatch.ChangedFiles; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles; +import org.springframework.boot.devtools.classpath.ClassPathChangedEvent; +import org.springframework.boot.devtools.filewatch.ChangedFile; +import org.springframework.boot.devtools.filewatch.ChangedFiles; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind; import org.springframework.context.ApplicationListener; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/DelayedLiveReloadTrigger.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/DelayedLiveReloadTrigger.java similarity index 95% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/DelayedLiveReloadTrigger.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/DelayedLiveReloadTrigger.java index 594140dc40..1a56b40279 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/DelayedLiveReloadTrigger.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/DelayedLiveReloadTrigger.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.client; +package org.springframework.boot.devtools.remote.client; import java.io.IOException; import java.net.URI; @@ -22,7 +22,7 @@ import java.net.URISyntaxException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.boot.developertools.autoconfigure.OptionalLiveReloadServer; +import org.springframework.boot.devtools.autoconfigure.OptionalLiveReloadServer; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.client.ClientHttpRequest; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/HttpHeaderInterceptor.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/HttpHeaderInterceptor.java similarity index 96% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/HttpHeaderInterceptor.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/HttpHeaderInterceptor.java index b6effd43bc..42e9f38066 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/HttpHeaderInterceptor.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/HttpHeaderInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.client; +package org.springframework.boot.devtools.remote.client; import java.io.IOException; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/LocalDebugPortAvailableCondition.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/LocalDebugPortAvailableCondition.java similarity index 85% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/LocalDebugPortAvailableCondition.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/LocalDebugPortAvailableCondition.java index c57b681827..b7ea788879 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/LocalDebugPortAvailableCondition.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/LocalDebugPortAvailableCondition.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.client; +package org.springframework.boot.devtools.remote.client; import javax.net.ServerSocketFactory; import org.springframework.boot.autoconfigure.condition.ConditionOutcome; import org.springframework.boot.autoconfigure.condition.SpringBootCondition; import org.springframework.boot.bind.RelaxedPropertyResolver; -import org.springframework.boot.developertools.autoconfigure.RemoteDeveloperToolsProperties; +import org.springframework.boot.devtools.autoconfigure.RemoteDevToolsProperties; import org.springframework.context.annotation.ConditionContext; import org.springframework.core.type.AnnotatedTypeMetadata; @@ -34,10 +34,10 @@ class LocalDebugPortAvailableCondition extends SpringBootCondition { public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) { RelaxedPropertyResolver resolver = new RelaxedPropertyResolver( - context.getEnvironment(), "spring.developertools.remote.debug."); + context.getEnvironment(), "spring.devtools.remote.debug."); Integer port = resolver.getProperty("local-port", Integer.class); if (port == null) { - port = RemoteDeveloperToolsProperties.Debug.DEFAULT_LOCAL_PORT; + port = RemoteDevToolsProperties.Debug.DEFAULT_LOCAL_PORT; } if (isPortAvailable(port)) { return ConditionOutcome.match("Local debug port availble"); diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/LoggingTunnelClientListener.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/LoggingTunnelClientListener.java similarity index 89% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/LoggingTunnelClientListener.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/LoggingTunnelClientListener.java index c5500ce5d3..4e3ddb8573 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/LoggingTunnelClientListener.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/LoggingTunnelClientListener.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.client; +package org.springframework.boot.devtools.remote.client; import java.nio.channels.SocketChannel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.boot.developertools.tunnel.client.TunnelClientListener; +import org.springframework.boot.devtools.tunnel.client.TunnelClientListener; /** * {@link TunnelClientListener} to log open/close events. diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/RemoteClientConfiguration.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/RemoteClientConfiguration.java similarity index 74% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/RemoteClientConfiguration.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/RemoteClientConfiguration.java index 432686dfeb..cbaec0b440 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/RemoteClientConfiguration.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/RemoteClientConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.client; +package org.springframework.boot.devtools.remote.client; import java.net.URL; import java.util.Arrays; @@ -33,20 +33,20 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.developertools.autoconfigure.DeveloperToolsProperties; -import org.springframework.boot.developertools.autoconfigure.OptionalLiveReloadServer; -import org.springframework.boot.developertools.autoconfigure.RemoteDeveloperToolsProperties; -import org.springframework.boot.developertools.classpath.ClassPathChangedEvent; -import org.springframework.boot.developertools.classpath.ClassPathFileSystemWatcher; -import org.springframework.boot.developertools.classpath.ClassPathRestartStrategy; -import org.springframework.boot.developertools.classpath.PatternClassPathRestartStrategy; -import org.springframework.boot.developertools.livereload.LiveReloadServer; -import org.springframework.boot.developertools.restart.DefaultRestartInitializer; -import org.springframework.boot.developertools.restart.RestartScope; -import org.springframework.boot.developertools.restart.Restarter; -import org.springframework.boot.developertools.tunnel.client.HttpTunnelConnection; -import org.springframework.boot.developertools.tunnel.client.TunnelClient; -import org.springframework.boot.developertools.tunnel.client.TunnelConnection; +import org.springframework.boot.devtools.autoconfigure.DevToolsProperties; +import org.springframework.boot.devtools.autoconfigure.OptionalLiveReloadServer; +import org.springframework.boot.devtools.autoconfigure.RemoteDevToolsProperties; +import org.springframework.boot.devtools.classpath.ClassPathChangedEvent; +import org.springframework.boot.devtools.classpath.ClassPathFileSystemWatcher; +import org.springframework.boot.devtools.classpath.ClassPathRestartStrategy; +import org.springframework.boot.devtools.classpath.PatternClassPathRestartStrategy; +import org.springframework.boot.devtools.livereload.LiveReloadServer; +import org.springframework.boot.devtools.restart.DefaultRestartInitializer; +import org.springframework.boot.devtools.restart.RestartScope; +import org.springframework.boot.devtools.restart.Restarter; +import org.springframework.boot.devtools.tunnel.client.HttpTunnelConnection; +import org.springframework.boot.devtools.tunnel.client.TunnelClient; +import org.springframework.boot.devtools.tunnel.client.TunnelConnection; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; @@ -63,16 +63,16 @@ import org.springframework.util.Assert; * * @author Phillip Webb * @since 1.3.0 - * @see org.springframework.boot.developertools.RemoteSpringApplication + * @see org.springframework.boot.devtools.RemoteSpringApplication */ @Configuration -@EnableConfigurationProperties(DeveloperToolsProperties.class) +@EnableConfigurationProperties(DevToolsProperties.class) public class RemoteClientConfiguration { private static final Log logger = LogFactory.getLog(RemoteClientConfiguration.class); @Autowired - private DeveloperToolsProperties properties; + private DevToolsProperties properties; @Value("${remoteUrl}") private String remoteUrl; @@ -91,18 +91,18 @@ public class RemoteClientConfiguration { } private ClientHttpRequestInterceptor getSecurityInterceptor() { - RemoteDeveloperToolsProperties remoteProperties = this.properties.getRemote(); + RemoteDevToolsProperties remoteProperties = this.properties.getRemote(); String secretHeaderName = remoteProperties.getSecretHeaderName(); String secret = remoteProperties.getSecret(); Assert.state(secret != null, - "The environment value 'spring.developertools.remote.secret' " + "The environment value 'spring.devtools.remote.secret' " + "is required to secure your connection."); return new HttpHeaderInterceptor(secretHeaderName, secret); } @PostConstruct private void logWarnings() { - RemoteDeveloperToolsProperties remoteProperties = this.properties.getRemote(); + RemoteDevToolsProperties remoteProperties = this.properties.getRemote(); if (!remoteProperties.getDebug().isEnabled() && !remoteProperties.getRestart().isEnabled()) { logger.warn("Remote restart and debug are both disabled."); @@ -116,11 +116,11 @@ public class RemoteClientConfiguration { /** * LiveReload configuration. */ - @ConditionalOnProperty(prefix = "spring.developertools.livereload", name = "enabled", matchIfMissing = true) + @ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", matchIfMissing = true) static class LiveReloadConfiguration { @Autowired - private DeveloperToolsProperties properties; + private DevToolsProperties properties; @Autowired(required = false) private LiveReloadServer liveReloadServer; @@ -162,11 +162,11 @@ public class RemoteClientConfiguration { /** * Client configuration for remote update and restarts. */ - @ConditionalOnProperty(prefix = "spring.developertools.remote.restart", name = "enabled", matchIfMissing = true) + @ConditionalOnProperty(prefix = "spring.devtools.remote.restart", name = "enabled", matchIfMissing = true) static class RemoteRestartClientConfiguration { @Autowired - private DeveloperToolsProperties properties; + private DevToolsProperties properties; @Value("${remoteUrl}") private String remoteUrl; @@ -200,13 +200,13 @@ public class RemoteClientConfiguration { /** * Client configuration for remote debug HTTP tunneling. */ - @ConditionalOnProperty(prefix = "spring.developertools.remote.debug", name = "enabled", matchIfMissing = true) + @ConditionalOnProperty(prefix = "spring.devtools.remote.debug", name = "enabled", matchIfMissing = true) @ConditionalOnClass(Filter.class) @Conditional(LocalDebugPortAvailableCondition.class) static class RemoteDebugTunnelClientConfiguration { @Autowired - private DeveloperToolsProperties properties; + private DevToolsProperties properties; @Value("${remoteUrl}") private String remoteUrl; @@ -214,7 +214,7 @@ public class RemoteClientConfiguration { @Bean public TunnelClient remoteDebugTunnelClient( ClientHttpRequestFactory requestFactory) { - RemoteDeveloperToolsProperties remoteProperties = this.properties.getRemote(); + RemoteDevToolsProperties remoteProperties = this.properties.getRemote(); String url = this.remoteUrl + remoteProperties.getContextPath() + "/debug"; TunnelConnection connection = new HttpTunnelConnection(url, requestFactory); int localPort = remoteProperties.getDebug().getLocalPort(); diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/package-info.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/package-info.java similarity index 91% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/package-info.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/package-info.java index d602593b8c..08a7da91f2 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/client/package-info.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/package-info.java @@ -17,5 +17,5 @@ /** * Client support for a remotely running Spring Boot application. */ -package org.springframework.boot.developertools.remote.client; +package org.springframework.boot.devtools.remote.client; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/AccessManager.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/AccessManager.java similarity index 95% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/AccessManager.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/AccessManager.java index 3922a437ce..f7015f2cf8 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/AccessManager.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/AccessManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.server; +package org.springframework.boot.devtools.remote.server; import org.springframework.http.server.ServerHttpRequest; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/Dispatcher.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/Dispatcher.java similarity index 97% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/Dispatcher.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/Dispatcher.java index 8bb3239de8..ff2eff6253 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/Dispatcher.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/Dispatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.server; +package org.springframework.boot.devtools.remote.server; import java.io.IOException; import java.util.ArrayList; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/DispatcherFilter.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/DispatcherFilter.java similarity index 97% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/DispatcherFilter.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/DispatcherFilter.java index 4fb157dbf0..e2b6f8370e 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/DispatcherFilter.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/DispatcherFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.server; +package org.springframework.boot.devtools.remote.server; import java.io.IOException; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/Handler.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/Handler.java similarity index 94% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/Handler.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/Handler.java index b32b2062e3..3e316f6599 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/Handler.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/Handler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.server; +package org.springframework.boot.devtools.remote.server; import java.io.IOException; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/HandlerMapper.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HandlerMapper.java similarity index 94% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/HandlerMapper.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HandlerMapper.java index 8b1881da91..499274070e 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/HandlerMapper.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HandlerMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.server; +package org.springframework.boot.devtools.remote.server; import org.springframework.http.server.ServerHttpRequest; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/HttpHeaderAccessManager.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpHeaderAccessManager.java similarity index 95% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/HttpHeaderAccessManager.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpHeaderAccessManager.java index e5ab6f61f8..58053a0094 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/HttpHeaderAccessManager.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpHeaderAccessManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.server; +package org.springframework.boot.devtools.remote.server; import org.springframework.http.server.ServerHttpRequest; import org.springframework.util.Assert; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/HttpStatusHandler.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpStatusHandler.java similarity index 96% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/HttpStatusHandler.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpStatusHandler.java index 76d0f50e16..5fdaa3e661 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/HttpStatusHandler.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/HttpStatusHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.server; +package org.springframework.boot.devtools.remote.server; import java.io.IOException; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/UrlHandlerMapper.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/UrlHandlerMapper.java similarity index 95% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/UrlHandlerMapper.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/UrlHandlerMapper.java index 64a9b7ba47..dc9f43f955 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/UrlHandlerMapper.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/UrlHandlerMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.server; +package org.springframework.boot.devtools.remote.server; import org.springframework.http.server.ServerHttpRequest; import org.springframework.util.Assert; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/package-info.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/package-info.java similarity index 91% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/package-info.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/package-info.java index b4e66352dd..5fe3075d5f 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/remote/server/package-info.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/package-info.java @@ -17,5 +17,5 @@ /** * Server support for a remotely running Spring Boot application. */ -package org.springframework.boot.developertools.remote.server; +package org.springframework.boot.devtools.remote.server; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/ChangeableUrls.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ChangeableUrls.java similarity index 96% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/ChangeableUrls.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ChangeableUrls.java index 53ea59c176..0bb5757305 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/ChangeableUrls.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ChangeableUrls.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import java.net.URL; import java.net.URLClassLoader; @@ -33,7 +33,7 @@ import java.util.regex.Pattern; class ChangeableUrls implements Iterable { private static final String[] SKIPPED_PROJECTS = { "spring-boot", - "spring-boot-developer-tools", "spring-boot-autoconfigure", + "spring-boot-devtools", "spring-boot-autoconfigure", "spring-boot-actuator", "spring-boot-starter" }; private static final Pattern STARTER_PATTERN = Pattern diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/ConditionalOnInitializedRestarter.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ConditionalOnInitializedRestarter.java similarity index 95% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/ConditionalOnInitializedRestarter.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ConditionalOnInitializedRestarter.java index 96cfea1e51..67abcbaa76 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/ConditionalOnInitializedRestarter.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ConditionalOnInitializedRestarter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/DefaultRestartInitializer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/DefaultRestartInitializer.java similarity index 98% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/DefaultRestartInitializer.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/DefaultRestartInitializer.java index 0bd54b8b6d..697ffd9521 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/DefaultRestartInitializer.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/DefaultRestartInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import java.net.URL; import java.net.URLClassLoader; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/MainMethod.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/MainMethod.java similarity index 97% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/MainMethod.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/MainMethod.java index 825f844a6e..5181834264 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/MainMethod.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/MainMethod.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/OnInitializedRestarterCondition.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/OnInitializedRestarterCondition.java similarity index 96% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/OnInitializedRestarterCondition.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/OnInitializedRestarterCondition.java index 28eb21bd9e..c09aa5fe29 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/OnInitializedRestarterCondition.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/OnInitializedRestarterCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import org.springframework.boot.autoconfigure.condition.ConditionOutcome; import org.springframework.boot.autoconfigure.condition.SpringBootCondition; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartApplicationListener.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartApplicationListener.java similarity index 96% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartApplicationListener.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartApplicationListener.java index 4bb0ebda39..dc8492b465 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartApplicationListener.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartApplicationListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import org.springframework.boot.context.event.ApplicationFailedEvent; import org.springframework.boot.context.event.ApplicationReadyEvent; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartInitializer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartInitializer.java similarity index 95% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartInitializer.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartInitializer.java index 36692dadd5..49efdf4158 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartInitializer.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import java.net.URL; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartLauncher.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartLauncher.java similarity index 96% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartLauncher.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartLauncher.java index 7b5a9d7d23..52f84ec8d0 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartLauncher.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartLauncher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import java.lang.reflect.Method; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartScope.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScope.java similarity index 95% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartScope.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScope.java index 557d528793..46e395beb0 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartScope.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScope.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartScopeInitializer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScopeInitializer.java similarity index 97% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartScopeInitializer.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScopeInitializer.java index ca7a133c00..0ddd5ea23c 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/RestartScopeInitializer.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/RestartScopeInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import org.springframework.beans.factory.ObjectFactory; import org.springframework.beans.factory.config.Scope; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/Restarter.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java similarity index 98% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/Restarter.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java index 3d548a0f9b..5e19cebbdb 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/Restarter.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import java.beans.Introspector; import java.lang.Thread.UncaughtExceptionHandler; @@ -43,8 +43,8 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.CachedIntrospectionResults; import org.springframework.beans.factory.ObjectFactory; import org.springframework.boot.SpringApplication; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles; -import org.springframework.boot.developertools.restart.classloader.RestartClassLoader; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles; +import org.springframework.boot.devtools.restart.classloader.RestartClassLoader; import org.springframework.boot.logging.DeferredLog; import org.springframework.cglib.core.ClassNameReader; import org.springframework.core.ResolvableType; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/SilentExitExceptionHandler.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/SilentExitExceptionHandler.java similarity index 96% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/SilentExitExceptionHandler.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/SilentExitExceptionHandler.java index 04bf3e7086..57537c2dde 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/SilentExitExceptionHandler.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/SilentExitExceptionHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import java.lang.Thread.UncaughtExceptionHandler; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFile.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFile.java similarity index 97% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFile.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFile.java index 9a5c2c8d1e..e81725a1ee 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFile.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.classloader; +package org.springframework.boot.devtools.restart.classloader; import java.io.Serializable; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFileRepository.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileRepository.java similarity index 95% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFileRepository.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileRepository.java index e2c08e88b8..662877f007 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFileRepository.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.classloader; +package org.springframework.boot.devtools.restart.classloader; /** * A container for files that may be served from a {@link ClassLoader}. Can be used to diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFileURLStreamHandler.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileURLStreamHandler.java similarity index 96% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFileURLStreamHandler.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileURLStreamHandler.java index 2b7fbacc37..749d76a80f 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFileURLStreamHandler.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileURLStreamHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.classloader; +package org.springframework.boot.devtools.restart.classloader; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFiles.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFiles.java similarity index 98% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFiles.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFiles.java index c4c89e86b7..94d6e7859e 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFiles.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFiles.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.classloader; +package org.springframework.boot.devtools.restart.classloader; import java.io.Serializable; import java.util.Collection; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/RestartClassLoader.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoader.java similarity index 97% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/RestartClassLoader.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoader.java index fe35d27051..974cc62af9 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/RestartClassLoader.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.classloader; +package org.springframework.boot.devtools.restart.classloader; import java.io.IOException; import java.net.MalformedURLException; @@ -26,7 +26,7 @@ import java.util.Enumeration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind; import org.springframework.core.SmartClassLoader; import org.springframework.util.Assert; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/package-info.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/package-info.java similarity index 90% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/package-info.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/package-info.java index 126699d341..39a1a7bd97 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/classloader/package-info.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/package-info.java @@ -17,5 +17,5 @@ /** * Classloaders used for reload support */ -package org.springframework.boot.developertools.restart.classloader; +package org.springframework.boot.devtools.restart.classloader; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/package-info.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/package-info.java similarity index 92% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/package-info.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/package-info.java index a2ae4bdaaf..f0af8ada76 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/package-info.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/package-info.java @@ -17,5 +17,5 @@ /** * Application restart support */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/DefaultSourceFolderUrlFilter.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/DefaultSourceFolderUrlFilter.java similarity index 97% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/DefaultSourceFolderUrlFilter.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/DefaultSourceFolderUrlFilter.java index 3c541413de..e863491128 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/DefaultSourceFolderUrlFilter.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/DefaultSourceFolderUrlFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.server; +package org.springframework.boot.devtools.restart.server; import java.net.URL; import java.util.regex.Matcher; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/HttpRestartServer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/HttpRestartServer.java similarity index 94% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/HttpRestartServer.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/HttpRestartServer.java index 91af3bba84..8db3d73b63 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/HttpRestartServer.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/HttpRestartServer.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.server; +package org.springframework.boot.devtools.restart.server; import java.io.IOException; import java.io.ObjectInputStream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles; import org.springframework.http.HttpStatus; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/HttpRestartServerHandler.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/HttpRestartServerHandler.java similarity index 91% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/HttpRestartServerHandler.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/HttpRestartServerHandler.java index 10f72fa715..24c3511d4e 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/HttpRestartServerHandler.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/HttpRestartServerHandler.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.server; +package org.springframework.boot.devtools.restart.server; import java.io.IOException; -import org.springframework.boot.developertools.remote.server.Handler; +import org.springframework.boot.devtools.remote.server.Handler; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.util.Assert; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/RestartServer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/RestartServer.java similarity index 91% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/RestartServer.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/RestartServer.java index 219ada356b..db9f728515 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/RestartServer.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/RestartServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.server; +package org.springframework.boot.devtools.restart.server; import java.io.File; import java.io.IOException; @@ -26,11 +26,11 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.boot.developertools.restart.Restarter; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles.SourceFolder; +import org.springframework.boot.devtools.restart.Restarter; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles.SourceFolder; import org.springframework.util.Assert; import org.springframework.util.FileCopyUtils; import org.springframework.util.ResourceUtils; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/SourceFolderUrlFilter.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/SourceFolderUrlFilter.java similarity index 94% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/SourceFolderUrlFilter.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/SourceFolderUrlFilter.java index 72c5257ee5..815d611ed6 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/SourceFolderUrlFilter.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/SourceFolderUrlFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.server; +package org.springframework.boot.devtools.restart.server; import java.net.URL; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/package-info.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/package-info.java similarity index 91% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/package-info.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/package-info.java index 9a2d583aa5..abd18bdf24 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/restart/server/package-info.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/package-info.java @@ -17,5 +17,5 @@ /** * Remote restart server */ -package org.springframework.boot.developertools.restart.server; +package org.springframework.boot.devtools.restart.server; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/HttpTunnelConnection.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/HttpTunnelConnection.java similarity index 95% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/HttpTunnelConnection.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/HttpTunnelConnection.java index 67a325603d..07cbd71978 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/HttpTunnelConnection.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/HttpTunnelConnection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.client; +package org.springframework.boot.devtools.tunnel.client; import java.io.Closeable; import java.io.IOException; @@ -31,8 +31,8 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.boot.developertools.tunnel.payload.HttpTunnelPayload; -import org.springframework.boot.developertools.tunnel.payload.HttpTunnelPayloadForwarder; +import org.springframework.boot.devtools.tunnel.payload.HttpTunnelPayload; +import org.springframework.boot.devtools.tunnel.payload.HttpTunnelPayloadForwarder; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.client.ClientHttpRequest; @@ -47,7 +47,7 @@ import org.springframework.util.Assert; * @author Rob Winch * @since 1.3.0 * @see TunnelClient - * @see org.springframework.boot.developertools.tunnel.server.HttpTunnelServer + * @see org.springframework.boot.devtools.tunnel.server.HttpTunnelServer */ public class HttpTunnelConnection implements TunnelConnection { diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/TunnelClient.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClient.java similarity index 98% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/TunnelClient.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClient.java index 85e5bb13c9..d609c27a32 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/TunnelClient.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClient.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.client; +package org.springframework.boot.devtools.tunnel.client; import java.io.Closeable; import java.io.IOException; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/TunnelClientListener.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClientListener.java similarity index 94% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/TunnelClientListener.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClientListener.java index af7e7af634..d9a294ce45 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/TunnelClientListener.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClientListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.client; +package org.springframework.boot.devtools.tunnel.client; import java.nio.channels.SocketChannel; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/TunnelClientListeners.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClientListeners.java similarity index 96% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/TunnelClientListeners.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClientListeners.java index dc5b33e3b4..c926ced884 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/TunnelClientListeners.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClientListeners.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.client; +package org.springframework.boot.devtools.tunnel.client; import java.nio.channels.SocketChannel; import java.util.ArrayList; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/TunnelConnection.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelConnection.java similarity index 95% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/TunnelConnection.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelConnection.java index 7873c1e89c..9884c3c401 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/TunnelConnection.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelConnection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.client; +package org.springframework.boot.devtools.tunnel.client; import java.io.Closeable; import java.nio.channels.WritableByteChannel; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/package-info.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/package-info.java similarity index 91% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/package-info.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/package-info.java index 109e9d16f8..441fac77ea 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/client/package-info.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/package-info.java @@ -17,5 +17,5 @@ /** * Client side TCP tunnel support. */ -package org.springframework.boot.developertools.tunnel.client; +package org.springframework.boot.devtools.tunnel.client; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/package-info.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/package-info.java similarity index 93% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/package-info.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/package-info.java index ee9ad911d2..b5670412d6 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/package-info.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/package-info.java @@ -19,5 +19,5 @@ * for the Java Debug Wire Protocol (JDWP) and as such only expects a single connection * and isn't particularly worried about resource usage. */ -package org.springframework.boot.developertools.tunnel; +package org.springframework.boot.devtools.tunnel; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/payload/HttpTunnelPayload.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayload.java similarity index 98% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/payload/HttpTunnelPayload.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayload.java index 72dfe63422..ca7eaaaeda 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/payload/HttpTunnelPayload.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayload.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.payload; +package org.springframework.boot.devtools.tunnel.payload; import java.io.IOException; import java.io.InterruptedIOException; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/payload/HttpTunnelPayloadForwarder.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadForwarder.java similarity index 96% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/payload/HttpTunnelPayloadForwarder.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadForwarder.java index 328b1954c5..516d8dde71 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/payload/HttpTunnelPayloadForwarder.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadForwarder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.payload; +package org.springframework.boot.devtools.tunnel.payload; import java.io.IOException; import java.nio.channels.WritableByteChannel; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/payload/package-info.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/package-info.java similarity index 91% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/payload/package-info.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/package-info.java index fdf6429f18..a14c692e74 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/payload/package-info.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/package-info.java @@ -17,5 +17,5 @@ /** * Classes to deal with payloads sent over a HTTP tunnel. */ -package org.springframework.boot.developertools.tunnel.payload; +package org.springframework.boot.devtools.tunnel.payload; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/HttpTunnelServer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java similarity index 97% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/HttpTunnelServer.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java index 891630ec07..f59751340d 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/HttpTunnelServer.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.server; +package org.springframework.boot.devtools.tunnel.server; import java.io.IOException; import java.net.ConnectException; @@ -27,8 +27,8 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.boot.developertools.tunnel.payload.HttpTunnelPayload; -import org.springframework.boot.developertools.tunnel.payload.HttpTunnelPayloadForwarder; +import org.springframework.boot.devtools.tunnel.payload.HttpTunnelPayload; +import org.springframework.boot.devtools.tunnel.payload.HttpTunnelPayloadForwarder; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.server.ServerHttpAsyncRequestControl; @@ -96,7 +96,7 @@ import org.springframework.util.Assert; * * @author Phillip Webb * @since 1.3.0 - * @see org.springframework.boot.developertools.tunnel.client.HttpTunnelConnection + * @see org.springframework.boot.devtools.tunnel.client.HttpTunnelConnection */ public class HttpTunnelServer { diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/HttpTunnelServerHandler.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerHandler.java similarity index 91% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/HttpTunnelServerHandler.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerHandler.java index 2ad4c976e6..cadd98137e 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/HttpTunnelServerHandler.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerHandler.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.server; +package org.springframework.boot.devtools.tunnel.server; import java.io.IOException; -import org.springframework.boot.developertools.remote.server.Handler; +import org.springframework.boot.devtools.remote.server.Handler; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.util.Assert; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/PortProvider.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/PortProvider.java similarity index 93% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/PortProvider.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/PortProvider.java index adb7518502..0ddf1c25fd 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/PortProvider.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/PortProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.server; +package org.springframework.boot.devtools.tunnel.server; /** * Strategy interface to provide access to a port (which may change if an existing diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/RemoteDebugPortProvider.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/RemoteDebugPortProvider.java similarity index 96% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/RemoteDebugPortProvider.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/RemoteDebugPortProvider.java index 1dae7635c6..00e3829cf7 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/RemoteDebugPortProvider.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/RemoteDebugPortProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.server; +package org.springframework.boot.devtools.tunnel.server; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/SocketTargetServerConnection.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/SocketTargetServerConnection.java similarity index 97% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/SocketTargetServerConnection.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/SocketTargetServerConnection.java index ddc070257e..2621b83bfb 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/SocketTargetServerConnection.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/SocketTargetServerConnection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.server; +package org.springframework.boot.devtools.tunnel.server; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/StaticPortProvider.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/StaticPortProvider.java similarity index 94% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/StaticPortProvider.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/StaticPortProvider.java index 34c129f6a1..37d581ea87 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/StaticPortProvider.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/StaticPortProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.server; +package org.springframework.boot.devtools.tunnel.server; import org.springframework.util.Assert; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/TargetServerConnection.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/TargetServerConnection.java similarity index 94% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/TargetServerConnection.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/TargetServerConnection.java index 26c5d2565f..41bb581655 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/TargetServerConnection.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/TargetServerConnection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.server; +package org.springframework.boot.devtools.tunnel.server; import java.io.IOException; import java.nio.channels.ByteChannel; diff --git a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/package-info.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/package-info.java similarity index 91% rename from spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/package-info.java rename to spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/package-info.java index 85f70719a9..998c807055 100644 --- a/spring-boot-developer-tools/src/main/java/org/springframework/boot/developertools/tunnel/server/package-info.java +++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/package-info.java @@ -17,5 +17,5 @@ /** * Server side TCP tunnel support. */ -package org.springframework.boot.developertools.tunnel.server; +package org.springframework.boot.devtools.tunnel.server; diff --git a/spring-boot-devtools/src/main/resources/META-INF/spring.factories b/spring-boot-devtools/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000000..03c80fd6cb --- /dev/null +++ b/spring-boot-devtools/src/main/resources/META-INF/spring.factories @@ -0,0 +1,12 @@ +# Application Initializers +org.springframework.context.ApplicationContextInitializer=\ +org.springframework.boot.devtools.restart.RestartScopeInitializer + +# Application Listeners +org.springframework.context.ApplicationListener=\ +org.springframework.boot.devtools.restart.RestartApplicationListener + +# Auto Configure +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ +org.springframework.boot.devtools.autoconfigure.LocalDevToolsAutoConfiguration,\ +org.springframework.boot.devtools.autoconfigure.RemoteDevToolsAutoConfiguration diff --git a/spring-boot-developer-tools/src/main/resources/org/springframework/boot/developertools/livereload/livereload.js b/spring-boot-devtools/src/main/resources/org/springframework/boot/devtools/livereload/livereload.js similarity index 100% rename from spring-boot-developer-tools/src/main/resources/org/springframework/boot/developertools/livereload/livereload.js rename to spring-boot-devtools/src/main/resources/org/springframework/boot/devtools/livereload/livereload.js diff --git a/spring-boot-developer-tools/src/main/resources/org/springframework/boot/developertools/remote-banner.txt b/spring-boot-devtools/src/main/resources/org/springframework/boot/devtools/remote-banner.txt similarity index 100% rename from spring-boot-developer-tools/src/main/resources/org/springframework/boot/developertools/remote-banner.txt rename to spring-boot-devtools/src/main/resources/org/springframework/boot/devtools/remote-banner.txt diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/RemoteUrlPropertyExtractorTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractorTests.java similarity index 94% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/RemoteUrlPropertyExtractorTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractorTests.java index b572b0767f..5e1ece5fd5 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/RemoteUrlPropertyExtractorTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/RemoteUrlPropertyExtractorTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.developertools; +package org.springframework.boot.devtools; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.boot.SpringApplication; -import org.springframework.boot.developertools.RemoteUrlPropertyExtractor; +import org.springframework.boot.devtools.RemoteUrlPropertyExtractor; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Configuration; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/autoconfigure/LocalDeveloperToolsAutoConfigurationTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java similarity index 86% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/autoconfigure/LocalDeveloperToolsAutoConfigurationTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java index 85e01a0279..dbe29c901c 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/autoconfigure/LocalDeveloperToolsAutoConfigurationTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.autoconfigure; +package org.springframework.boot.devtools.autoconfigure; import java.util.Collections; import java.util.HashMap; @@ -27,13 +27,13 @@ import org.junit.rules.ExpectedException; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration; -import org.springframework.boot.developertools.classpath.ClassPathChangedEvent; -import org.springframework.boot.developertools.classpath.ClassPathFileSystemWatcher; -import org.springframework.boot.developertools.filewatch.ChangedFiles; -import org.springframework.boot.developertools.livereload.LiveReloadServer; -import org.springframework.boot.developertools.restart.MockRestartInitializer; -import org.springframework.boot.developertools.restart.MockRestarter; -import org.springframework.boot.developertools.restart.Restarter; +import org.springframework.boot.devtools.classpath.ClassPathChangedEvent; +import org.springframework.boot.devtools.classpath.ClassPathFileSystemWatcher; +import org.springframework.boot.devtools.filewatch.ChangedFiles; +import org.springframework.boot.devtools.livereload.LiveReloadServer; +import org.springframework.boot.devtools.restart.MockRestartInitializer; +import org.springframework.boot.devtools.restart.MockRestarter; +import org.springframework.boot.devtools.restart.Restarter; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -51,11 +51,11 @@ import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; /** - * Tests for {@link LocalDeveloperToolsAutoConfiguration}. + * Tests for {@link LocalDevToolsAutoConfiguration}. * * @author Phillip Webb */ -public class LocalDeveloperToolsAutoConfigurationTests { +public class LocalDevToolsAutoConfigurationTests { @Rule public ExpectedException thrown = ExpectedException.none(); @@ -123,7 +123,7 @@ public class LocalDeveloperToolsAutoConfigurationTests { @Test public void liveReloadDisabled() throws Exception { Map properties = new HashMap(); - properties.put("spring.developertools.livereload.enabled", false); + properties.put("spring.devtools.livereload.enabled", false); this.context = initializeAndRun(Config.class, properties); this.thrown.expect(NoSuchBeanDefinitionException.class); this.context.getBean(OptionalLiveReloadServer.class); @@ -158,7 +158,7 @@ public class LocalDeveloperToolsAutoConfigurationTests { @Test public void restartDisabled() throws Exception { Map properties = new HashMap(); - properties.put("spring.developertools.restart.enabled", false); + properties.put("spring.devtools.restart.enabled", false); this.context = initializeAndRun(Config.class, properties); this.thrown.expect(NoSuchBeanDefinitionException.class); this.context.getBean(ClassPathFileSystemWatcher.class); @@ -182,20 +182,20 @@ public class LocalDeveloperToolsAutoConfigurationTests { Map specifiedProperties) { Map properties = new HashMap(); properties.put("spring.thymeleaf.check-template-location", false); - properties.put("spring.developertools.livereload.port", this.liveReloadPort); + properties.put("spring.devtools.livereload.port", this.liveReloadPort); properties.putAll(specifiedProperties); return properties; } @Configuration - @Import({ LocalDeveloperToolsAutoConfiguration.class, + @Import({ LocalDevToolsAutoConfiguration.class, ThymeleafAutoConfiguration.class }) public static class Config { } @Configuration - @Import({ LocalDeveloperToolsAutoConfiguration.class, + @Import({ LocalDevToolsAutoConfiguration.class, ThymeleafAutoConfiguration.class }) public static class ConfigWithMockLiveReload { diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/autoconfigure/OptionalLiveReloadServerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/OptionalLiveReloadServerTests.java similarity index 87% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/autoconfigure/OptionalLiveReloadServerTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/OptionalLiveReloadServerTests.java index 7c74c14aa3..5addc4e587 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/autoconfigure/OptionalLiveReloadServerTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/OptionalLiveReloadServerTests.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.developertools.autoconfigure; +package org.springframework.boot.devtools.autoconfigure; import org.junit.Test; -import org.springframework.boot.developertools.livereload.LiveReloadServer; +import org.springframework.boot.devtools.autoconfigure.OptionalLiveReloadServer; +import org.springframework.boot.devtools.livereload.LiveReloadServer; import static org.mockito.BDDMockito.willThrow; import static org.mockito.Mockito.mock; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/autoconfigure/RemoteDeveloperToolsAutoConfigurationTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java similarity index 80% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/autoconfigure/RemoteDeveloperToolsAutoConfigurationTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java index 920dbafff0..abc05e960d 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/autoconfigure/RemoteDeveloperToolsAutoConfigurationTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.autoconfigure; +package org.springframework.boot.devtools.autoconfigure; import java.io.IOException; @@ -26,14 +26,14 @@ import org.junit.rules.ExpectedException; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.web.ServerPropertiesAutoConfiguration; -import org.springframework.boot.developertools.remote.server.DispatcherFilter; -import org.springframework.boot.developertools.restart.MockRestarter; -import org.springframework.boot.developertools.restart.server.HttpRestartServer; -import org.springframework.boot.developertools.restart.server.SourceFolderUrlFilter; -import org.springframework.boot.developertools.tunnel.server.HttpTunnelServer; -import org.springframework.boot.developertools.tunnel.server.RemoteDebugPortProvider; -import org.springframework.boot.developertools.tunnel.server.SocketTargetServerConnection; -import org.springframework.boot.developertools.tunnel.server.TargetServerConnection; +import org.springframework.boot.devtools.remote.server.DispatcherFilter; +import org.springframework.boot.devtools.restart.MockRestarter; +import org.springframework.boot.devtools.restart.server.HttpRestartServer; +import org.springframework.boot.devtools.restart.server.SourceFolderUrlFilter; +import org.springframework.boot.devtools.tunnel.server.HttpTunnelServer; +import org.springframework.boot.devtools.tunnel.server.RemoteDebugPortProvider; +import org.springframework.boot.devtools.tunnel.server.SocketTargetServerConnection; +import org.springframework.boot.devtools.tunnel.server.TargetServerConnection; import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -51,16 +51,16 @@ import static org.junit.Assert.assertThat; import static org.mockito.Mockito.mock; /** - * Tests for {@link RemoteDeveloperToolsAutoConfiguration}. + * Tests for {@link RemoteDevToolsAutoConfiguration}. * * @author Rob Winch * @author Phillip Webb */ -public class RemoteDeveloperToolsAutoConfigurationTests { +public class RemoteDevToolsAutoConfigurationTests { - private static final String DEFAULT_CONTEXT_PATH = RemoteDeveloperToolsProperties.DEFAULT_CONTEXT_PATH; + private static final String DEFAULT_CONTEXT_PATH = RemoteDevToolsProperties.DEFAULT_CONTEXT_PATH; - private static final String DEFAULT_SECRET_HEADER_NAME = RemoteDeveloperToolsProperties.DEFAULT_SECRET_HEADER_NAME; + private static final String DEFAULT_SECRET_HEADER_NAME = RemoteDevToolsProperties.DEFAULT_SECRET_HEADER_NAME; @Rule public MockRestarter mockRestarter = new MockRestarter(); @@ -99,7 +99,7 @@ public class RemoteDeveloperToolsAutoConfigurationTests { @Test public void ignoresUnmappedUrl() throws Exception { - loadContext("spring.developertools.remote.secret:supersecret"); + loadContext("spring.devtools.remote.secret:supersecret"); DispatcherFilter filter = this.context.getBean(DispatcherFilter.class); this.request.setRequestURI("/restart"); this.request.addHeader(DEFAULT_SECRET_HEADER_NAME, "supersecret"); @@ -109,7 +109,7 @@ public class RemoteDeveloperToolsAutoConfigurationTests { @Test public void ignoresIfMissingSecretFromRequest() throws Exception { - loadContext("spring.developertools.remote.secret:supersecret"); + loadContext("spring.devtools.remote.secret:supersecret"); DispatcherFilter filter = this.context.getBean(DispatcherFilter.class); this.request.setRequestURI(DEFAULT_CONTEXT_PATH + "/restart"); filter.doFilter(this.request, this.response, this.chain); @@ -118,7 +118,7 @@ public class RemoteDeveloperToolsAutoConfigurationTests { @Test public void ignoresInvalidSecretInRequest() throws Exception { - loadContext("spring.developertools.remote.secret:supersecret"); + loadContext("spring.devtools.remote.secret:supersecret"); DispatcherFilter filter = this.context.getBean(DispatcherFilter.class); this.request.setRequestURI(DEFAULT_CONTEXT_PATH + "/restart"); this.request.addHeader(DEFAULT_SECRET_HEADER_NAME, "invalid"); @@ -128,7 +128,7 @@ public class RemoteDeveloperToolsAutoConfigurationTests { @Test public void invokeRestartWithDefaultSetup() throws Exception { - loadContext("spring.developertools.remote.secret:supersecret"); + loadContext("spring.devtools.remote.secret:supersecret"); DispatcherFilter filter = this.context.getBean(DispatcherFilter.class); this.request.setRequestURI(DEFAULT_CONTEXT_PATH + "/restart"); this.request.addHeader(DEFAULT_SECRET_HEADER_NAME, "supersecret"); @@ -138,15 +138,15 @@ public class RemoteDeveloperToolsAutoConfigurationTests { @Test public void disableRestart() throws Exception { - loadContext("spring.developertools.remote.secret:supersecret", - "spring.developertools.remote.restart.enabled:false"); + loadContext("spring.devtools.remote.secret:supersecret", + "spring.devtools.remote.restart.enabled:false"); this.thrown.expect(NoSuchBeanDefinitionException.class); this.context.getBean("remoteRestartHanderMapper"); } @Test public void invokeTunnelWithDefaultSetup() throws Exception { - loadContext("spring.developertools.remote.secret:supersecret"); + loadContext("spring.devtools.remote.secret:supersecret"); DispatcherFilter filter = this.context.getBean(DispatcherFilter.class); this.request.setRequestURI(DEFAULT_CONTEXT_PATH + "/debug"); this.request.addHeader(DEFAULT_SECRET_HEADER_NAME, "supersecret"); @@ -156,8 +156,8 @@ public class RemoteDeveloperToolsAutoConfigurationTests { @Test public void invokeTunnelWithCustomHeaderName() throws Exception { - loadContext("spring.developertools.remote.secret:supersecret", - "spring.developertools.remote.secretHeaderName:customheader"); + loadContext("spring.devtools.remote.secret:supersecret", + "spring.devtools.remote.secretHeaderName:customheader"); DispatcherFilter filter = this.context.getBean(DispatcherFilter.class); this.request.setRequestURI(DEFAULT_CONTEXT_PATH + "/debug"); this.request.addHeader("customheader", "supersecret"); @@ -167,15 +167,15 @@ public class RemoteDeveloperToolsAutoConfigurationTests { @Test public void disableRemoteDebug() throws Exception { - loadContext("spring.developertools.remote.secret:supersecret", - "spring.developertools.remote.debug.enabled:false"); + loadContext("spring.devtools.remote.secret:supersecret", + "spring.devtools.remote.debug.enabled:false"); this.thrown.expect(NoSuchBeanDefinitionException.class); this.context.getBean("remoteDebugHanderMapper"); } @Test - public void developerToolsHealthReturns200() throws Exception { - loadContext("spring.developertools.remote.secret:supersecret"); + public void devToolsHealthReturns200() throws Exception { + loadContext("spring.devtools.remote.secret:supersecret"); DispatcherFilter filter = this.context.getBean(DispatcherFilter.class); this.request.setRequestURI(DEFAULT_CONTEXT_PATH); this.request.addHeader(DEFAULT_SECRET_HEADER_NAME, "supersecret"); @@ -204,7 +204,7 @@ public class RemoteDeveloperToolsAutoConfigurationTests { } @Configuration - @Import(RemoteDeveloperToolsAutoConfiguration.class) + @Import(RemoteDevToolsAutoConfiguration.class) static class Config { @Bean diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/classpath/ClassPathChangedEventTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathChangedEventTests.java similarity index 91% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/classpath/ClassPathChangedEventTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathChangedEventTests.java index 6d50383dd5..a5db54c94c 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/classpath/ClassPathChangedEventTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathChangedEventTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.classpath; +package org.springframework.boot.devtools.classpath; import java.util.LinkedHashSet; import java.util.Set; @@ -22,7 +22,8 @@ import java.util.Set; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.springframework.boot.developertools.filewatch.ChangedFiles; +import org.springframework.boot.devtools.classpath.ClassPathChangedEvent; +import org.springframework.boot.devtools.filewatch.ChangedFiles; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.sameInstance; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/classpath/ClassPathFileChangeListenerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileChangeListenerTests.java similarity index 89% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/classpath/ClassPathFileChangeListenerTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileChangeListenerTests.java index 445a7900f6..d74467106b 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/classpath/ClassPathFileChangeListenerTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileChangeListenerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.classpath; +package org.springframework.boot.devtools.classpath; import java.io.File; import java.util.Collections; @@ -28,8 +28,11 @@ import org.junit.rules.ExpectedException; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.MockitoAnnotations; -import org.springframework.boot.developertools.filewatch.ChangedFile; -import org.springframework.boot.developertools.filewatch.ChangedFiles; +import org.springframework.boot.devtools.classpath.ClassPathChangedEvent; +import org.springframework.boot.devtools.classpath.ClassPathFileChangeListener; +import org.springframework.boot.devtools.classpath.ClassPathRestartStrategy; +import org.springframework.boot.devtools.filewatch.ChangedFile; +import org.springframework.boot.devtools.filewatch.ChangedFiles; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/classpath/ClassPathFileSystemWatcherTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java similarity index 90% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/classpath/ClassPathFileSystemWatcherTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java index 1c2066563e..8f1360f388 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/classpath/ClassPathFileSystemWatcherTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.classpath; +package org.springframework.boot.devtools.classpath; import java.io.File; import java.net.URL; @@ -28,8 +28,11 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.developertools.filewatch.ChangedFile; -import org.springframework.boot.developertools.filewatch.FileSystemWatcher; +import org.springframework.boot.devtools.classpath.ClassPathChangedEvent; +import org.springframework.boot.devtools.classpath.ClassPathFileSystemWatcher; +import org.springframework.boot.devtools.classpath.ClassPathRestartStrategy; +import org.springframework.boot.devtools.filewatch.ChangedFile; +import org.springframework.boot.devtools.filewatch.FileSystemWatcher; import org.springframework.context.ApplicationListener; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/classpath/PatternClassPathRestartStrategyTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/PatternClassPathRestartStrategyTests.java similarity index 88% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/classpath/PatternClassPathRestartStrategyTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/PatternClassPathRestartStrategyTests.java index 53dd7a5540..57dc685402 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/classpath/PatternClassPathRestartStrategyTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/PatternClassPathRestartStrategyTests.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package org.springframework.boot.developertools.classpath; +package org.springframework.boot.devtools.classpath; import java.io.File; import org.junit.Test; -import org.springframework.boot.developertools.filewatch.ChangedFile; -import org.springframework.boot.developertools.filewatch.ChangedFile.Type; +import org.springframework.boot.devtools.classpath.ClassPathRestartStrategy; +import org.springframework.boot.devtools.classpath.PatternClassPathRestartStrategy; +import org.springframework.boot.devtools.filewatch.ChangedFile; +import org.springframework.boot.devtools.filewatch.ChangedFile.Type; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/filewatch/ChangedFileTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/ChangedFileTests.java similarity index 93% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/filewatch/ChangedFileTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/ChangedFileTests.java index 70d3a73298..e638fdd74b 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/filewatch/ChangedFileTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/ChangedFileTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.filewatch; +package org.springframework.boot.devtools.filewatch; import java.io.File; @@ -22,7 +22,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; -import org.springframework.boot.developertools.filewatch.ChangedFile.Type; +import org.springframework.boot.devtools.filewatch.ChangedFile; +import org.springframework.boot.devtools.filewatch.ChangedFile.Type; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/filewatch/FileSnapshotTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSnapshotTests.java similarity index 96% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/filewatch/FileSnapshotTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSnapshotTests.java index ae47cd5eaf..79b40750ff 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/filewatch/FileSnapshotTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSnapshotTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.filewatch; +package org.springframework.boot.devtools.filewatch; import java.io.File; import java.io.IOException; @@ -25,6 +25,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; +import org.springframework.boot.devtools.filewatch.FileSnapshot; import org.springframework.util.FileCopyUtils; import static org.hamcrest.Matchers.equalTo; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/filewatch/FileSystemWatcherTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSystemWatcherTests.java similarity index 95% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/filewatch/FileSystemWatcherTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSystemWatcherTests.java index 42b005469b..734aa1949c 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/filewatch/FileSystemWatcherTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSystemWatcherTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.filewatch; +package org.springframework.boot.devtools.filewatch; import java.io.File; import java.io.FileNotFoundException; @@ -32,7 +32,11 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; -import org.springframework.boot.developertools.filewatch.ChangedFile.Type; +import org.springframework.boot.devtools.filewatch.ChangedFile; +import org.springframework.boot.devtools.filewatch.ChangedFiles; +import org.springframework.boot.devtools.filewatch.FileChangeListener; +import org.springframework.boot.devtools.filewatch.FileSystemWatcher; +import org.springframework.boot.devtools.filewatch.ChangedFile.Type; import org.springframework.util.FileCopyUtils; import static org.hamcrest.Matchers.contains; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/filewatch/FolderSnapshotTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FolderSnapshotTests.java similarity index 94% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/filewatch/FolderSnapshotTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FolderSnapshotTests.java index 2d9875f6be..67c018933e 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/filewatch/FolderSnapshotTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FolderSnapshotTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.filewatch; +package org.springframework.boot.devtools.filewatch; import java.io.File; import java.io.IOException; @@ -24,7 +24,10 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; -import org.springframework.boot.developertools.filewatch.ChangedFile.Type; +import org.springframework.boot.devtools.filewatch.ChangedFile; +import org.springframework.boot.devtools.filewatch.ChangedFiles; +import org.springframework.boot.devtools.filewatch.FolderSnapshot; +import org.springframework.boot.devtools.filewatch.ChangedFile.Type; import org.springframework.util.FileCopyUtils; import static org.hamcrest.Matchers.equalTo; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/integrationtest/HttpTunnelIntegrationTest.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTest.java similarity index 79% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/integrationtest/HttpTunnelIntegrationTest.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTest.java index 653b2eff54..54fa6eaaa5 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/integrationtest/HttpTunnelIntegrationTest.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.integrationtest; +package org.springframework.boot.devtools.integrationtest; import java.util.Collection; import java.util.Collections; @@ -24,20 +24,20 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory; import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; -import org.springframework.boot.developertools.remote.server.AccessManager; -import org.springframework.boot.developertools.remote.server.Dispatcher; -import org.springframework.boot.developertools.remote.server.DispatcherFilter; -import org.springframework.boot.developertools.remote.server.HandlerMapper; -import org.springframework.boot.developertools.remote.server.UrlHandlerMapper; -import org.springframework.boot.developertools.tunnel.client.HttpTunnelConnection; -import org.springframework.boot.developertools.tunnel.client.TunnelClient; -import org.springframework.boot.developertools.tunnel.client.TunnelConnection; -import org.springframework.boot.developertools.tunnel.server.HttpTunnelServer; -import org.springframework.boot.developertools.tunnel.server.HttpTunnelServerHandler; -import org.springframework.boot.developertools.tunnel.server.PortProvider; -import org.springframework.boot.developertools.tunnel.server.SocketTargetServerConnection; -import org.springframework.boot.developertools.tunnel.server.StaticPortProvider; -import org.springframework.boot.developertools.tunnel.server.TargetServerConnection; +import org.springframework.boot.devtools.remote.server.AccessManager; +import org.springframework.boot.devtools.remote.server.Dispatcher; +import org.springframework.boot.devtools.remote.server.DispatcherFilter; +import org.springframework.boot.devtools.remote.server.HandlerMapper; +import org.springframework.boot.devtools.remote.server.UrlHandlerMapper; +import org.springframework.boot.devtools.tunnel.client.HttpTunnelConnection; +import org.springframework.boot.devtools.tunnel.client.TunnelClient; +import org.springframework.boot.devtools.tunnel.client.TunnelConnection; +import org.springframework.boot.devtools.tunnel.server.HttpTunnelServer; +import org.springframework.boot.devtools.tunnel.server.HttpTunnelServerHandler; +import org.springframework.boot.devtools.tunnel.server.PortProvider; +import org.springframework.boot.devtools.tunnel.server.SocketTargetServerConnection; +import org.springframework.boot.devtools.tunnel.server.StaticPortProvider; +import org.springframework.boot.devtools.tunnel.server.TargetServerConnection; import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.boot.test.TestRestTemplate; import org.springframework.boot.test.WebIntegrationTest; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/Base64EncoderTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/Base64EncoderTests.java similarity index 94% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/Base64EncoderTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/Base64EncoderTests.java index 5d802c3d0c..106b6d77d8 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/Base64EncoderTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/Base64EncoderTests.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package org.springframework.boot.developertools.livereload; +package org.springframework.boot.devtools.livereload; import org.junit.Test; +import org.springframework.boot.devtools.livereload.Base64Encoder; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/ConnectionInputStreamTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/ConnectionInputStreamTests.java similarity index 95% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/ConnectionInputStreamTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/ConnectionInputStreamTests.java index 38b84bbc58..a76f71424b 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/ConnectionInputStreamTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/ConnectionInputStreamTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.livereload; +package org.springframework.boot.devtools.livereload; import java.io.ByteArrayInputStream; import java.io.FilterInputStream; @@ -24,6 +24,7 @@ import java.io.InputStream; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.boot.devtools.livereload.ConnectionInputStream; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/ConnectionOutputStreamTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/ConnectionOutputStreamTests.java similarity index 94% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/ConnectionOutputStreamTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/ConnectionOutputStreamTests.java index 8aeea09d34..8ef5b0223a 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/ConnectionOutputStreamTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/ConnectionOutputStreamTests.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.developertools.livereload; +package org.springframework.boot.devtools.livereload; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.OutputStream; import org.junit.Test; +import org.springframework.boot.devtools.livereload.ConnectionOutputStream; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/FrameTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/FrameTests.java similarity index 96% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/FrameTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/FrameTests.java index e393389bf8..3bc172e366 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/FrameTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/FrameTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.livereload; +package org.springframework.boot.devtools.livereload; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -23,6 +23,8 @@ import java.util.Arrays; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.boot.devtools.livereload.ConnectionInputStream; +import org.springframework.boot.devtools.livereload.Frame; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/LiveReloadServerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/LiveReloadServerTests.java similarity index 96% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/LiveReloadServerTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/LiveReloadServerTests.java index f3a9de795c..6b0f242ef9 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/livereload/LiveReloadServerTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/LiveReloadServerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.livereload; +package org.springframework.boot.devtools.livereload; import java.io.IOException; import java.io.InputStream; @@ -36,6 +36,9 @@ import org.eclipse.jetty.websocket.common.events.JettyListenerEventDriver; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.springframework.boot.devtools.livereload.Connection; +import org.springframework.boot.devtools.livereload.ConnectionClosedException; +import org.springframework.boot.devtools.livereload.LiveReloadServer; import org.springframework.util.SocketUtils; import org.springframework.web.client.RestTemplate; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/ClassPathChangeUploaderTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/ClassPathChangeUploaderTests.java similarity index 86% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/ClassPathChangeUploaderTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/ClassPathChangeUploaderTests.java index 9a641a1027..a3f78e2a04 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/ClassPathChangeUploaderTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/ClassPathChangeUploaderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.client; +package org.springframework.boot.devtools.remote.client; import java.io.ByteArrayInputStream; import java.io.File; @@ -30,15 +30,16 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; -import org.springframework.boot.developertools.classpath.ClassPathChangedEvent; -import org.springframework.boot.developertools.filewatch.ChangedFile; -import org.springframework.boot.developertools.filewatch.ChangedFile.Type; -import org.springframework.boot.developertools.filewatch.ChangedFiles; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles.SourceFolder; -import org.springframework.boot.developertools.test.MockClientHttpRequestFactory; +import org.springframework.boot.devtools.classpath.ClassPathChangedEvent; +import org.springframework.boot.devtools.filewatch.ChangedFile; +import org.springframework.boot.devtools.filewatch.ChangedFiles; +import org.springframework.boot.devtools.filewatch.ChangedFile.Type; +import org.springframework.boot.devtools.remote.client.ClassPathChangeUploader; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles.SourceFolder; +import org.springframework.boot.devtools.test.MockClientHttpRequestFactory; import org.springframework.http.HttpStatus; import org.springframework.mock.http.client.MockClientHttpRequest; import org.springframework.util.FileCopyUtils; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/DelayedLiveReloadTriggerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/DelayedLiveReloadTriggerTests.java similarity index 95% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/DelayedLiveReloadTriggerTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/DelayedLiveReloadTriggerTests.java index c0378e5180..2644d0af21 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/DelayedLiveReloadTriggerTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/DelayedLiveReloadTriggerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.client; +package org.springframework.boot.devtools.remote.client; import java.io.IOException; import java.net.URI; @@ -25,7 +25,8 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.springframework.boot.developertools.autoconfigure.OptionalLiveReloadServer; +import org.springframework.boot.devtools.autoconfigure.OptionalLiveReloadServer; +import org.springframework.boot.devtools.remote.client.DelayedLiveReloadTrigger; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.client.ClientHttpRequest; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/HttpHeaderInterceptorTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/HttpHeaderInterceptorTests.java similarity index 96% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/HttpHeaderInterceptorTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/HttpHeaderInterceptorTests.java index c23665afc1..d5566911bd 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/HttpHeaderInterceptorTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/HttpHeaderInterceptorTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.client; +package org.springframework.boot.devtools.remote.client; import java.io.IOException; @@ -25,6 +25,7 @@ import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; +import org.springframework.boot.devtools.remote.client.HttpHeaderInterceptor; import org.springframework.http.HttpRequest; import org.springframework.http.client.ClientHttpRequestExecution; import org.springframework.http.client.ClientHttpResponse; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/LocalDebugPortAvailableConditionTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/LocalDebugPortAvailableConditionTests.java similarity index 94% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/LocalDebugPortAvailableConditionTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/LocalDebugPortAvailableConditionTests.java index f526312826..147cbb0db7 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/LocalDebugPortAvailableConditionTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/LocalDebugPortAvailableConditionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.client; +package org.springframework.boot.devtools.remote.client; import java.net.ServerSocket; @@ -63,7 +63,7 @@ public class LocalDebugPortAvailableConditionTests { private ConditionOutcome getOutcome() { MockEnvironment environment = new MockEnvironment(); EnvironmentTestUtils.addEnvironment(environment, - "spring.developertools.remote.debug.local-port:" + this.port); + "spring.devtools.remote.debug.local-port:" + this.port); ConditionContext context = mock(ConditionContext.class); given(context.getEnvironment()).willReturn(environment); ConditionOutcome outcome = this.condition.getMatchOutcome(context, null); diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/RemoteClientConfigurationTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/RemoteClientConfigurationTests.java similarity index 81% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/RemoteClientConfigurationTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/RemoteClientConfigurationTests.java index ccfb2b0f88..d6d4725ad9 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/client/RemoteClientConfigurationTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/RemoteClientConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.client; +package org.springframework.boot.devtools.remote.client; import java.io.IOException; import java.util.HashSet; @@ -29,17 +29,17 @@ import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; -import org.springframework.boot.developertools.autoconfigure.OptionalLiveReloadServer; -import org.springframework.boot.developertools.classpath.ClassPathChangedEvent; -import org.springframework.boot.developertools.classpath.ClassPathFileSystemWatcher; -import org.springframework.boot.developertools.filewatch.ChangedFiles; -import org.springframework.boot.developertools.livereload.LiveReloadServer; -import org.springframework.boot.developertools.remote.client.RemoteClientConfiguration.LiveReloadConfiguration; -import org.springframework.boot.developertools.remote.server.Dispatcher; -import org.springframework.boot.developertools.remote.server.DispatcherFilter; -import org.springframework.boot.developertools.restart.MockRestarter; -import org.springframework.boot.developertools.restart.RestartScopeInitializer; -import org.springframework.boot.developertools.tunnel.client.TunnelClient; +import org.springframework.boot.devtools.autoconfigure.OptionalLiveReloadServer; +import org.springframework.boot.devtools.classpath.ClassPathChangedEvent; +import org.springframework.boot.devtools.classpath.ClassPathFileSystemWatcher; +import org.springframework.boot.devtools.filewatch.ChangedFiles; +import org.springframework.boot.devtools.livereload.LiveReloadServer; +import org.springframework.boot.devtools.remote.client.RemoteClientConfiguration.LiveReloadConfiguration; +import org.springframework.boot.devtools.remote.server.Dispatcher; +import org.springframework.boot.devtools.remote.server.DispatcherFilter; +import org.springframework.boot.devtools.restart.MockRestarter; +import org.springframework.boot.devtools.restart.RestartScopeInitializer; +import org.springframework.boot.devtools.tunnel.client.TunnelClient; import org.springframework.boot.test.EnvironmentTestUtils; import org.springframework.boot.test.OutputCapture; import org.springframework.context.annotation.Bean; @@ -85,8 +85,8 @@ public class RemoteClientConfigurationTests { @Test public void warnIfDebugAndRestartDisabled() throws Exception { - configure("spring.developertools.remote.debug.enabled:false", - "spring.developertools.remote.restart.enabled:false"); + configure("spring.devtools.remote.debug.enabled:false", + "spring.devtools.remote.restart.enabled:false"); assertThat(this.output.toString(), containsString("Remote restart and debug are both disabled")); } @@ -126,21 +126,21 @@ public class RemoteClientConfigurationTests { @Test public void liveReloadDisabled() throws Exception { - configure("spring.developertools.livereload.enabled:false"); + configure("spring.devtools.livereload.enabled:false"); this.thrown.expect(NoSuchBeanDefinitionException.class); this.context.getBean(OptionalLiveReloadServer.class); } @Test public void remoteRestartDisabled() throws Exception { - configure("spring.developertools.remote.restart.enabled:false"); + configure("spring.devtools.remote.restart.enabled:false"); this.thrown.expect(NoSuchBeanDefinitionException.class); this.context.getBean(ClassPathFileSystemWatcher.class); } @Test public void remoteDebugDisabled() throws Exception { - configure("spring.developertools.remote.debug.enabled:false"); + configure("spring.devtools.remote.debug.enabled:false"); this.thrown.expect(NoSuchBeanDefinitionException.class); this.context.getBean(TunnelClient.class); } @@ -159,7 +159,7 @@ public class RemoteClientConfigurationTests { EnvironmentTestUtils.addEnvironment(this.context, pairs); if (setSecret) { EnvironmentTestUtils.addEnvironment(this.context, - "spring.developertools.remote.secret:secret"); + "spring.devtools.remote.secret:secret"); } this.context.refresh(); } diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/DispatcherFilterTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/DispatcherFilterTests.java similarity index 95% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/DispatcherFilterTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/DispatcherFilterTests.java index ac1c34ee37..4739938acc 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/DispatcherFilterTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/DispatcherFilterTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.server; +package org.springframework.boot.devtools.remote.server; import javax.servlet.FilterChain; import javax.servlet.ServletRequest; @@ -30,6 +30,8 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.springframework.boot.devtools.remote.server.Dispatcher; +import org.springframework.boot.devtools.remote.server.DispatcherFilter; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.http.server.ServletServerHttpRequest; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/DispatcherTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/DispatcherTests.java similarity index 93% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/DispatcherTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/DispatcherTests.java index 882754a938..03872d81ea 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/DispatcherTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/DispatcherTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.server; +package org.springframework.boot.devtools.remote.server; import java.util.Arrays; import java.util.Collections; @@ -27,6 +27,10 @@ import org.junit.rules.ExpectedException; import org.mockito.InOrder; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.springframework.boot.devtools.remote.server.AccessManager; +import org.springframework.boot.devtools.remote.server.Dispatcher; +import org.springframework.boot.devtools.remote.server.Handler; +import org.springframework.boot.devtools.remote.server.HandlerMapper; import org.springframework.core.Ordered; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/HttpHeaderAccessManagerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/HttpHeaderAccessManagerTests.java similarity index 96% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/HttpHeaderAccessManagerTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/HttpHeaderAccessManagerTests.java index 637f5e10f3..741dbd8285 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/HttpHeaderAccessManagerTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/HttpHeaderAccessManagerTests.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.server; +package org.springframework.boot.devtools.remote.server; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.boot.devtools.remote.server.HttpHeaderAccessManager; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/HttpStatusHandlerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/HttpStatusHandlerTests.java similarity index 95% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/HttpStatusHandlerTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/HttpStatusHandlerTests.java index 954e5a0b78..fb3e5221fa 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/HttpStatusHandlerTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/HttpStatusHandlerTests.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.server; +package org.springframework.boot.devtools.remote.server; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.boot.devtools.remote.server.HttpStatusHandler; import org.springframework.http.HttpStatus; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/UrlHandlerMapperTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/UrlHandlerMapperTests.java similarity index 93% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/UrlHandlerMapperTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/UrlHandlerMapperTests.java index deeba1c627..8bf8ccc635 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/remote/server/UrlHandlerMapperTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/server/UrlHandlerMapperTests.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package org.springframework.boot.developertools.remote.server; +package org.springframework.boot.devtools.remote.server; import javax.servlet.http.HttpServletRequest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.boot.devtools.remote.server.Handler; +import org.springframework.boot.devtools.remote.server.UrlHandlerMapper; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/ChangeableUrlsTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java similarity index 94% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/ChangeableUrlsTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java index c29338e837..cb246d56c5 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/ChangeableUrlsTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import java.io.File; import java.io.IOException; @@ -23,6 +23,7 @@ import java.net.URL; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; +import org.springframework.boot.devtools.restart.ChangeableUrls; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/DefaultRestartInitializerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/DefaultRestartInitializerTests.java similarity index 96% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/DefaultRestartInitializerTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/DefaultRestartInitializerTests.java index c7b899e2c6..1afe961dc7 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/DefaultRestartInitializerTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/DefaultRestartInitializerTests.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import java.net.URL; import org.junit.Test; +import org.springframework.boot.devtools.restart.DefaultRestartInitializer; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.not; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/MainMethodTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MainMethodTests.java similarity index 96% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/MainMethodTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MainMethodTests.java index 6e203e6a62..656586f1bc 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/MainMethodTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MainMethodTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import java.lang.reflect.Method; @@ -22,6 +22,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.boot.devtools.restart.MainMethod; import org.springframework.util.ReflectionUtils; import static org.hamcrest.Matchers.equalTo; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/MockRestartInitializer.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MockRestartInitializer.java similarity index 87% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/MockRestartInitializer.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MockRestartInitializer.java index 38a289804e..d7f8ea3512 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/MockRestartInitializer.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MockRestartInitializer.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import java.net.URL; -import org.springframework.boot.developertools.restart.RestartInitializer; +import org.springframework.boot.devtools.restart.RestartInitializer; /** * Simple mock {@link RestartInitializer} that returns an empty array of URLs. diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/MockRestarter.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MockRestarter.java similarity index 96% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/MockRestarter.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MockRestarter.java index f13a3f4334..e23a8c07d3 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/MockRestarter.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MockRestarter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import java.net.URL; import java.util.HashMap; @@ -27,6 +27,7 @@ import org.junit.runners.model.Statement; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.springframework.beans.factory.ObjectFactory; +import org.springframework.boot.devtools.restart.Restarter; import static org.mockito.BDDMockito.given; import static org.mockito.Matchers.any; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/OnInitializedRestarterConditionTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/OnInitializedRestarterConditionTests.java similarity index 89% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/OnInitializedRestarterConditionTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/OnInitializedRestarterConditionTests.java index fb3d4f12e9..7e55bb825b 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/OnInitializedRestarterConditionTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/OnInitializedRestarterConditionTests.java @@ -14,13 +14,17 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import java.net.URL; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.springframework.boot.devtools.restart.ConditionalOnInitializedRestarter; +import org.springframework.boot.devtools.restart.OnInitializedRestarterCondition; +import org.springframework.boot.devtools.restart.RestartInitializer; +import org.springframework.boot.devtools.restart.Restarter; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/RestartApplicationListenerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartApplicationListenerTests.java similarity index 93% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/RestartApplicationListenerTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartApplicationListenerTests.java index ab91a120fe..647d312713 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/RestartApplicationListenerTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartApplicationListenerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import org.junit.After; import org.junit.Before; @@ -23,6 +23,8 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.context.event.ApplicationFailedEvent; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.boot.context.event.ApplicationStartedEvent; +import org.springframework.boot.devtools.restart.RestartApplicationListener; +import org.springframework.boot.devtools.restart.Restarter; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.Ordered; import org.springframework.test.util.ReflectionTestUtils; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/RestartScopeInitializerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartScopeInitializerTests.java similarity index 92% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/RestartScopeInitializerTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartScopeInitializerTests.java index 943f55d41e..9a7aaac3a0 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/RestartScopeInitializerTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestartScopeInitializerTests.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; import org.springframework.boot.SpringApplication; +import org.springframework.boot.devtools.restart.RestartScope; +import org.springframework.boot.devtools.restart.RestartScopeInitializer; import org.springframework.context.ApplicationListener; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/RestarterTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestarterTests.java similarity index 95% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/RestarterTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestarterTests.java index 4fe5251f92..ad84e6d687 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/RestarterTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/RestarterTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import java.net.URL; import java.net.URLClassLoader; @@ -29,9 +29,11 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.beans.BeansException; import org.springframework.beans.factory.ObjectFactory; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles; +import org.springframework.boot.devtools.restart.RestartInitializer; +import org.springframework.boot.devtools.restart.Restarter; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind; import org.springframework.boot.test.OutputCapture; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.scheduling.annotation.EnableScheduling; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/SilentExitExceptionHandlerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/SilentExitExceptionHandlerTests.java similarity index 94% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/SilentExitExceptionHandlerTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/SilentExitExceptionHandlerTests.java index 7ee703ab88..14eba4ffd4 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/SilentExitExceptionHandlerTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/SilentExitExceptionHandlerTests.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart; +package org.springframework.boot.devtools.restart; import org.junit.Test; +import org.springframework.boot.devtools.restart.SilentExitExceptionHandler; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFileTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileTests.java similarity index 91% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFileTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileTests.java index 0e3e772bbd..ea146b74b0 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFileTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFileTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.classloader; +package org.springframework.boot.devtools.restart.classloader; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFilesTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFilesTests.java similarity index 94% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFilesTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFilesTests.java index 952731945d..16f9cd5fe5 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/ClassLoaderFilesTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFilesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.classloader; +package org.springframework.boot.devtools.restart.classloader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -27,8 +27,10 @@ import java.util.Iterator; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles.SourceFolder; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles.SourceFolder; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/RestartClassLoaderTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java similarity index 95% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/RestartClassLoaderTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java index ff09265364..b7365ab4ec 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/RestartClassLoaderTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.classloader; +package org.springframework.boot.devtools.restart.classloader; import java.io.File; import java.io.FileOutputStream; @@ -34,7 +34,10 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles; +import org.springframework.boot.devtools.restart.classloader.RestartClassLoader; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind; import org.springframework.util.FileCopyUtils; import org.springframework.util.StreamUtils; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/Sample.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/Sample.java similarity index 91% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/Sample.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/Sample.java index ba80dea846..499c943d74 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/Sample.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/Sample.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.classloader; +package org.springframework.boot.devtools.restart.classloader; /** * A sample class used to test reloading. diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/SampleParent.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/SampleParent.java similarity index 91% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/SampleParent.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/SampleParent.java index 7d53252954..7ba78ca29b 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/classloader/SampleParent.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/SampleParent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.classloader; +package org.springframework.boot.devtools.restart.classloader; /** * A sample class used to test reloading. diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/server/DefaultSourceFolderUrlFilterTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/DefaultSourceFolderUrlFilterTests.java similarity index 95% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/server/DefaultSourceFolderUrlFilterTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/DefaultSourceFolderUrlFilterTests.java index 5e529f34be..89475eeb8b 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/server/DefaultSourceFolderUrlFilterTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/DefaultSourceFolderUrlFilterTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.server; +package org.springframework.boot.devtools.restart.server; import java.net.MalformedURLException; import java.net.URL; @@ -23,6 +23,7 @@ import java.util.Collections; import java.util.List; import org.junit.Test; +import org.springframework.boot.devtools.restart.server.DefaultSourceFolderUrlFilter; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/server/HttpRestartServerHandlerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/HttpRestartServerHandlerTests.java similarity index 88% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/server/HttpRestartServerHandlerTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/HttpRestartServerHandlerTests.java index a184fdfd03..12c17cf095 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/server/HttpRestartServerHandlerTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/HttpRestartServerHandlerTests.java @@ -14,11 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.server; +package org.springframework.boot.devtools.restart.server; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.boot.devtools.restart.server.HttpRestartServer; +import org.springframework.boot.devtools.restart.server.HttpRestartServerHandler; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/server/HttpRestartServerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/HttpRestartServerTests.java similarity index 88% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/server/HttpRestartServerTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/HttpRestartServerTests.java index 651530559d..05afc643a8 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/server/HttpRestartServerTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/HttpRestartServerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.server; +package org.springframework.boot.devtools.restart.server; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -28,9 +28,12 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind; +import org.springframework.boot.devtools.restart.server.HttpRestartServer; +import org.springframework.boot.devtools.restart.server.RestartServer; +import org.springframework.boot.devtools.restart.server.SourceFolderUrlFilter; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.http.server.ServletServerHttpResponse; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/server/RestartServerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/RestartServerTests.java similarity index 90% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/server/RestartServerTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/RestartServerTests.java index 73fe86c550..d529053d68 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/restart/server/RestartServerTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/RestartServerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.restart.server; +package org.springframework.boot.devtools.restart.server; import java.io.File; import java.io.FileOutputStream; @@ -28,9 +28,12 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFile.Kind; -import org.springframework.boot.developertools.restart.classloader.ClassLoaderFiles; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFiles; +import org.springframework.boot.devtools.restart.classloader.ClassLoaderFile.Kind; +import org.springframework.boot.devtools.restart.server.DefaultSourceFolderUrlFilter; +import org.springframework.boot.devtools.restart.server.RestartServer; +import org.springframework.boot.devtools.restart.server.SourceFolderUrlFilter; import org.springframework.util.FileCopyUtils; import static org.hamcrest.Matchers.equalTo; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/test/MockClientHttpRequestFactory.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/test/MockClientHttpRequestFactory.java similarity index 98% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/test/MockClientHttpRequestFactory.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/test/MockClientHttpRequestFactory.java index d9508e5c56..f8f822fe76 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/test/MockClientHttpRequestFactory.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/test/MockClientHttpRequestFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.test; +package org.springframework.boot.devtools.test; import java.io.IOException; import java.net.URI; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/client/HttpTunnelConnectionTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/client/HttpTunnelConnectionTests.java similarity index 94% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/client/HttpTunnelConnectionTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/client/HttpTunnelConnectionTests.java index 718c83286c..73793da148 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/client/HttpTunnelConnectionTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/client/HttpTunnelConnectionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.client; +package org.springframework.boot.devtools.tunnel.client; import java.io.ByteArrayOutputStream; import java.io.Closeable; @@ -30,8 +30,9 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.springframework.boot.developertools.test.MockClientHttpRequestFactory; -import org.springframework.boot.developertools.tunnel.client.HttpTunnelConnection.TunnelChannel; +import org.springframework.boot.devtools.test.MockClientHttpRequestFactory; +import org.springframework.boot.devtools.tunnel.client.HttpTunnelConnection; +import org.springframework.boot.devtools.tunnel.client.HttpTunnelConnection.TunnelChannel; import org.springframework.http.HttpStatus; import org.springframework.util.SocketUtils; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/client/TunnelClientTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/client/TunnelClientTests.java similarity index 95% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/client/TunnelClientTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/client/TunnelClientTests.java index 2f9acbc6b1..e6c696dcb3 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/client/TunnelClientTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/client/TunnelClientTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.client; +package org.springframework.boot.devtools.tunnel.client; import java.io.ByteArrayOutputStream; import java.io.Closeable; @@ -28,6 +28,9 @@ import java.nio.channels.WritableByteChannel; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.boot.devtools.tunnel.client.TunnelClient; +import org.springframework.boot.devtools.tunnel.client.TunnelClientListener; +import org.springframework.boot.devtools.tunnel.client.TunnelConnection; import org.springframework.util.SocketUtils; import static org.hamcrest.Matchers.equalTo; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/payload/HttpTunnelPayloadForwarderTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadForwarderTests.java similarity index 92% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/payload/HttpTunnelPayloadForwarderTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadForwarderTests.java index 260edf30b8..28d007b78f 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/payload/HttpTunnelPayloadForwarderTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadForwarderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.payload; +package org.springframework.boot.devtools.tunnel.payload; import java.io.ByteArrayOutputStream; import java.nio.ByteBuffer; @@ -24,6 +24,8 @@ import java.nio.channels.WritableByteChannel; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.boot.devtools.tunnel.payload.HttpTunnelPayload; +import org.springframework.boot.devtools.tunnel.payload.HttpTunnelPayloadForwarder; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/payload/HttpTunnelPayloadTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadTests.java similarity index 97% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/payload/HttpTunnelPayloadTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadTests.java index 3d6d5f93d1..e842a010c5 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/payload/HttpTunnelPayloadTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.payload; +package org.springframework.boot.devtools.tunnel.payload; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -28,6 +28,7 @@ import java.nio.channels.WritableByteChannel; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.boot.devtools.tunnel.payload.HttpTunnelPayload; import org.springframework.http.HttpInputMessage; import org.springframework.http.HttpOutputMessage; import org.springframework.http.server.ServletServerHttpRequest; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/server/HttpTunnelServerHandlerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerHandlerTests.java similarity index 89% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/server/HttpTunnelServerHandlerTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerHandlerTests.java index 6b392b37e2..f46b8ed380 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/server/HttpTunnelServerHandlerTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerHandlerTests.java @@ -14,11 +14,13 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.server; +package org.springframework.boot.devtools.tunnel.server; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.boot.devtools.tunnel.server.HttpTunnelServer; +import org.springframework.boot.devtools.tunnel.server.HttpTunnelServerHandler; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/server/HttpTunnelServerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerTests.java similarity index 97% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/server/HttpTunnelServerTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerTests.java index ff5601ed03..8608fb8a7b 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/server/HttpTunnelServerTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.server; +package org.springframework.boot.devtools.tunnel.server; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -35,8 +35,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.springframework.boot.developertools.tunnel.payload.HttpTunnelPayload; -import org.springframework.boot.developertools.tunnel.server.HttpTunnelServer.HttpConnection; +import org.springframework.boot.devtools.tunnel.payload.HttpTunnelPayload; +import org.springframework.boot.devtools.tunnel.server.HttpTunnelServer; +import org.springframework.boot.devtools.tunnel.server.TargetServerConnection; +import org.springframework.boot.devtools.tunnel.server.HttpTunnelServer.HttpConnection; import org.springframework.http.HttpStatus; import org.springframework.http.server.ServerHttpAsyncRequestControl; import org.springframework.http.server.ServerHttpRequest; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/server/SocketTargetServerConnectionTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/SocketTargetServerConnectionTests.java similarity index 95% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/server/SocketTargetServerConnectionTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/SocketTargetServerConnectionTests.java index e0032a9ac8..220cc11900 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/server/SocketTargetServerConnectionTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/SocketTargetServerConnectionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.server; +package org.springframework.boot.devtools.tunnel.server; import java.io.IOException; import java.net.InetSocketAddress; @@ -26,6 +26,8 @@ import java.nio.channels.SocketChannel; import org.junit.Before; import org.junit.Test; +import org.springframework.boot.devtools.tunnel.server.SocketTargetServerConnection; +import org.springframework.boot.devtools.tunnel.server.StaticPortProvider; import org.springframework.util.SocketUtils; import static org.hamcrest.Matchers.equalTo; diff --git a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/server/StaticPortProviderTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/StaticPortProviderTests.java similarity index 91% rename from spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/server/StaticPortProviderTests.java rename to spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/StaticPortProviderTests.java index 88d5c8ab12..e6f2511bdc 100644 --- a/spring-boot-developer-tools/src/test/java/org/springframework/boot/developertools/tunnel/server/StaticPortProviderTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/StaticPortProviderTests.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.developertools.tunnel.server; +package org.springframework.boot.devtools.tunnel.server; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.boot.devtools.tunnel.server.StaticPortProvider; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-boot-developer-tools/src/test/resources/org/springframework/boot/developertools/restart/classloader/Parent.txt b/spring-boot-devtools/src/test/resources/org/springframework/boot/devtools/restart/classloader/Parent.txt similarity index 100% rename from spring-boot-developer-tools/src/test/resources/org/springframework/boot/developertools/restart/classloader/Parent.txt rename to spring-boot-devtools/src/test/resources/org/springframework/boot/devtools/restart/classloader/Parent.txt diff --git a/spring-boot-full-build/pom.xml b/spring-boot-full-build/pom.xml index 218ac234d2..87714aa5fd 100644 --- a/spring-boot-full-build/pom.xml +++ b/spring-boot-full-build/pom.xml @@ -51,7 +51,7 @@ ../spring-boot ../spring-boot-autoconfigure ../spring-boot-actuator - ../spring-boot-developer-tools + ../spring-boot-devtools ../spring-boot-starters ../spring-boot-cli ../spring-boot-samples diff --git a/spring-boot-samples/pom.xml b/spring-boot-samples/pom.xml index 7fbb6b84c7..86da1a0274 100644 --- a/spring-boot-samples/pom.xml +++ b/spring-boot-samples/pom.xml @@ -38,7 +38,7 @@ spring-boot-sample-data-redis spring-boot-sample-data-rest spring-boot-sample-data-solr - spring-boot-sample-developer-tools + spring-boot-sample-devtools spring-boot-sample-flyway spring-boot-sample-hateoas spring-boot-sample-hornetq diff --git a/spring-boot-samples/spring-boot-sample-developer-tools/pom.xml b/spring-boot-samples/spring-boot-sample-devtools/pom.xml similarity index 93% rename from spring-boot-samples/spring-boot-sample-developer-tools/pom.xml rename to spring-boot-samples/spring-boot-sample-devtools/pom.xml index dc074080eb..6416e47cb8 100644 --- a/spring-boot-samples/spring-boot-sample-developer-tools/pom.xml +++ b/spring-boot-samples/spring-boot-sample-devtools/pom.xml @@ -8,7 +8,7 @@ spring-boot-samples 1.3.0.BUILD-SNAPSHOT - spring-boot-sample-developer-tools + spring-boot-sample-devtools Spring Boot Developer Tools Sample Spring Boot Developer Tools Sample http://projects.spring.io/spring-boot/ @@ -30,7 +30,7 @@ org.springframework.boot - spring-boot-developer-tools + spring-boot-devtools org.springframework.boot diff --git a/spring-boot-samples/spring-boot-sample-developer-tools/src/main/java/demo/Message.java b/spring-boot-samples/spring-boot-sample-devtools/src/main/java/demo/Message.java similarity index 100% rename from spring-boot-samples/spring-boot-sample-developer-tools/src/main/java/demo/Message.java rename to spring-boot-samples/spring-boot-sample-devtools/src/main/java/demo/Message.java diff --git a/spring-boot-samples/spring-boot-sample-developer-tools/src/main/java/demo/MyController.java b/spring-boot-samples/spring-boot-sample-devtools/src/main/java/demo/MyController.java similarity index 100% rename from spring-boot-samples/spring-boot-sample-developer-tools/src/main/java/demo/MyController.java rename to spring-boot-samples/spring-boot-sample-devtools/src/main/java/demo/MyController.java diff --git a/spring-boot-samples/spring-boot-sample-developer-tools/src/main/java/demo/SampleDeveloperToolsApplication.java b/spring-boot-samples/spring-boot-sample-devtools/src/main/java/demo/SampleDevToolsApplication.java similarity index 85% rename from spring-boot-samples/spring-boot-sample-developer-tools/src/main/java/demo/SampleDeveloperToolsApplication.java rename to spring-boot-samples/spring-boot-sample-devtools/src/main/java/demo/SampleDevToolsApplication.java index f0e462b6a6..9a9cca90d6 100644 --- a/spring-boot-samples/spring-boot-sample-developer-tools/src/main/java/demo/SampleDeveloperToolsApplication.java +++ b/spring-boot-samples/spring-boot-sample-devtools/src/main/java/demo/SampleDevToolsApplication.java @@ -21,10 +21,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration.WebMvcAutoConfigurationAdapter; @SpringBootApplication -public class SampleDeveloperToolsApplication extends WebMvcAutoConfigurationAdapter { +public class SampleDevToolsApplication extends WebMvcAutoConfigurationAdapter { public static void main(String[] args) { - SpringApplication.run(SampleDeveloperToolsApplication.class, args); + SpringApplication.run(SampleDevToolsApplication.class, args); } } diff --git a/spring-boot-samples/spring-boot-sample-developer-tools/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/application.properties similarity index 100% rename from spring-boot-samples/spring-boot-sample-developer-tools/src/main/resources/application.properties rename to spring-boot-samples/spring-boot-sample-devtools/src/main/resources/application.properties diff --git a/spring-boot-samples/spring-boot-sample-developer-tools/src/main/resources/static/css/application.css b/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/static/css/application.css similarity index 100% rename from spring-boot-samples/spring-boot-sample-developer-tools/src/main/resources/static/css/application.css rename to spring-boot-samples/spring-boot-sample-devtools/src/main/resources/static/css/application.css diff --git a/spring-boot-samples/spring-boot-sample-developer-tools/src/main/resources/templates/hello.html b/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/hello.html similarity index 100% rename from spring-boot-samples/spring-boot-sample-developer-tools/src/main/resources/templates/hello.html rename to spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/hello.html diff --git a/spring-boot-samples/spring-boot-sample-developer-tools/src/main/resources/templates/layout.html b/spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/layout.html similarity index 100% rename from spring-boot-samples/spring-boot-sample-developer-tools/src/main/resources/templates/layout.html rename to spring-boot-samples/spring-boot-sample-devtools/src/main/resources/templates/layout.html