From 3feb03718870d7ffc06473e2a986ce200ddebdbb Mon Sep 17 00:00:00 2001
From: Martin Lippert <mlippert@pivotal.io>
Date: Fri, 2 Feb 2018 09:16:42 +0100
Subject: [PATCH] adopted latest lsp4e api changes further since they are now
 in lsp4e 0.5.x snapshot builds

---
 .../java/ls/DelegatingStreamConnectionProvider.java  |  8 +++++---
 .../ls/SpringBootJavaLanguageServerViaSocket.java    | 12 ++++++------
 .../STS4LanguageServerProcessStreamConnector.java    |  8 +-------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/DelegatingStreamConnectionProvider.java b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/DelegatingStreamConnectionProvider.java
index 42560aa5e..077b17a1d 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/DelegatingStreamConnectionProvider.java
+++ b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/DelegatingStreamConnectionProvider.java
@@ -83,6 +83,11 @@ public class DelegatingStreamConnectionProvider implements StreamConnectionProvi
 		return this.provider.getOutputStream();
 	}
 
+	@Override
+	public InputStream getErrorStream() {
+		return provider.getErrorStream();
+	}
+
 	@Override
 	public void stop() {
 		this.provider.stop();
@@ -125,7 +130,4 @@ public class DelegatingStreamConnectionProvider implements StreamConnectionProvi
 		this.languageServer.getWorkspaceService().didChangeConfiguration(new DidChangeConfigurationParams(settings));
 	}
 
-	public InputStream getErrorStream() {
-		return provider.getErrorStream();
-	}
 }
diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServerViaSocket.java b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServerViaSocket.java
index a4bc71e61..be0b69cef 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServerViaSocket.java
+++ b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServerViaSocket.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017 Pivotal, Inc.
+ * Copyright (c) 2017, 2018 Pivotal, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -50,6 +50,11 @@ public class SpringBootJavaLanguageServerViaSocket implements StreamConnectionPr
 		return outputStream;
 	}
 
+	@Override
+	public InputStream getErrorStream() {
+		return null;
+	}
+
 	@Override
 	public void stop() {
 		if (socket != null) {
@@ -61,9 +66,4 @@ public class SpringBootJavaLanguageServerViaSocket implements StreamConnectionPr
 		}
 	}
 
-	public InputStream getErrorStream() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
 }
diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java
index cd49fea06..e87d0a0ac 100644
--- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java
+++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/src/org/springframework/tooling/ls/eclipse/commons/STS4LanguageServerProcessStreamConnector.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017 Pivotal, Inc.
+ * Copyright (c) 2017, 2018 Pivotal, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -101,12 +101,6 @@ public class STS4LanguageServerProcessStreamConnector extends ProcessStreamConne
 		return super.getErrorStream();
 	}
  	
-	//@Override Don't put the @Override to allow compiling with older lps4e api
-	public InputStream getErrorStream() {
-		// lsp4e doesn't do anything with it. So don't pass it on. (Once they do start reading it it might actually break us otherwise)
-		return null; 
-	}
-	
 	@Override
 	public void stop() {
 		super.stop();