From c0c2d7588d85e4ac398c504e2527713eec01b83c Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 25 Oct 2017 10:49:40 -0700 Subject: [PATCH 1/8] Make SpringBootAppTest run for several test targets - Boot 1.5 fatjar - Boot 2.0 fatjar - Boot 2.0 thinjar --- .../boot/app/cli/SpringBootAppTest.java | 178 +++++++++++------- 1 file changed, 114 insertions(+), 64 deletions(-) diff --git a/headless-services/commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootAppTest.java b/headless-services/commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootAppTest.java index 3247697de..bc08c745e 100644 --- a/headless-services/commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootAppTest.java +++ b/headless-services/commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootAppTest.java @@ -12,48 +12,67 @@ package org.springframework.ide.vscode.commons.boot.app.cli; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.File; import java.net.URL; import java.time.Duration; +import java.util.Arrays; +import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.stream.Collectors; import org.json.JSONObject; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.springframework.ide.vscode.commons.util.AsyncProcess; +import org.springframework.ide.vscode.commons.util.ExceptionUtil; import org.springframework.ide.vscode.commons.util.ExternalCommand; import org.springframework.ide.vscode.commons.util.StringUtil; import org.springframework.ide.vscode.commons.util.test.ACondition; import com.google.common.collect.ImmutableList; +import junit.framework.AssertionFailedError; + public class SpringBootAppTest { // private static final String appName = "actuator-client-15-test-subject"; // Boot 1.5 test app - private static final String appName = "actuator-client-20-test-subject"; //Boot 2.0 test app -// private static final String appName = "actuator-client-20-thin-test-subject"; //Boot 2.0 test app with THIN launcher + private static final String[] appNames = { + "actuator-client-20-test-subject", //Boot 2.0 test app + "actuator-client-20-thin-test-subject", // Like the Boot 2.0 app, but packaged with thin launcher instead of fatjar + "actuator-client-15-test-subject" // Boot 1.5 test app + //Note there is a practical limit to how many test apps you can add here because all are run simultaneously. + }; - private static final Duration TIMEOUT = Duration.ofSeconds(30); // in CI build starting the app takes longer than 10s sometimes. - //Output from CI build: Started ActuatorClientTestSubjectApplication in 22.962 seconds (JVM running for 26.028) + private static final Duration TIMEOUT = Duration.ofSeconds(60); // in CI build starting the app takes a while, starting several in parallel takes even longer private static final List TEST_PROFILES = ImmutableList.of("testing", "funny", "cameleon"); - private static AsyncProcess testAppRunner; - private static SpringBootApp testApp; + private static List testAppRunners; @BeforeClass public static void setupClass() throws Exception { - testAppRunner = startTestApplication(SpringBootAppTest.class.getResource("/"+appName+"-0.0.1-SNAPSHOT.jar")); - ACondition.waitFor(TIMEOUT, () -> { - testApp = getAppContaining(appName); - assertNotNull(testApp); - }); + testAppRunners = Arrays.asList(appNames).stream().map(appName -> { + try { + return startTestApplication(SpringBootAppTest.class.getResource("/"+appName+"-0.0.1-SNAPSHOT.jar")); + } catch (Exception e) { + throw ExceptionUtil.unchecked(e); + } + }) + .collect(Collectors.toList()); + } + + @AfterClass + public static void tearDownClass() throws Exception { + for (AsyncProcess process : testAppRunners) { + process.kill(); + } + testAppRunners = null; } private static AsyncProcess startTestApplication(URL jarUrl) throws Exception { @@ -71,95 +90,126 @@ public class SpringBootAppTest { ); } - private static SpringBootApp getAppContaining(String nameFragment) throws Exception { - return SpringBootApp.getAllRunningJavaApps().values().stream().filter(app -> app.getProcessName().contains(nameFragment)).findAny().get(); + private SpringBootApp getAppContaining(String nameFragment) { + try { + return SpringBootApp.getAllRunningJavaApps().values().stream().filter(app -> app.getProcessName().contains(nameFragment)).findAny().get(); + } catch (Exception e) { + throw ExceptionUtil.unchecked(e); + } } - @AfterClass - public static void tearDownClass() throws Exception { - testAppRunner.kill(); + @Ignore @Test public void dumpJvmInfo() throws Exception { + //Ignored because this test may have timing issues. Still useful to + // run locally and inspect dump results, but may need some tweaking. + for (String appName : appNames) { + SpringBootApp testApp = getAppContaining(appName); + testApp.dumpJvmInfo(); + System.out.println("======================================"); + } } - @Test - public void getAllJavaApps() throws Exception { + @Test public void getAllJavaApps() throws Exception { Map allApps = SpringBootApp.getAllRunningJavaApps(); - Optional myProcess = allApps.values().stream().filter(app -> app.getProcessName().contains(appName)).findAny(); - assertTrue(myProcess.isPresent()); - } - - @Test public void dumpJvmInfo() throws Exception { - ACondition.waitFor(TIMEOUT, this::getRequestMappings); - testApp.dumpJvmInfo(); -// SpringBootApp app = getAppContaining("language-server.jar"); -// app.dumpJvmInfo(); + for (String appName : appNames) { + Optional myProcess = allApps.values().stream().filter(app -> app.getProcessName().contains(appName)).findAny(); + assertTrue(appName, myProcess.isPresent()); + } } @Test public void getAllBootApps() throws Exception { Map allApps = SpringBootApp.getAllRunningSpringApps(); - Optional myProcess = allApps.values().stream().filter(app -> app.getProcessName().contains(appName)).findAny(); - assertTrue(myProcess.isPresent()); + for (String appName : appNames) { + Optional myProcess = allApps.values().stream().filter(app -> app.getProcessName().contains(appName)).findAny(); + assertTrue(myProcess.isPresent()); + } } @Test public void getPort() throws Exception { - ACondition.waitFor(TIMEOUT, () -> { - int port = Integer.parseInt(testApp.getPort()); - assertTrue(port > 0); -// System.out.println("port = "+port); - }); + for (SpringBootApp testApp : getTestApps()) { + ACondition.waitFor(TIMEOUT, () -> { + int port = Integer.parseInt(testApp.getPort()); + assertTrue(port > 0); +// System.out.println("port = "+port); + }); + } + } + + private Collection getTestApps() { + return Arrays.asList(appNames).stream() + .map(this::getAppContaining) + .collect(Collectors.toList()); } @Test public void getHost() throws Exception { - ACondition.waitFor(TIMEOUT, () -> { - String host = testApp.getHost(); - assertTrue(StringUtil.hasText(host)); -// System.out.println("host = "+host); - }); + for (SpringBootApp testApp : getTestApps()) { + System.err.println("getHost for "+testApp); + ACondition.waitFor(TIMEOUT, () -> { + String host = testApp.getHost(); + assertTrue(StringUtil.hasText(host)); + System.out.println("host = "+host); + }); + } } @Test public void getEnvironment() throws Exception { - ACondition.waitFor(TIMEOUT, () -> { - String env = testApp.getEnvironment(); - assertNonEmptyJsonObject(env); - System.out.println("env = "+new JSONObject(env).toString(3)); - }); + for (SpringBootApp testApp : getTestApps()) { + ACondition.waitFor(TIMEOUT, () -> { + String env = testApp.getEnvironment(); + assertNonEmptyJsonObject(env); + System.out.println("env = "+new JSONObject(env).toString(3)); + }); + } } @Test public void getBeans() throws Exception { - ACondition.waitFor(TIMEOUT, () -> { - String beans = testApp.getBeans(); - assertNonEmptyJsonObject(beans); -// System.out.println("beans = "+beans); - }); + for (SpringBootApp testApp : getTestApps()) { + try { + ACondition.waitFor(TIMEOUT, () -> { + String beans = testApp.getBeans(); + assertNonEmptyJsonObject(beans); + // System.out.println("beans = "+beans); + }); + } catch (Throwable e) { + //Make it easier to identify the culprit of failing test + throw new RuntimeException("Failed for: "+testApp.getProcessName(), e); + } + } } @Test public void getRequestMappings() throws Exception { - ACondition.waitFor(TIMEOUT, () -> { - String result = testApp.getRequestMappings(); - assertNonEmptyJsonObject(result); -// System.out.println("requestMappings = "+result); - }); + for (SpringBootApp testApp : getTestApps()) { + ACondition.waitFor(TIMEOUT, () -> { + String result = testApp.getRequestMappings(); + assertNonEmptyJsonObject(result); + // System.out.println("requestMappings = "+result); + }); + } } @Test public void getAutoConfigReport() throws Exception { - ACondition.waitFor(TIMEOUT, () -> { - String result = testApp.getAutoConfigReport(); - assertNonEmptyJsonObject(result); -// System.out.println("autoconfreport = "+result); - }); + for (SpringBootApp testApp : getTestApps()) { + ACondition.waitFor(TIMEOUT, () -> { + String result = testApp.getAutoConfigReport(); + assertNonEmptyJsonObject(result); + // System.out.println("autoconfreport = "+result); + }); + } } @Test public void getProfiles() throws Exception { - ACondition.waitFor(TIMEOUT, () -> { - List result = testApp.getActiveProfiles(); - assertEquals(ImmutableList.copyOf(TEST_PROFILES), result); - }); + for (SpringBootApp testApp : getTestApps()) { + ACondition.waitFor(TIMEOUT, () -> { + List result = testApp.getActiveProfiles(); + assertEquals(ImmutableList.copyOf(TEST_PROFILES), result); + }); + } } private void assertNonEmptyJsonObject(String jsonData) { From 28f32bb7a728fe8793764c73d5b211b15911bd19 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 25 Oct 2017 10:54:01 -0700 Subject: [PATCH 2/8] Fix another NPE bug in composite project finder --- .../commons/languageserver/java/CompositeJavaProjectFinder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/CompositeJavaProjectFinder.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/CompositeJavaProjectFinder.java index b32937259..6f1ebd423 100644 --- a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/CompositeJavaProjectFinder.java +++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/CompositeJavaProjectFinder.java @@ -48,7 +48,7 @@ public class CompositeJavaProjectFinder implements JavaProjectFinder { @Override public Optional find(TextDocumentIdentifier doc) { - return projectFinders.stream().map(finder -> finder.find(doc)).filter(Optional::isPresent).findFirst().orElse(null); + return projectFinders.stream().map(finder -> finder.find(doc)).filter(Optional::isPresent).findFirst().orElseGet(() -> Optional.empty()); } } From 23d55a6d93aec781af700249985f454a6fc98488 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 25 Oct 2017 10:56:11 -0700 Subject: [PATCH 3/8] Cleanup imports --- .../commons/languageserver/java/CompositeJavaProjectFinder.java | 1 - 1 file changed, 1 deletion(-) diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/CompositeJavaProjectFinder.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/CompositeJavaProjectFinder.java index 6f1ebd423..b41060559 100644 --- a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/CompositeJavaProjectFinder.java +++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/CompositeJavaProjectFinder.java @@ -14,7 +14,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import java.util.Objects; import java.util.Optional; import org.eclipse.lsp4j.TextDocumentIdentifier; From 3b933ea61fdbcb657439d35dc73efa07a147edc3 Mon Sep 17 00:00:00 2001 From: nsingh Date: Wed, 25 Oct 2017 13:15:18 -0700 Subject: [PATCH 4/8] Added support for multiple apps in request mapping live hovers --- .../RequestMappingHoverProvider.java | 70 ++++++++++-------- .../test/RequestMappingLiveHoverTest.java | 71 +++++++++++++++++++ 2 files changed, 113 insertions(+), 28 deletions(-) diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java index c870a55a3..bd092c22a 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java @@ -58,7 +58,7 @@ public class RequestMappingHoverProvider implements HoverProvider { public Collection getLiveHoverHints(Annotation annotation, TextDocument doc, SpringBootApp[] runningApps) { try { if (runningApps.length > 0) { - Optional val = getRequestMappingMethodFromRunningApp(annotation, runningApps); + Optional> val = getRequestMappingMethodFromRunningApp(annotation, runningApps); if (val.isPresent()) { Range hoverRange = doc.toRange(annotation.getStartPosition(), annotation.getLength()); return ImmutableList.of(hoverRange); @@ -77,7 +77,7 @@ public class RequestMappingHoverProvider implements HoverProvider { try { List> hoverContent = new ArrayList<>(); - Optional val = getRequestMappingMethodFromRunningApp(annotation, runningApps); + Optional> val = getRequestMappingMethodFromRunningApp(annotation, runningApps); if (val.isPresent()) { addHoverContent(val.get(), hoverContent); @@ -97,13 +97,14 @@ public class RequestMappingHoverProvider implements HoverProvider { return null; } - private Optional getRequestMappingMethodFromRunningApp(Annotation annotation, + private Optional> getRequestMappingMethodFromRunningApp(Annotation annotation, SpringBootApp[] runningApps) { try { + List methods = new ArrayList<>(); for (SpringBootApp app : runningApps) { String mappings = app.getRequestMappings(); - if (mappings!=null) { + if (mappings != null) { JSONObject requestMappings = new JSONObject(mappings); String rawPath = getRawPath(annotation, requestMappings); if (rawPath != null) { @@ -112,12 +113,16 @@ public class RequestMappingHoverProvider implements HoverProvider { String rawMethod = getRawMethod(annotation, requestMappings); JLRMethod parsedMethod = JLRMethodParser.parse(rawMethod); if (methodMatchesAnnotation(annotation, parsedMethod)) { - return Optional.of(new RequestMappingMethod(path, parsedMethod, app)); + methods.add(new RequestMappingMethod(path, parsedMethod, app)); } } } } } + + if (!methods.isEmpty()) { + return Optional.of(methods); + } } catch (Exception e) { Log.log(e); } @@ -141,28 +146,37 @@ public class RequestMappingHoverProvider implements HoverProvider { return false; } - private void addHoverContent(RequestMappingMethod mappingMethod, List> hoverContent) throws Exception { - String processId = mappingMethod.app.getProcessID(); - String processName = mappingMethod.app.getProcessName(); - String path = mappingMethod.requestMappingPath; + private void addHoverContent(List mappingMethods, List> hoverContent) + throws Exception { + for (int i = 0; i < mappingMethods.size() ; i++) { + RequestMappingMethod method = mappingMethods.get(i); + String processId = method.app.getProcessID(); + String processName = method.app.getProcessName(); + String path = method.requestMappingPath; - StringBuilder builder = new StringBuilder(); + StringBuilder builder = new StringBuilder(); - String port = mappingMethod.app.getPort(); - String host = mappingMethod.app.getHost(); - String url = UrlUtil.createUrl(host, port, path); + String port = method.app.getPort(); + String host = method.app.getHost(); + String url = UrlUtil.createUrl(host, port, path); - builder.append("Path: "); - builder.append("["); - builder.append(path); - builder.append("]"); - builder.append("("); - builder.append(url); - builder.append(")"); + builder.append("Path: "); + builder.append("["); + builder.append(path); + builder.append("]"); + builder.append("("); + builder.append(url); + builder.append(")"); + + hoverContent.add(Either.forLeft(builder.toString())); + hoverContent.add(Either.forLeft("Process ID: " + processId)); + hoverContent.add(Either.forLeft("Process Name: " + processName)); + if (i < mappingMethods.size() - 1) { + // Three dashes == line separator in Markdown + hoverContent.add(Either.forLeft("---")); + } + } - hoverContent.add(Either.forLeft(builder.toString())); - hoverContent.add(Either.forLeft("Process ID: " + processId)); - hoverContent.add(Either.forLeft("Process Name: " + processName)); } private String getRawMethod(Annotation annotation, JSONObject mappings) { @@ -170,7 +184,7 @@ public class RequestMappingHoverProvider implements HoverProvider { while (keys.hasNext()) { String key = keys.next(); if (matchesAnnotation(annotation, key)) { - Object ob= mappings.get(key); + Object ob = mappings.get(key); if (ob instanceof JSONObject) { JSONObject methodMap = (JSONObject) ob; return methodMap.getString("method"); @@ -196,18 +210,18 @@ public class RequestMappingHoverProvider implements HoverProvider { if (annotation instanceof SingleMemberAnnotation) { Expression valueContent = ((SingleMemberAnnotation) annotation).getValue(); if (valueContent instanceof StringLiteral) { - mappingPath = ((StringLiteral)valueContent).getLiteralValue(); + mappingPath = ((StringLiteral) valueContent).getLiteralValue(); } } else if (annotation instanceof NormalAnnotation) { List values = ((NormalAnnotation) annotation).values(); for (Object value : values) { if (value instanceof MemberValuePair) { - String name = ((MemberValuePair)value).getName().toString(); + String name = ((MemberValuePair) value).getName().toString(); if (name != null && name.equals("value")) { - Expression valueContent = ((MemberValuePair)value).getValue(); + Expression valueContent = ((MemberValuePair) value).getValue(); if (valueContent instanceof StringLiteral) { - mappingPath = ((StringLiteral)valueContent).getLiteralValue(); + mappingPath = ((StringLiteral) valueContent).getLiteralValue(); } } } diff --git a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java index 0fd57e088..c5012cf58 100644 --- a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java +++ b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java @@ -132,4 +132,75 @@ public class RequestMappingLiveHoverTest { } + + @Test + public void testMultipleAppsLiveHover() throws Exception { + + File directory = new File( + ProjectsHarness.class.getResource("/test-projects/test-request-mapping-live-hover/").toURI()); + String docUri = "file://" +directory.getAbsolutePath() + "/src/main/java/example/RestApi.java"; + + // Build three different instances of the same app running on different ports with different process IDs + mockAppProvider.builder() + .isSpringBootApp(true) + .port("1000") + .processId("70000") + .host("cfapps.io") + .processName("test-request-mapping-live-hover") + // Ugly, but this is real JSON copied from a real live running app. We want the + // mock app to return realistic results if possible + .getRequestMappings( + "{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}") + . build(); + + mockAppProvider.builder() + .isSpringBootApp(true) + .port("1001") + .processId("80000") + .host("cfapps.io") + .processName("test-request-mapping-live-hover") + // Ugly, but this is real JSON copied from a real live running app. We want the + // mock app to return realistic results if possible + .getRequestMappings( + "{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}") + . build(); + + mockAppProvider.builder() + .isSpringBootApp(true) + .port("1002") + .processId("90000") + .host("cfapps.io") + .processName("test-request-mapping-live-hover") + // Ugly, but this is real JSON copied from a real live running app. We want the + // mock app to return realistic results if possible + .getRequestMappings( + "{\"/webjars/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**\":{\"bean\":\"resourceHandlerMapping\"},\"/**/favicon.ico\":{\"bean\":\"faviconHandlerMapping\"},\"{[/hello-world],methods=[GET]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public example.Greeting example.HelloWorldController.sayHello(java.lang.String)\"},\"{[/goodbye]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.goodbye()\"},\"{[/hello]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public java.lang.String example.RestApi.hello()\"},\"{[/error]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.http.ResponseEntity> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)\"},\"{[/error],produces=[text/html]}\":{\"bean\":\"requestMappingHandlerMapping\",\"method\":\"public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest,javax.servlet.http.HttpServletResponse)\"}}") + . build(); + harness.intialize(directory); + + Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA); + editor.assertHoverContains("@RequestMapping(\"/hello\")", "Path: [/hello](http://cfapps.io:1000/hello)\n" + + "\n" + + "Process ID: 70000\n" + + "\n" + + "Process Name: test-request-mapping-live-hover\n" + + "\n" + + "---\n" + + "\n" + + "Path: [/hello](http://cfapps.io:1001/hello)\n" + + "\n" + + "Process ID: 80000\n" + + "\n" + + "Process Name: test-request-mapping-live-hover\n" + + "\n" + + "---\n" + + "\n" + + "Path: [/hello](http://cfapps.io:1002/hello)\n" + + "\n" + + "Process ID: 90000\n" + + "\n" + + "Process Name: test-request-mapping-live-hover"); + + } + } From 136b98d2155786b22b2ab005595a6801943c8899 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 25 Oct 2017 13:40:57 -0700 Subject: [PATCH 5/8] Add parsing of LiveBeanModel to actuator client --- .../boot-java-language-server/pom.xml | 2 +- .../autowired/AutowiredHoverProvider.java | 23 ++++---- .../java/autowired/SpringBootAppProvider.java | 4 +- .../autowired/SpringBootAppProviderImpl.java | 3 +- .../java/beans/ComponentHoverProvider.java | 24 ++++----- .../test/AutowiredHoverProviderTest.java | 13 ++--- .../test/ComponentHoverProviderTest.java | 11 ++-- .../harness/MockRunningAppProvider.java | 3 +- .../commons/commons-boot-app-cli/pom.xml | 5 ++ .../commons/boot/app/cli/SpringBootApp.java | 13 ++++- .../boot/app/cli/livebean}/LiveBean.java | 2 +- .../app/cli/livebean}/LiveBeansModel.java | 49 +++++++++++------- .../boot/app/cli}/LiveBeansModelTest.java | 19 ++++--- .../boot/app/cli/SpringBootAppTest.java | 17 +++--- ...-client-15-test-subject-0.0.1-SNAPSHOT.jar | Bin ...-client-20-test-subject-0.0.1-SNAPSHOT.jar | Bin ...nt-20-thin-test-subject-0.0.1-SNAPSHOT.jar | Bin .../empty-live-beans-model.json | 0 .../simple-live-beans-model.json | 0 .../totally-empty-live-beans-model.json | 0 .../java/CompositeJavaProjectFinder.java | 2 +- headless-services/commons/pom.xml | 1 + 22 files changed, 113 insertions(+), 78 deletions(-) rename headless-services/{boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired => commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean}/LiveBean.java (96%) rename headless-services/{boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired => commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean}/LiveBeansModel.java (65%) rename headless-services/{boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/autowired/test => commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli}/LiveBeansModelTest.java (75%) rename headless-services/commons/commons-boot-app-cli/src/test/resources/{ => boot-apps}/actuator-client-15-test-subject-0.0.1-SNAPSHOT.jar (100%) rename headless-services/commons/commons-boot-app-cli/src/test/resources/{ => boot-apps}/actuator-client-20-test-subject-0.0.1-SNAPSHOT.jar (100%) rename headless-services/commons/commons-boot-app-cli/src/test/resources/{ => boot-apps}/actuator-client-20-thin-test-subject-0.0.1-SNAPSHOT.jar (100%) rename headless-services/{boot-java-language-server => commons/commons-boot-app-cli}/src/test/resources/live-beans-models/empty-live-beans-model.json (100%) rename headless-services/{boot-java-language-server => commons/commons-boot-app-cli}/src/test/resources/live-beans-models/simple-live-beans-model.json (100%) rename headless-services/{boot-java-language-server => commons/commons-boot-app-cli}/src/test/resources/live-beans-models/totally-empty-live-beans-model.json (100%) diff --git a/headless-services/boot-java-language-server/pom.xml b/headless-services/boot-java-language-server/pom.xml index d1c813b6c..33a4cf809 100644 --- a/headless-services/boot-java-language-server/pom.xml +++ b/headless-services/boot-java-language-server/pom.xml @@ -84,7 +84,7 @@ commons-io commons-io - 2.4 + ${commons-io-version} diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java index 9dc13e806..36e3aa6d8 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/AutowiredHoverProvider.java @@ -25,6 +25,8 @@ import org.eclipse.lsp4j.Range; import org.eclipse.lsp4j.jsonrpc.messages.Either; import org.springframework.ide.vscode.boot.java.handlers.HoverProvider; import org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp; +import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBean; +import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBeansModel; import org.springframework.ide.vscode.commons.util.BadLocationException; import org.springframework.ide.vscode.commons.util.Log; import org.springframework.ide.vscode.commons.util.text.TextDocument; @@ -54,8 +56,8 @@ public class AutowiredHoverProvider implements HoverProvider { for (SpringBootAppProvider bootApp : runningApps) { try { - String liveBeans = bootApp.getBeans(); - if (liveBeans != null && liveBeans.length() > 0) { + LiveBeansModel liveBeans = bootApp.getBeans(); + if (liveBeans != null && !liveBeans.isEmpty()) { addLiveHoverContent(annotation, doc, liveBeans, bootApp, hoverContent); } } @@ -85,8 +87,8 @@ public class AutowiredHoverProvider implements HoverProvider { try { for (SpringBootApp bootApp : runningApps) { try { - String liveBeans = bootApp.getBeans(); - if (liveBeans != null && liveBeans.length() > 0) { + LiveBeansModel liveBeans = bootApp.getBeans(); + if (liveBeans != null && !liveBeans.isEmpty()) { Range range = getLiveHoverHint(annotation, doc, liveBeans); if (range != null) { return ImmutableList.of(range); @@ -105,14 +107,11 @@ public class AutowiredHoverProvider implements HoverProvider { return null; } - public Range getLiveHoverHint(Annotation annotation, TextDocument doc, String liveBeansJSON) { + public Range getLiveHoverHint(Annotation annotation, TextDocument doc, LiveBeansModel beansModel) { try { String type = findDeclaredType(annotation); - if (type != null && liveBeansJSON != null) { - - LiveBeansModel beansModel = LiveBeansModel.parse(liveBeansJSON); + if (type != null && beansModel != null) { LiveBean[] beansOfType = beansModel.getBeansOfType(type); - if (beansOfType.length > 0) { Range hoverRange = doc.toRange(annotation.getStartPosition(), annotation.getLength()); return hoverRange; @@ -126,11 +125,9 @@ public class AutowiredHoverProvider implements HoverProvider { return null; } - public void addLiveHoverContent(Annotation annotation, TextDocument doc, String liveBeansJSON, SpringBootAppProvider bootApp, List> hoverContent) { + public void addLiveHoverContent(Annotation annotation, TextDocument doc, LiveBeansModel beansModel, SpringBootAppProvider bootApp, List> hoverContent) { String type = findDeclaredType(annotation); - if (type != null && liveBeansJSON != null) { - - LiveBeansModel beansModel = LiveBeansModel.parse(liveBeansJSON); + if (type != null && beansModel != null) { LiveBean[] beansOfType = beansModel.getBeansOfType(type); if (beansOfType.length > 0) { diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/SpringBootAppProvider.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/SpringBootAppProvider.java index 9a4a64d3e..5bf1fda5d 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/SpringBootAppProvider.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/SpringBootAppProvider.java @@ -10,12 +10,14 @@ *******************************************************************************/ package org.springframework.ide.vscode.boot.java.autowired; +import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBeansModel; + /** * @author Martin Lippert */ public interface SpringBootAppProvider { - public String getBeans() throws Exception; + public LiveBeansModel getBeans() throws Exception; public String getProcessID(); public String getProcessName(); diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/SpringBootAppProviderImpl.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/SpringBootAppProviderImpl.java index af8e94c16..3563d0376 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/SpringBootAppProviderImpl.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/SpringBootAppProviderImpl.java @@ -11,6 +11,7 @@ package org.springframework.ide.vscode.boot.java.autowired; import org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp; +import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBeansModel; /** * @author Martin Lippert @@ -24,7 +25,7 @@ public class SpringBootAppProviderImpl implements SpringBootAppProvider { } @Override - public String getBeans() throws Exception { + public LiveBeansModel getBeans() throws Exception { return bootApp.getBeans(); } diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentHoverProvider.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentHoverProvider.java index 4a09f215b..4852b1d0d 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentHoverProvider.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/ComponentHoverProvider.java @@ -26,12 +26,12 @@ import org.eclipse.lsp4j.MarkedString; import org.eclipse.lsp4j.Range; import org.eclipse.lsp4j.jsonrpc.messages.Either; import org.springframework.ide.vscode.boot.java.autowired.Constants; -import org.springframework.ide.vscode.boot.java.autowired.LiveBean; -import org.springframework.ide.vscode.boot.java.autowired.LiveBeansModel; import org.springframework.ide.vscode.boot.java.autowired.SpringBootAppProvider; import org.springframework.ide.vscode.boot.java.autowired.SpringBootAppProviderImpl; import org.springframework.ide.vscode.boot.java.handlers.HoverProvider; import org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp; +import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBean; +import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBeansModel; import org.springframework.ide.vscode.commons.util.BadLocationException; import org.springframework.ide.vscode.commons.util.Log; import org.springframework.ide.vscode.commons.util.text.TextDocument; @@ -68,8 +68,8 @@ public class ComponentHoverProvider implements HoverProvider { List> hoverContent = new ArrayList<>(); for (SpringBootAppProvider bootApp : runningApps) { try { - String liveBeans = bootApp.getBeans(); - if (liveBeans != null && liveBeans.length() > 0) { + LiveBeansModel liveBeans = bootApp.getBeans(); + if (liveBeans != null && !liveBeans.isEmpty()) { addLiveHoverContent(typeDecl, doc, liveBeans, bootApp, hoverContent); } } @@ -101,8 +101,8 @@ public class ComponentHoverProvider implements HoverProvider { try { for (SpringBootApp bootApp : runningApps) { try { - String liveBeans = bootApp.getBeans(); - if (liveBeans != null && liveBeans.length() > 0) { + LiveBeansModel liveBeans = bootApp.getBeans(); + if (liveBeans != null && !liveBeans.isEmpty()) { Range range = getLiveHoverHint(annotation, doc, liveBeans); if (range != null) { return ImmutableList.of(range); @@ -121,13 +121,11 @@ public class ComponentHoverProvider implements HoverProvider { return null; } - public Range getLiveHoverHint(Annotation annotation, TextDocument doc, String liveBeansJSON) { + public Range getLiveHoverHint(Annotation annotation, TextDocument doc, LiveBeansModel beansModel) { try { TypeDeclaration type = findDeclaredType(annotation); - if (type != null && liveBeansJSON != null) { + if (type != null && beansModel != null) { String typeName = type.resolveBinding().getQualifiedName(); - - LiveBeansModel beansModel = LiveBeansModel.parse(liveBeansJSON); LiveBean[] beansOfType = beansModel.getBeansOfType(typeName); if (beansOfType.length > 0) { @@ -160,11 +158,9 @@ public class ComponentHoverProvider implements HoverProvider { } - public void addLiveHoverContent(TypeDeclaration declaringType, TextDocument doc, String liveBeansJSON, SpringBootAppProvider bootApp, List> hoverContent) { + public void addLiveHoverContent(TypeDeclaration declaringType, TextDocument doc, LiveBeansModel beansModel, SpringBootAppProvider bootApp, List> hoverContent) { String type = declaringType.resolveBinding().getQualifiedName(); - if (type != null && liveBeansJSON != null) { - - LiveBeansModel beansModel = LiveBeansModel.parse(liveBeansJSON); + if (type != null && beansModel != null) { LiveBean[] beansOfType = beansModel.getBeansOfType(type); if (beansOfType.length > 0) { diff --git a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/autowired/test/AutowiredHoverProviderTest.java b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/autowired/test/AutowiredHoverProviderTest.java index 92224fc0a..8e0d05537 100644 --- a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/autowired/test/AutowiredHoverProviderTest.java +++ b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/autowired/test/AutowiredHoverProviderTest.java @@ -42,6 +42,7 @@ import org.junit.Before; import org.junit.Test; import org.springframework.ide.vscode.boot.java.autowired.AutowiredHoverProvider; import org.springframework.ide.vscode.boot.java.autowired.SpringBootAppProvider; +import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBeansModel; import org.springframework.ide.vscode.commons.java.IClasspath; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; @@ -82,7 +83,7 @@ public class AutowiredHoverProviderTest { AutowiredHoverProvider provider = new AutowiredHoverProvider(); String beansJSON = new String(Files.readAllBytes(new File(directory, "runtime-bean-information.json").toPath())); - Range hint = provider.getLiveHoverHint((Annotation)node, document, beansJSON); + Range hint = provider.getLiveHoverHint((Annotation)node, document, LiveBeansModel.parse(beansJSON)); assertNotNull(hint); assertEquals(11, hint.getStart().getLine()); @@ -106,7 +107,7 @@ public class AutowiredHoverProviderTest { ASTNode node = NodeFinder.perform(cu, offset, 0).getParent(); AutowiredHoverProvider provider = new AutowiredHoverProvider(); - Range hint = provider.getLiveHoverHint((Annotation)node, document, (String)null); + Range hint = provider.getLiveHoverHint((Annotation)node, document, LiveBeansModel.parse(null)); assertNull(hint); } @@ -127,7 +128,7 @@ public class AutowiredHoverProviderTest { AutowiredHoverProvider provider = new AutowiredHoverProvider(); String beansJSON = new String(Files.readAllBytes(new File(directory, "wrong-runtime-bean-information.json").toPath())); - Range hint = provider.getLiveHoverHint((Annotation)node, document, beansJSON); + Range hint = provider.getLiveHoverHint((Annotation)node, document, LiveBeansModel.parse(beansJSON)); assertNull(hint); } @@ -146,7 +147,7 @@ public class AutowiredHoverProviderTest { ASTNode node = NodeFinder.perform(cu, offset, 0).getParent(); AutowiredHoverProvider provider = new AutowiredHoverProvider(); - String beansJSON = new String(Files.readAllBytes(new File(directory, "runtime-bean-information.json").toPath())); + LiveBeansModel beansModel = LiveBeansModel.parse(new String(Files.readAllBytes(new File(directory, "runtime-bean-information.json").toPath()))); SpringBootAppProvider bootApp = new SpringBootAppProvider() { @Override @@ -160,8 +161,8 @@ public class AutowiredHoverProviderTest { } @Override - public String getBeans() throws Exception { - return beansJSON; + public LiveBeansModel getBeans() throws Exception { + return beansModel; } }; CompletableFuture hoverFuture = provider.provideHover(null, (Annotation)node, null, offset, document, new SpringBootAppProvider[] {bootApp}); diff --git a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/ComponentHoverProviderTest.java b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/ComponentHoverProviderTest.java index 397f0aa2c..2130f9d06 100644 --- a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/ComponentHoverProviderTest.java +++ b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/beans/test/ComponentHoverProviderTest.java @@ -42,6 +42,7 @@ import org.junit.Before; import org.junit.Test; import org.springframework.ide.vscode.boot.java.autowired.SpringBootAppProvider; import org.springframework.ide.vscode.boot.java.beans.ComponentHoverProvider; +import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBeansModel; import org.springframework.ide.vscode.commons.java.IClasspath; import org.springframework.ide.vscode.commons.java.IJavaProject; import org.springframework.ide.vscode.commons.languageserver.java.JavaProjectFinder; @@ -82,7 +83,7 @@ public class ComponentHoverProviderTest { ComponentHoverProvider provider = new ComponentHoverProvider(); String beansJSON = new String(Files.readAllBytes(new File(directory, "runtime-bean-information-automatically-wired.json").toPath())); - Range hint = provider.getLiveHoverHint((Annotation)node, document, beansJSON); + Range hint = provider.getLiveHoverHint((Annotation)node, document, LiveBeansModel.parse(beansJSON)); assertNotNull(hint); assertEquals(10, hint.getStart().getLine()); @@ -108,7 +109,7 @@ public class ComponentHoverProviderTest { ComponentHoverProvider provider = new ComponentHoverProvider(); String beansJSON = new String(Files.readAllBytes(new File(directory, "runtime-bean-information.json").toPath())); - Range hint = provider.getLiveHoverHint((Annotation)node, document, beansJSON); + Range hint = provider.getLiveHoverHint((Annotation)node, document, LiveBeansModel.parse(beansJSON)); assertNull(hint); } @@ -127,7 +128,7 @@ public class ComponentHoverProviderTest { ASTNode node = NodeFinder.perform(cu, offset, 0).getParent(); ComponentHoverProvider provider = new ComponentHoverProvider(); - String beansJSON = new String(Files.readAllBytes(new File(directory, "runtime-bean-information-automatically-wired.json").toPath())); + LiveBeansModel beansModel = LiveBeansModel.parse(new String(Files.readAllBytes(new File(directory, "runtime-bean-information-automatically-wired.json").toPath()))); SpringBootAppProvider bootApp = new SpringBootAppProvider() { @Override @@ -141,8 +142,8 @@ public class ComponentHoverProviderTest { } @Override - public String getBeans() throws Exception { - return beansJSON; + public LiveBeansModel getBeans() throws Exception { + return beansModel; } }; CompletableFuture hoverFuture = provider.provideHover(null, (Annotation) node, null, 0, document, new SpringBootAppProvider[] {bootApp}); diff --git a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/project/harness/MockRunningAppProvider.java b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/project/harness/MockRunningAppProvider.java index 048afeaeb..d6df3851d 100644 --- a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/project/harness/MockRunningAppProvider.java +++ b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/project/harness/MockRunningAppProvider.java @@ -19,6 +19,7 @@ import java.util.Collection; import org.mockito.Mockito; import org.springframework.ide.vscode.boot.java.handlers.RunningAppProvider; import org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp; +import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBeansModel; import org.springframework.ide.vscode.commons.util.ExceptionUtil; import org.springframework.ide.vscode.project.harness.BootLanguageServerHarness.Builder; @@ -67,7 +68,7 @@ public class MockRunningAppProvider { } public MockAppBuilder beans(String beans) throws Exception { - when(app.getBeans()).thenReturn(beans); + when(app.getBeans()).thenReturn(LiveBeansModel.parse(beans)); return this; } diff --git a/headless-services/commons/commons-boot-app-cli/pom.xml b/headless-services/commons/commons-boot-app-cli/pom.xml index 17847e03a..7c20c3917 100644 --- a/headless-services/commons/commons-boot-app-cli/pom.xml +++ b/headless-services/commons/commons-boot-app-cli/pom.xml @@ -24,6 +24,11 @@ jackson-databind 2.8.8.1 + + commons-io + commons-io + ${commons-io-version} + com.sun diff --git a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java index b1cc28225..136ca67ef 100644 --- a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java +++ b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java @@ -30,7 +30,9 @@ import javax.management.remote.JMXServiceURL; import org.json.JSONArray; import org.json.JSONObject; +import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBeansModel; import org.springframework.ide.vscode.commons.util.Log; +import org.springframework.ide.vscode.commons.util.StringUtil; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; @@ -170,7 +172,7 @@ public class SpringBootApp { return null; } - public String getBeans() throws Exception { + private String getBeansJson() throws Exception { Object result = getActuatorDataFromAttribute("org.springframework.boot:type=Endpoint,name=beansEndpoint", "Data"); if (result != null) { String beans = new ObjectMapper().writeValueAsString(result); @@ -186,6 +188,14 @@ public class SpringBootApp { return null; } + public LiveBeansModel getBeans() throws Exception { + String json = getBeansJson(); + if (StringUtil.hasText(json)) { + return LiveBeansModel.parse(json); + } + return null; + } + public String getRequestMappings() throws Exception { Object result = getActuatorDataFromAttribute("org.springframework.boot:type=Endpoint,name=requestMappingEndpoint", "Data"); if (result != null) { @@ -424,5 +434,4 @@ public class SpringBootApp { return null; } - } diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/LiveBean.java b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBean.java similarity index 96% rename from headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/LiveBean.java rename to headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBean.java index 6e7b29cde..ee2b3394d 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/LiveBean.java +++ b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBean.java @@ -8,7 +8,7 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.java.autowired; +package org.springframework.ide.vscode.commons.boot.app.cli.livebean; import org.json.JSONArray; import org.json.JSONObject; diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/LiveBeansModel.java b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBeansModel.java similarity index 65% rename from headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/LiveBeansModel.java rename to headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBeansModel.java index 85071675c..3544a2e33 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/autowired/LiveBeansModel.java +++ b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBeansModel.java @@ -8,16 +8,19 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.java.autowired; +package org.springframework.ide.vscode.commons.boot.app.cli.livebean; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import java.util.stream.Stream; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import org.springframework.ide.vscode.commons.util.StringUtil; /** * @author Martin Lippert @@ -26,32 +29,32 @@ public class LiveBeansModel { public static LiveBeansModel parse(String json) { LiveBeansModel model = new LiveBeansModel(); + if (StringUtil.hasText(json)) { + try { + JSONArray mainArray = new JSONArray(json); - try { - JSONArray mainArray = new JSONArray(json); + for (int i = 0; i < mainArray.length(); i++) { + JSONObject appContext = mainArray.getJSONObject(i); + if (appContext == null) continue; - for (int i = 0; i < mainArray.length(); i++) { - JSONObject appContext = mainArray.getJSONObject(i); - if (appContext == null) continue; + JSONArray beansArray = appContext.optJSONArray("beans"); + if (beansArray == null) continue; - JSONArray beansArray = appContext.optJSONArray("beans"); - if (beansArray == null) continue; + for (int j = 0; j < beansArray.length(); j++) { + JSONObject beanObject = beansArray.getJSONObject(j); + if (beanObject == null) continue; - for (int j = 0; j < beansArray.length(); j++) { - JSONObject beanObject = beansArray.getJSONObject(j); - if (beanObject == null) continue; - - LiveBean bean = LiveBean.parse(beanObject); - if (bean != null) { - model.add(bean); + LiveBean bean = LiveBean.parse(beanObject); + if (bean != null) { + model.add(bean); + } } } } + catch (JSONException e) { + e.printStackTrace(); + } } - catch (JSONException e) { - e.printStackTrace(); - } - return model; } @@ -85,4 +88,12 @@ public class LiveBeansModel { } } + public Stream getAllBeans() { + return beansViaName.values().stream().flatMap(Collection::stream); + } + + public boolean isEmpty() { + return !getAllBeans().findAny().isPresent(); + } + } diff --git a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/autowired/test/LiveBeansModelTest.java b/headless-services/commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli/LiveBeansModelTest.java similarity index 75% rename from headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/autowired/test/LiveBeansModelTest.java rename to headless-services/commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli/LiveBeansModelTest.java index 5c08df184..e7372bd27 100644 --- a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/autowired/test/LiveBeansModelTest.java +++ b/headless-services/commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli/LiveBeansModelTest.java @@ -8,15 +8,16 @@ * Contributors: * Pivotal, Inc. - initial API and implementation *******************************************************************************/ -package org.springframework.ide.vscode.boot.java.autowired.test; +package org.springframework.ide.vscode.commons.boot.app.cli; import static org.junit.Assert.assertEquals; +import java.io.InputStream; + import org.apache.commons.io.IOUtils; import org.junit.Test; -import org.springframework.ide.vscode.boot.java.autowired.LiveBean; -import org.springframework.ide.vscode.boot.java.autowired.LiveBeansModel; -import org.springframework.ide.vscode.project.harness.ProjectsHarness; +import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBean; +import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBeansModel; /** * @author Martin Lippert @@ -25,7 +26,7 @@ public class LiveBeansModelTest { @Test public void testSimpleModel() throws Exception { - String json = IOUtils.toString(ProjectsHarness.class.getResourceAsStream("/live-beans-models/simple-live-beans-model.json")); + String json = IOUtils.toString(getResourceAsStream("/live-beans-models/simple-live-beans-model.json")); LiveBeansModel model = LiveBeansModel.parse(json); LiveBean[] bean = model.getBeansOfType("org.test.DependencyA"); @@ -49,7 +50,7 @@ public class LiveBeansModelTest { @Test public void testEmptyModel() throws Exception { - String json = IOUtils.toString(ProjectsHarness.class.getResourceAsStream("/live-beans-models/empty-live-beans-model.json")); + String json = IOUtils.toString(getResourceAsStream("/live-beans-models/empty-live-beans-model.json")); LiveBeansModel model = LiveBeansModel.parse(json); LiveBean[] bean = model.getBeansOfType("org.test.DependencyA"); @@ -58,11 +59,15 @@ public class LiveBeansModelTest { @Test public void testTotallyEmptyModel() throws Exception { - String json = IOUtils.toString(ProjectsHarness.class.getResourceAsStream("/live-beans-models/totally-empty-live-beans-model.json")); + String json = IOUtils.toString(getResourceAsStream("/live-beans-models/totally-empty-live-beans-model.json")); LiveBeansModel model = LiveBeansModel.parse(json); LiveBean[] bean = model.getBeansOfType("org.test.DependencyA"); assertEquals(0, bean.length); } + private InputStream getResourceAsStream(String string) { + return LiveBeansModelTest.class.getResourceAsStream(string); + } + } diff --git a/headless-services/commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootAppTest.java b/headless-services/commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootAppTest.java index bc08c745e..65ce0f193 100644 --- a/headless-services/commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootAppTest.java +++ b/headless-services/commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootAppTest.java @@ -26,9 +26,11 @@ import java.util.stream.Collectors; import org.json.JSONObject; import org.junit.AfterClass; +import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; +import org.springframework.ide.vscode.commons.boot.app.cli.livebean.LiveBeansModel; import org.springframework.ide.vscode.commons.util.AsyncProcess; import org.springframework.ide.vscode.commons.util.ExceptionUtil; import org.springframework.ide.vscode.commons.util.ExternalCommand; @@ -37,11 +39,8 @@ import org.springframework.ide.vscode.commons.util.test.ACondition; import com.google.common.collect.ImmutableList; -import junit.framework.AssertionFailedError; - public class SpringBootAppTest { -// private static final String appName = "actuator-client-15-test-subject"; // Boot 1.5 test app private static final String[] appNames = { "actuator-client-20-test-subject", //Boot 2.0 test app "actuator-client-20-thin-test-subject", // Like the Boot 2.0 app, but packaged with thin launcher instead of fatjar @@ -59,7 +58,7 @@ public class SpringBootAppTest { public static void setupClass() throws Exception { testAppRunners = Arrays.asList(appNames).stream().map(appName -> { try { - return startTestApplication(SpringBootAppTest.class.getResource("/"+appName+"-0.0.1-SNAPSHOT.jar")); + return startTestApplication(SpringBootAppTest.class.getResource("/boot-apps/"+appName+"-0.0.1-SNAPSHOT.jar")); } catch (Exception e) { throw ExceptionUtil.unchecked(e); } @@ -141,6 +140,12 @@ public class SpringBootAppTest { .collect(Collectors.toList()); } + @Before + public void ensureTestAppsAvailable() throws Exception { + //To avoid race condition when JMX connector fails if trying to attach to quickly after starting apps + ACondition.waitFor(TIMEOUT, () -> getTestApps()); + } + @Test public void getHost() throws Exception { for (SpringBootApp testApp : getTestApps()) { @@ -169,8 +174,8 @@ public class SpringBootAppTest { for (SpringBootApp testApp : getTestApps()) { try { ACondition.waitFor(TIMEOUT, () -> { - String beans = testApp.getBeans(); - assertNonEmptyJsonObject(beans); + LiveBeansModel beansModel = testApp.getBeans(); + assertTrue(beansModel.getAllBeans().findAny().isPresent()); // System.out.println("beans = "+beans); }); } catch (Throwable e) { diff --git a/headless-services/commons/commons-boot-app-cli/src/test/resources/actuator-client-15-test-subject-0.0.1-SNAPSHOT.jar b/headless-services/commons/commons-boot-app-cli/src/test/resources/boot-apps/actuator-client-15-test-subject-0.0.1-SNAPSHOT.jar similarity index 100% rename from headless-services/commons/commons-boot-app-cli/src/test/resources/actuator-client-15-test-subject-0.0.1-SNAPSHOT.jar rename to headless-services/commons/commons-boot-app-cli/src/test/resources/boot-apps/actuator-client-15-test-subject-0.0.1-SNAPSHOT.jar diff --git a/headless-services/commons/commons-boot-app-cli/src/test/resources/actuator-client-20-test-subject-0.0.1-SNAPSHOT.jar b/headless-services/commons/commons-boot-app-cli/src/test/resources/boot-apps/actuator-client-20-test-subject-0.0.1-SNAPSHOT.jar similarity index 100% rename from headless-services/commons/commons-boot-app-cli/src/test/resources/actuator-client-20-test-subject-0.0.1-SNAPSHOT.jar rename to headless-services/commons/commons-boot-app-cli/src/test/resources/boot-apps/actuator-client-20-test-subject-0.0.1-SNAPSHOT.jar diff --git a/headless-services/commons/commons-boot-app-cli/src/test/resources/actuator-client-20-thin-test-subject-0.0.1-SNAPSHOT.jar b/headless-services/commons/commons-boot-app-cli/src/test/resources/boot-apps/actuator-client-20-thin-test-subject-0.0.1-SNAPSHOT.jar similarity index 100% rename from headless-services/commons/commons-boot-app-cli/src/test/resources/actuator-client-20-thin-test-subject-0.0.1-SNAPSHOT.jar rename to headless-services/commons/commons-boot-app-cli/src/test/resources/boot-apps/actuator-client-20-thin-test-subject-0.0.1-SNAPSHOT.jar diff --git a/headless-services/boot-java-language-server/src/test/resources/live-beans-models/empty-live-beans-model.json b/headless-services/commons/commons-boot-app-cli/src/test/resources/live-beans-models/empty-live-beans-model.json similarity index 100% rename from headless-services/boot-java-language-server/src/test/resources/live-beans-models/empty-live-beans-model.json rename to headless-services/commons/commons-boot-app-cli/src/test/resources/live-beans-models/empty-live-beans-model.json diff --git a/headless-services/boot-java-language-server/src/test/resources/live-beans-models/simple-live-beans-model.json b/headless-services/commons/commons-boot-app-cli/src/test/resources/live-beans-models/simple-live-beans-model.json similarity index 100% rename from headless-services/boot-java-language-server/src/test/resources/live-beans-models/simple-live-beans-model.json rename to headless-services/commons/commons-boot-app-cli/src/test/resources/live-beans-models/simple-live-beans-model.json diff --git a/headless-services/boot-java-language-server/src/test/resources/live-beans-models/totally-empty-live-beans-model.json b/headless-services/commons/commons-boot-app-cli/src/test/resources/live-beans-models/totally-empty-live-beans-model.json similarity index 100% rename from headless-services/boot-java-language-server/src/test/resources/live-beans-models/totally-empty-live-beans-model.json rename to headless-services/commons/commons-boot-app-cli/src/test/resources/live-beans-models/totally-empty-live-beans-model.json diff --git a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/CompositeJavaProjectFinder.java b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/CompositeJavaProjectFinder.java index b41060559..fbeb5921a 100644 --- a/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/CompositeJavaProjectFinder.java +++ b/headless-services/commons/commons-java/src/main/java/org/springframework/ide/vscode/commons/languageserver/java/CompositeJavaProjectFinder.java @@ -20,7 +20,7 @@ import org.eclipse.lsp4j.TextDocumentIdentifier; import org.springframework.ide.vscode.commons.java.IJavaProject; /** - * Composite project manager that acts a single project manager but consissts of many project managers + * Composite project manager that acts a single project manager but consists of many project managers * * @author Alex Boyko * diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml index 51fa1730a..55e8c8007 100644 --- a/headless-services/commons/pom.xml +++ b/headless-services/commons/pom.xml @@ -85,6 +85,7 @@ 3.0.5.RELEASE 0.6.0.RELEASE 2.4.0.RELEASE + 2.4 From 745994179dbfa39c9a104b538745a430498406f7 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 25 Oct 2017 14:57:49 -0700 Subject: [PATCH 6/8] LiveBean parsing support for boot 2.0 --- .../boot/app/cli/livebean/LiveBean.java | 22 +-- .../boot/app/cli/livebean/LiveBeansModel.java | 128 +++++++++++++++--- .../boot/app/cli/SpringBootAppTest.java | 16 +-- .../vscode/commons/util/test/ACondition.java | 11 ++ 4 files changed, 124 insertions(+), 53 deletions(-) diff --git a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBean.java b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBean.java index ee2b3394d..2b20ad27a 100644 --- a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBean.java +++ b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBean.java @@ -15,30 +15,10 @@ import org.json.JSONObject; /** * @author Martin Lippert + * @author Kris De Volder */ public class LiveBean { - public static LiveBean parse(JSONObject beansJSON) { - String id = beansJSON.optString("bean"); - String type = beansJSON.optString("type"); - String scope = beansJSON.optString("scope"); - String resource = beansJSON.optString("resource"); - - JSONArray aliasesJSON = beansJSON.getJSONArray("aliases"); - String[] aliases = new String[aliasesJSON.length()]; - for (int i = 0; i < aliasesJSON.length(); i++) { - aliases[i] = aliasesJSON.optString(i); - } - - JSONArray dependenciesJSON = beansJSON.getJSONArray("dependencies"); - String[] dependencies = new String[dependenciesJSON.length()]; - for (int i = 0; i < dependenciesJSON.length(); i++) { - dependencies[i] = dependenciesJSON.optString(i); - } - - return new LiveBean(id, aliases, scope, type, resource, dependencies); - } - private final String id; private final String[] aliases; private final String scope; diff --git a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBeansModel.java b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBeansModel.java index 3544a2e33..5ea7cbf83 100644 --- a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBeansModel.java +++ b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/livebean/LiveBeansModel.java @@ -18,8 +18,8 @@ import java.util.concurrent.ConcurrentMap; import java.util.stream.Stream; import org.json.JSONArray; -import org.json.JSONException; import org.json.JSONObject; +import org.springframework.ide.vscode.commons.util.Log; import org.springframework.ide.vscode.commons.util.StringUtil; /** @@ -27,35 +27,121 @@ import org.springframework.ide.vscode.commons.util.StringUtil; */ public class LiveBeansModel { - public static LiveBeansModel parse(String json) { - LiveBeansModel model = new LiveBeansModel(); - if (StringUtil.hasText(json)) { - try { - JSONArray mainArray = new JSONArray(json); + interface Parser { + LiveBeansModel parse(String json) throws Exception; + } - for (int i = 0; i < mainArray.length(); i++) { - JSONObject appContext = mainArray.getJSONObject(i); - if (appContext == null) continue; + private static class Boot15Parser implements Parser { + @Override + public LiveBeansModel parse(String json) throws Exception { + LiveBeansModel model = new LiveBeansModel(); + JSONArray mainArray = new JSONArray(json); + for (int i = 0; i < mainArray.length(); i++) { + JSONObject appContext = mainArray.getJSONObject(i); + if (appContext == null) continue; - JSONArray beansArray = appContext.optJSONArray("beans"); - if (beansArray == null) continue; + JSONArray beansArray = appContext.optJSONArray("beans"); + if (beansArray == null) continue; - for (int j = 0; j < beansArray.length(); j++) { - JSONObject beanObject = beansArray.getJSONObject(j); - if (beanObject == null) continue; + for (int j = 0; j < beansArray.length(); j++) { + JSONObject beanObject = beansArray.getJSONObject(j); + if (beanObject == null) continue; - LiveBean bean = LiveBean.parse(beanObject); - if (bean != null) { - model.add(bean); - } + LiveBean bean = parseBean(beanObject); + if (bean != null) { + model.add(bean); } } } - catch (JSONException e) { - e.printStackTrace(); + return model; + } + private LiveBean parseBean(JSONObject beansJSON) { + String id = beansJSON.optString("bean"); + String type = beansJSON.optString("type"); + String scope = beansJSON.optString("scope"); + String resource = beansJSON.optString("resource"); + + JSONArray aliasesJSON = beansJSON.getJSONArray("aliases"); + String[] aliases = new String[aliasesJSON.length()]; + for (int i = 0; i < aliasesJSON.length(); i++) { + aliases[i] = aliasesJSON.optString(i); + } + + JSONArray dependenciesJSON = beansJSON.getJSONArray("dependencies"); + String[] dependencies = new String[dependenciesJSON.length()]; + for (int i = 0; i < dependenciesJSON.length(); i++) { + dependencies[i] = dependenciesJSON.optString(i); + } + + return new LiveBean(id, aliases, scope, type, resource, dependencies); + } + + } + + private static class Boot20Parser implements Parser { + @Override + public LiveBeansModel parse(String json) throws Exception { + LiveBeansModel model = new LiveBeansModel(); + JSONObject mainObject = new JSONObject(json); + JSONObject beansObject = mainObject.getJSONObject("beans"); + for (String id : beansObject.keySet()) { + JSONObject beanObject = beansObject.getJSONObject(id); + System.out.println(beanObject.toString(3)); + LiveBean bean = parseBean(id, beanObject); + if (bean!=null) { + model.add(bean); + } + } + return model; + } + + private LiveBean parseBean(String id, JSONObject beansJSON) { + String type = beansJSON.optString("type"); + String scope = beansJSON.optString("scope"); + String resource = beansJSON.optString("resource"); + + JSONArray aliasesJSON = beansJSON.getJSONArray("aliases"); + String[] aliases = new String[aliasesJSON.length()]; + for (int i = 0; i < aliasesJSON.length(); i++) { + aliases[i] = aliasesJSON.optString(i); + } + + JSONArray dependenciesJSON = beansJSON.getJSONArray("dependencies"); + String[] dependencies = new String[dependenciesJSON.length()]; + for (int i = 0; i < dependenciesJSON.length(); i++) { + dependencies[i] = dependenciesJSON.optString(i); + } + + return new LiveBean(id, aliases, scope, type, resource, dependencies); + } + } + + private static final Parser[] PARSERS = { + new Boot15Parser(), + new Boot20Parser(), + }; + + public static LiveBeansModel parse(String json) { + List exceptions = new ArrayList<>(PARSERS.length); + if (StringUtil.hasText(json)) { + for (Parser parser : PARSERS) { + try { + LiveBeansModel model = parser.parse(json); + if (model==null) { + throw new NullPointerException("Parser returned a null model (it should not!)"); + } + return model; //good! + } catch (Exception e) { + exceptions.add(e); + } } } - return model; + //Only getting here if none of the parsers worked... So if at least one parser works, + // we won't log any exceptions. + for (Exception e : exceptions) { + Log.log(e); + } + return new LiveBeansModel(); // allways return at least an empty model. } private final ConcurrentMap> beansViaType; diff --git a/headless-services/commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootAppTest.java b/headless-services/commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootAppTest.java index 65ce0f193..294b28c91 100644 --- a/headless-services/commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootAppTest.java +++ b/headless-services/commons/commons-boot-app-cli/src/test/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootAppTest.java @@ -42,10 +42,9 @@ import com.google.common.collect.ImmutableList; public class SpringBootAppTest { private static final String[] appNames = { + "actuator-client-15-test-subject", // Boot 1.5 test app "actuator-client-20-test-subject", //Boot 2.0 test app "actuator-client-20-thin-test-subject", // Like the Boot 2.0 app, but packaged with thin launcher instead of fatjar - "actuator-client-15-test-subject" // Boot 1.5 test app - //Note there is a practical limit to how many test apps you can add here because all are run simultaneously. }; private static final Duration TIMEOUT = Duration.ofSeconds(60); // in CI build starting the app takes a while, starting several in parallel takes even longer @@ -134,16 +133,11 @@ public class SpringBootAppTest { } } - private Collection getTestApps() { - return Arrays.asList(appNames).stream() + private Collection getTestApps() throws Exception { + return ACondition.waitForValue(TIMEOUT, () -> Arrays.asList(appNames).stream() .map(this::getAppContaining) - .collect(Collectors.toList()); - } - - @Before - public void ensureTestAppsAvailable() throws Exception { - //To avoid race condition when JMX connector fails if trying to attach to quickly after starting apps - ACondition.waitFor(TIMEOUT, () -> getTestApps()); + .collect(Collectors.toList()) + ); } @Test diff --git a/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/test/ACondition.java b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/test/ACondition.java index 034447d17..2d6599557 100644 --- a/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/test/ACondition.java +++ b/headless-services/commons/commons-util/src/main/java/org/springframework/ide/vscode/commons/util/test/ACondition.java @@ -11,6 +11,8 @@ package org.springframework.ide.vscode.commons.util.test; import java.time.Duration; +import java.util.concurrent.Callable; +import java.util.concurrent.atomic.AtomicReference; import org.springframework.ide.vscode.commons.util.ExceptionUtil; @@ -44,5 +46,14 @@ public class ACondition { } while (System.currentTimeMillis()-startTime < timeout_millis); throw ExceptionUtil.exception(lastException); } + + /** + * Retries fecthing a value until it succeeds without an error, or until timeout exceeded. + */ + public static T waitForValue(Duration timeout, Callable provider) throws Exception { + AtomicReference result = new AtomicReference<>(null); + waitFor(timeout, () -> result.set(provider.call())); + return result.get(); + } } From cd73747a0e200c37f0bf7b1f734baa4296f7a7f1 Mon Sep 17 00:00:00 2001 From: nsingh Date: Wed, 25 Oct 2017 15:13:16 -0700 Subject: [PATCH 7/8] Multiple running app support for conditional live hovers --- .../ConditionalsLiveHoverProvider.java | 38 +++++++++--- .../test/ConditionalsLiveHoverTest.java | 60 +++++++++++++++++++ 2 files changed, 89 insertions(+), 9 deletions(-) diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java index 83a256ba8..a5a1b1c45 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/conditionals/ConditionalsLiveHoverProvider.java @@ -96,9 +96,20 @@ public class ConditionalsLiveHoverProvider implements HoverProvider { private void addHoverContent(List conditions, List> hoverContent) throws Exception { - for (RunningAppConditional condition : conditions) { + for (int i = 0; i < conditions.size(); i++) { + RunningAppConditional condition = conditions.get(i); hoverContent.add(Either.forLeft("Condition: " + condition.condition)); hoverContent.add(Either.forLeft("Message: " + condition.message)); + + // If there is more than one instances show process information + if (conditions.size() > 1) { + hoverContent.add(Either.forLeft("Process ID: " + condition.app.getProcessID())); + hoverContent.add(Either.forLeft("Process Name: " + condition.app.getProcessName())); + } + + if (i < conditions.size() - 1) { + hoverContent.add(Either.forLeft("---")); + } } } @@ -117,16 +128,21 @@ public class ConditionalsLiveHoverProvider implements HoverProvider { public Optional> parse(Annotation annotation, SpringBootApp[] runningApps) { try { + List allConditionals = new ArrayList<>(); for (SpringBootApp app : runningApps) { String autoConfigRecord = app.getAutoConfigReport(); if (autoConfigRecord != null) { JSONObject autoConfigJson = new JSONObject(autoConfigRecord); - List conditionalsFromPositiveMatches = getConditionals(annotation, autoConfigJson); - if(!conditionalsFromPositiveMatches.isEmpty()) { - return Optional.of(conditionalsFromPositiveMatches); + List conditionalsFromPositiveMatches = getConditionals(app, annotation, + autoConfigJson); + if (!conditionalsFromPositiveMatches.isEmpty()) { + allConditionals.addAll(conditionalsFromPositiveMatches); } } } + if (!allConditionals.isEmpty()) { + return Optional.of(allConditionals); + } } catch (Exception e) { Log.log(e); } @@ -135,12 +151,13 @@ public class ConditionalsLiveHoverProvider implements HoverProvider { /** * + * @param app * @param annotation * @param autoConfigJson * @return non-null list of conditionals parsed from an autoconfig report. List * may be empty. */ - private List getConditionals(Annotation annotation, + private List getConditionals(SpringBootApp app, Annotation annotation, JSONObject autoConfigJson) { List conditions = new ArrayList<>(); @@ -152,7 +169,7 @@ public class ConditionalsLiveHoverProvider implements HoverProvider { JSONArray matchList = (JSONArray) positiveMatches.get(positiveMatchKey); matchList.forEach((match) -> { if (match instanceof JSONObject) { - getMatchedCondition((JSONObject) match, annotation) + getMatchedCondition(app, (JSONObject) match, annotation) .ifPresent((condition) -> conditions.add(condition)); } }); @@ -203,13 +220,14 @@ public class ConditionalsLiveHoverProvider implements HoverProvider { return false; } - protected Optional getMatchedCondition(JSONObject conditionJson, Annotation annotation) { + protected Optional getMatchedCondition(SpringBootApp app, JSONObject conditionJson, + Annotation annotation) { if (conditionJson != null) { String condition = (String) conditionJson.get("condition"); String message = (String) conditionJson.get("message"); String annotationName = annotation.resolveTypeBinding().getName(); if (message.contains(annotationName)) { - return Optional.of(new RunningAppConditional(condition, message)); + return Optional.of(new RunningAppConditional(app, condition, message)); } } return Optional.empty(); @@ -220,10 +238,12 @@ public class ConditionalsLiveHoverProvider implements HoverProvider { public final String condition; public final String message; + public final SpringBootApp app; - public RunningAppConditional(String condition, String message) { + public RunningAppConditional(SpringBootApp app, String condition, String message) { this.condition = condition; this.message = message; + this.app = app; } } } diff --git a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalsLiveHoverTest.java b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalsLiveHoverTest.java index 5eaa0c273..cb887f67c 100644 --- a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalsLiveHoverTest.java +++ b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/conditionals/test/ConditionalsLiveHoverTest.java @@ -136,6 +136,66 @@ public class ConditionalsLiveHoverTest { + "Message: @ConditionalOnExpression (#{true}) resulted in true"); } + + @Test + public void testMultipleAppsLiveHover() throws Exception { + + File directory = new File( + ProjectsHarness.class.getResource("/test-projects/test-conditionals-live-hover/").toURI()); + String docUri = "file://" + directory.getAbsolutePath() + + "/src/main/java/example/ConditionalOnMissingBeanConfig.java"; + + // Build a mock running boot app + mockAppProvider.builder().isSpringBootApp(true).port("1000").processId("70000").host("cfapps.io") + .processName("test-conditionals-live-hover") + .getAutoConfigReport( + "{\"positiveMatches\":{\"ConditionalOnMissingBeanConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}]}}") + .build(); + + mockAppProvider.builder().isSpringBootApp(true).port("1001").processId("80000").host("cfapps.io") + .processName("test-conditionals-live-hover") + .getAutoConfigReport( + "{\"positiveMatches\":{\"ConditionalOnMissingBeanConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}]}}") + .build(); + + mockAppProvider.builder().isSpringBootApp(true).port("1002").processId("90000").host("cfapps.io") + .processName("test-conditionals-live-hover") + .getAutoConfigReport( + "{\"positiveMatches\":{\"ConditionalOnMissingBeanConfig#missing\":[{\"condition\":\"OnBeanCondition\",\"message\":\"@ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\"}]}}") + .build(); + + harness.intialize(directory); + + Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA); + + + editor.assertHoverContains("@ConditionalOnMissingBean", "Condition: OnBeanCondition\n" + "\n" + + "Message: @ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\n" + + "\n" + + "Process ID: 70000\n" + + "\n" + + "Process Name: test-conditionals-live-hover\n" + + "\n" + + "---\n" + + "\n" + + "Condition: OnBeanCondition\n" + "\n" + + "Message: @ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\n" + + "\n" + + "Process ID: 80000\n" + + "\n" + + "Process Name: test-conditionals-live-hover\n" + + "\n" + + "---\n" + + "\n" + + "Condition: OnBeanCondition\n" + "\n" + + "Message: @ConditionalOnMissingBean (types: example.Hello; SearchStrategy: all) did not find any beans\n" + + "\n" + + "Process ID: 90000\n" + + "\n" + + "Process Name: test-conditionals-live-hover"); + + } + // @Test // public void testMultipleLiveHoverHints() throws Exception { // From 462e1d71b6ce2094f5d828560b172462c58e217f Mon Sep 17 00:00:00 2001 From: nsingh Date: Wed, 25 Oct 2017 16:33:09 -0700 Subject: [PATCH 8/8] Show full URL in request mapping live hover --- .../requestmapping/RequestMappingHoverProvider.java | 3 +-- .../test/RequestMappingLiveHoverTest.java | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java index bd092c22a..76af42453 100644 --- a/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java +++ b/headless-services/boot-java-language-server/src/main/java/org/springframework/ide/vscode/boot/java/requestmapping/RequestMappingHoverProvider.java @@ -160,9 +160,8 @@ public class RequestMappingHoverProvider implements HoverProvider { String host = method.app.getHost(); String url = UrlUtil.createUrl(host, port, path); - builder.append("Path: "); builder.append("["); - builder.append(path); + builder.append(url); builder.append("]"); builder.append("("); builder.append(url); diff --git a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java index c5012cf58..0ad9bd216 100644 --- a/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java +++ b/headless-services/boot-java-language-server/src/test/java/org/springframework/ide/vscode/boot/java/requestmapping/test/RequestMappingLiveHoverTest.java @@ -62,7 +62,7 @@ public class RequestMappingLiveHoverTest { harness.intialize(directory); Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA); - editor.assertHoverContains("@RequestMapping(\"/hello-world\")", "Path: [/hello-world](http://cfapps.io:1111/hello-world)\n" + + editor.assertHoverContains("@RequestMapping(\"/hello-world\")", "[http://cfapps.io:1111/hello-world](http://cfapps.io:1111/hello-world)\n" + "\n" + "Process ID: 22022\n" + "\n" + @@ -94,13 +94,13 @@ public class RequestMappingLiveHoverTest { harness.intialize(directory); Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA); - editor.assertHoverContains("@RequestMapping(\"/hello\")", "Path: [/hello](http://cfapps.io:999/hello)\n" + + editor.assertHoverContains("@RequestMapping(\"/hello\")", "[http://cfapps.io:999/hello](http://cfapps.io:999/hello)\n" + "\n" + "Process ID: 76543\n" + "\n" + "Process Name: test-request-mapping-live-hover"); - editor.assertHoverContains("@RequestMapping(\"/goodbye\")", "Path: [/goodbye](http://cfapps.io:999/goodbye)\n" + + editor.assertHoverContains("@RequestMapping(\"/goodbye\")", "[http://cfapps.io:999/goodbye](http://cfapps.io:999/goodbye)\n" + "\n" + "Process ID: 76543\n" + "\n" + @@ -179,7 +179,7 @@ public class RequestMappingLiveHoverTest { harness.intialize(directory); Editor editor = harness.newEditorFromFileUri(docUri, LanguageId.JAVA); - editor.assertHoverContains("@RequestMapping(\"/hello\")", "Path: [/hello](http://cfapps.io:1000/hello)\n" + + editor.assertHoverContains("@RequestMapping(\"/hello\")", "[http://cfapps.io:1000/hello](http://cfapps.io:1000/hello)\n" + "\n" + "Process ID: 70000\n" + "\n" + @@ -187,7 +187,7 @@ public class RequestMappingLiveHoverTest { "\n" + "---\n" + "\n" + - "Path: [/hello](http://cfapps.io:1001/hello)\n" + + "[http://cfapps.io:1001/hello](http://cfapps.io:1001/hello)\n" + "\n" + "Process ID: 80000\n" + "\n" + @@ -195,7 +195,7 @@ public class RequestMappingLiveHoverTest { "\n" + "---\n" + "\n" + - "Path: [/hello](http://cfapps.io:1002/hello)\n" + + "[http://cfapps.io:1002/hello](http://cfapps.io:1002/hello)\n" + "\n" + "Process ID: 90000\n" + "\n" +