From 073b53ae7bbd343b98ef0f36e64f73d3a2bc31cf Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Fri, 4 Aug 2023 15:13:28 +0200 Subject: [PATCH] code format fixes --- .../commons/languageserver/util/Settings.java | 18 +++++++++--------- .../app/BootDiagnosticSeverityProvider.java | 5 ++++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/Settings.java b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/Settings.java index a6fb4c6e9..29e205655 100644 --- a/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/Settings.java +++ b/headless-services/commons/commons-language-server/src/main/java/org/springframework/ide/vscode/commons/languageserver/util/Settings.java @@ -41,14 +41,14 @@ public class Settings { public T getAs(Class type, String... names) { JsonElement json = getRawProperty(names); - if (json!=null) { + if (json != null) { return gson().fromJson(json, type); } return null; } private Gson gson() { - if (gson==null) { + if (gson == null) { gson = new Gson(); } return gson; @@ -123,7 +123,7 @@ public class Settings { return settings; } else if (settings instanceof JsonObject) { JsonElement sub = ((JsonObject)settings).get(names[i]); - return getRawProperty(sub, names, i+1); + return getRawProperty(sub, names, i + 1); } else { return null; } @@ -131,12 +131,12 @@ public class Settings { @Override public String toString() { - return ""+settings; + return "" + settings; } public Settings navigate(String... names) { - if (this.settings!=null && !this.settings.isJsonNull()) { - if (names.length==0) { + if (this.settings != null && !this.settings.isJsonNull()) { + if (names.length == 0) { return this; } else if (this.settings.isJsonObject()) { JsonObject obj = (JsonObject) this.settings; @@ -150,15 +150,15 @@ public class Settings { } private String[] cdr(String[] names) { - String[] rest = new String[names.length-1]; + String[] rest = new String[names.length - 1]; for (int i = 0; i < rest.length; i++) { - rest[i] = names[i+1]; + rest[i] = names[i + 1]; } return rest; } public Iterable keys() { - if (settings!=null && settings.isJsonObject()) { + if (settings != null && settings.isJsonObject()) { JsonObject obj = (JsonObject) settings; return obj.keySet(); } diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootDiagnosticSeverityProvider.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootDiagnosticSeverityProvider.java index 63e471423..36aa727b9 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootDiagnosticSeverityProvider.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/app/BootDiagnosticSeverityProvider.java @@ -28,13 +28,16 @@ public class BootDiagnosticSeverityProvider implements DiagnosticSeverityProvide @Override public synchronized DiagnosticSeverity getDiagnosticSeverity(ProblemType problem) { String severityOverride = config.getRawSettings().getString("spring-boot", "ls", "problem", problem.getCategory().getId(), problem.getCode()); + ProblemSeverity severity = null; if (severityOverride != null && !severityOverride.isBlank()) { severity = ProblemSeverity.valueOf(severityOverride); } - if (severity==null) { + + if (severity == null) { severity = problem.getDefaultSeverity(); } + return DiagnosticSeverityProvider.diagnosticSeverity(severity); } }