Remove Devtools remote debugging support

See gh-9489

Author: snicoll

Diff for: spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteSpringApplication.java

@@ -38,10 +38,9 @@
 
 /**
  * Application that can be used to establish a link to remotely running Spring Boot code.
- * Allows remote debugging and remote updates (if enabled). This class should be launched
- * from within your IDE and should have the same classpath configuration as the locally
- * developed application. The remote URL of the application should be provided as a
- * non-option argument.
+ * Allows remote updates (if enabled). This class should be launched from within your IDE
+ * and should have the same classpath configuration as the locally developed application.
+ * The remote URL of the application should be provided as a non-option argument.
  *
  * @author Phillip Webb
  * @since 1.3.0

Diff for: spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java

@@ -24,7 +24,6 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -45,10 +44,6 @@
 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.core.annotation.Order;
@@ -148,39 +143,6 @@ public UrlHandlerMapper remoteRestartHandlerMapper(HttpRestartServer server) {
 
 	}
 
-	/**
-	 * Configuration for remote debug HTTP tunneling.
-	 */
-	@ConditionalOnProperty(prefix = "spring.devtools.remote.debug", name = "enabled", matchIfMissing = true)
-	static class RemoteDebugTunnelConfiguration {
-
-		@Autowired
-		private DevToolsProperties properties;
-
-		@Autowired
-		private ServerProperties serverProperties;
-
-		@Bean
-		@ConditionalOnMissingBean(name = "remoteDebugHandlerMapper")
-		public UrlHandlerMapper remoteDebugHandlerMapper(
-				@Qualifier("remoteDebugHttpTunnelServer") HttpTunnelServer server) {
-			String url = (this.serverProperties.getServlet().getContextPath() == null ? ""
-					: this.serverProperties.getServlet().getContextPath())
-					+ this.properties.getRemote().getContextPath() + "/debug";
-			logger.warn("Listening for remote debug traffic on " + url);
-			Handler handler = new HttpTunnelServerHandler(server);
-			return new UrlHandlerMapper(url, handler);
-		}
-
-		@Bean
-		@ConditionalOnMissingBean(name = "remoteDebugHttpTunnelServer")
-		public HttpTunnelServer remoteDebugHttpTunnelServer() {
-			return new HttpTunnelServer(
-					new SocketTargetServerConnection(new RemoteDebugPortProvider()));
-		}
-
-	}
-
 	@Configuration
 	@ConditionalOnClass(WebSecurityConfigurerAdapter.class)
 	@ConditionalOnBean(ObjectPostProcessor.class)

Diff for: spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -48,8 +48,6 @@ public class RemoteDevToolsProperties {
 
 	private Restart restart = new Restart();
 
-	private Debug debug = new Debug();
-
 	private Proxy proxy = new Proxy();
 
 	public String getContextPath() {
@@ -80,10 +78,6 @@ public Restart getRestart() {
 		return this.restart;
 	}
 
-	public Debug getDebug() {
-		return this.debug;
-	}
-
 	public Proxy getProxy() {
 		return this.proxy;
 	}
@@ -105,38 +99,6 @@ public void setEnabled(boolean enabled) {
 
 	}
 
-	public static class Debug {
-
-		public static final Integer DEFAULT_LOCAL_PORT = 8000;
-
-		/**
-		 * Enable remote debug support.
-		 */
-		private boolean enabled = true;
-
-		/**
-		 * Local remote debug server port.
-		 */
-		private int localPort = DEFAULT_LOCAL_PORT;
-
-		public boolean isEnabled() {
-			return this.enabled;
-		}
-
-		public void setEnabled(boolean enabled) {
-			this.enabled = enabled;
-		}
-
-		public int getLocalPort() {
-			return this.localPort;
-		}
-
-		public void setLocalPort(int localPort) {
-			this.localPort = localPort;
-		}
-
-	}
-
 	public static class Proxy {
 
 		/**

Diff for: spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/LocalDebugPortAvailableCondition.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -25,14 +25,12 @@
 import java.util.concurrent.Executors;
 
 import javax.annotation.PostConstruct;
-import javax.servlet.Filter;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-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;
@@ -52,11 +50,7 @@
 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;
 import org.springframework.context.event.EventListener;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
@@ -120,9 +114,8 @@ private ClientHttpRequestInterceptor getSecurityInterceptor() {
 	@PostConstruct
 	private void logWarnings() {
 		RemoteDevToolsProperties remoteProperties = this.properties.getRemote();
-		if (!remoteProperties.getDebug().isEnabled()
-				&& !remoteProperties.getRestart().isEnabled()) {
-			logger.warn("Remote restart and debug are both disabled.");
+		if (!remoteProperties.getRestart().isEnabled()) {
+			logger.warn("Remote restart is disabled.");
 		}
 		if (!this.remoteUrl.startsWith("https://")) {
 			logger.warn("The connection to " + this.remoteUrl
@@ -239,32 +232,4 @@ public ClassPathChangeUploader classPathChangeUploader(
 
 	}
 
-	/**
-	 * Client configuration for remote debug HTTP tunneling.
-	 */
-	@ConditionalOnProperty(prefix = "spring.devtools.remote.debug", name = "enabled", matchIfMissing = true)
-	@ConditionalOnClass(Filter.class)
-	@Conditional(LocalDebugPortAvailableCondition.class)
-	static class RemoteDebugTunnelClientConfiguration {
-
-		@Autowired
-		private DevToolsProperties properties;
-
-		@Value("${remoteUrl}")
-		private String remoteUrl;
-
-		@Bean
-		public TunnelClient remoteDebugTunnelClient(
-				ClientHttpRequestFactory requestFactory) {
-			RemoteDevToolsProperties remoteProperties = this.properties.getRemote();
-			String url = this.remoteUrl + remoteProperties.getContextPath() + "/debug";
-			TunnelConnection connection = new HttpTunnelConnection(url, requestFactory);
-			int localPort = remoteProperties.getDebug().getLocalPort();
-			TunnelClient client = new TunnelClient(localPort, connection);
-			client.addListener(new LoggingTunnelClientListener());
-			return client;
-		}
-
-	}
-
 }

Diff for: spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/LoggingTunnelClientListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -196,12 +196,6 @@ private void handleResponse(ClientHttpResponse response) throws IOException {
 				close();
 				return;
 			}
-			if (response.getStatusCode() == HttpStatus.SERVICE_UNAVAILABLE) {
-				logger.warn("Remote application responded with service unavailable. Did "
-						+ "you forget to start it with remote debugging enabled?");
-				close();
-				return;
-			}
 			if (response.getStatusCode() == HttpStatus.OK) {
 				HttpTunnelPayload payload = HttpTunnelPayload.get(response);
 				if (payload != null) {

Diff for: spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/RemoteClientConfiguration.java

@@ -158,9 +158,6 @@ protected void handle(HttpConnection httpConnection) throws IOException {
 		catch (ConnectException ex) {
 			httpConnection.respond(HttpStatus.GONE);
 		}
-		catch (RemoteDebugNotRunningException ex) {
-			httpConnection.respond(HttpStatus.SERVICE_UNAVAILABLE);
-		}
 	}
 
 	/**