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 8993b46e8..5056d9fe6 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 @@ -31,7 +31,7 @@ import org.json.JSONArray; import org.json.JSONObject; import org.springframework.ide.vscode.boot.java.handlers.HoverProvider; import org.springframework.ide.vscode.boot.java.utils.HoverContentUtils; -import org.springframework.ide.vscode.commons.boot.app.cli.RunningAppConditional; +import org.springframework.ide.vscode.commons.boot.app.cli.LiveConditional; import org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp; import org.springframework.ide.vscode.commons.util.BadLocationException; import org.springframework.ide.vscode.commons.util.Log; @@ -57,7 +57,7 @@ public class ConditionalsLiveHoverProvider implements HoverProvider { try { if (runningApps.length > 0) { ConditionalParserFromRunningApp parser = new ConditionalParserFromRunningApp(); - Optional> val = parser.parse(annotation, runningApps); + Optional> val = parser.parse(annotation, runningApps); if (val.isPresent()) { Range hoverRange = doc.toRange(annotation.getStartPosition(), annotation.getLength()); return ImmutableList.of(hoverRange); @@ -76,7 +76,7 @@ public class ConditionalsLiveHoverProvider implements HoverProvider { try { List> hoverContent = new ArrayList<>(); ConditionalParserFromRunningApp parser = new ConditionalParserFromRunningApp(); - Optional> val = parser.parse(annotation, runningApps); + Optional> val = parser.parse(annotation, runningApps); if (val.isPresent()) { addHoverContent(val.get(), hoverContent); @@ -96,10 +96,10 @@ public class ConditionalsLiveHoverProvider implements HoverProvider { return null; } - private void addHoverContent(List conditions, + private void addHoverContent(List conditions, List> hoverContent) throws Exception { for (int i = 0; i < conditions.size(); i++) { - RunningAppConditional condition = conditions.get(i); + LiveConditional condition = conditions.get(i); hoverContent.add(Either.forLeft(condition.message)); hoverContent.add(Either .forLeft(HoverContentUtils.getProcessInformation(condition.app))); @@ -122,15 +122,15 @@ public class ConditionalsLiveHoverProvider implements HoverProvider { */ public static class ConditionalParserFromRunningApp { - public Optional> parse(Annotation annotation, SpringBootApp[] runningApps) { + public Optional> parse(Annotation annotation, SpringBootApp[] runningApps) { try { - List allConditionals = new ArrayList<>(); + List allConditionals = new ArrayList<>(); for (SpringBootApp app : runningApps) { String autoConfigRecord = app.getAutoConfigReport(); if (autoConfigRecord != null) { JSONObject autoConfigJson = new JSONObject(autoConfigRecord); - List conditionalsFromPositiveMatches = getConditionals(app, annotation, + List conditionalsFromPositiveMatches = getConditionals(app, annotation, autoConfigJson); if (!conditionalsFromPositiveMatches.isEmpty()) { allConditionals.addAll(conditionalsFromPositiveMatches); @@ -154,9 +154,9 @@ public class ConditionalsLiveHoverProvider implements HoverProvider { * @return non-null list of conditionals parsed from an autoconfig report. List * may be empty. */ - private List getConditionals(SpringBootApp app, Annotation annotation, + private List getConditionals(SpringBootApp app, Annotation annotation, JSONObject autoConfigJson) { - List conditions = new ArrayList<>(); + List conditions = new ArrayList<>(); getPositiveMatches(autoConfigJson).ifPresent((positiveMatches) -> { Iterator pMKeys = positiveMatches.keys(); @@ -217,14 +217,14 @@ public class ConditionalsLiveHoverProvider implements HoverProvider { return false; } - protected Optional getMatchedCondition(SpringBootApp app, JSONObject conditionJson, + 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(app, condition, message)); + return Optional.of(new LiveConditional(app, condition, message)); } } return Optional.empty(); diff --git a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/RunningAppConditional.java b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/LiveConditional.java similarity index 87% rename from headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/RunningAppConditional.java rename to headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/LiveConditional.java index 4454e4cdc..b19884db5 100644 --- a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/RunningAppConditional.java +++ b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/LiveConditional.java @@ -12,13 +12,13 @@ package org.springframework.ide.vscode.commons.boot.app.cli; import org.springframework.ide.vscode.commons.boot.app.cli.SpringBootApp; -public class RunningAppConditional { +public class LiveConditional { public final String condition; public final String message; public final SpringBootApp app; - public RunningAppConditional(SpringBootApp app, String condition, String message) { + public LiveConditional(SpringBootApp app, String condition, String message) { this.condition = condition; this.message = message; this.app = app;