From e4aa8f033ff46a02790e9ba4d65523d2652b0ed2 Mon Sep 17 00:00:00 2001 From: Arun Venmany Date: Thu, 5 Sep 2024 20:03:15 +0530 Subject: [PATCH 1/2] microprofile platform diagnostic issue fix Signed-off-by: Arun Venmany --- .../lemminx/LibertyDiagnosticParticipant.java | 2 +- .../java/io/openliberty/LibertyDiagnosticTest.java | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lemminx-liberty/src/main/java/io/openliberty/tools/langserver/lemminx/LibertyDiagnosticParticipant.java b/lemminx-liberty/src/main/java/io/openliberty/tools/langserver/lemminx/LibertyDiagnosticParticipant.java index 5f47709b..d228723b 100644 --- a/lemminx-liberty/src/main/java/io/openliberty/tools/langserver/lemminx/LibertyDiagnosticParticipant.java +++ b/lemminx-liberty/src/main/java/io/openliberty/tools/langserver/lemminx/LibertyDiagnosticParticipant.java @@ -344,7 +344,7 @@ private void validatePlatform(DOMDocument domDocument, List list, DO list.add(new Diagnostic(range, message, DiagnosticSeverity.Error, LIBERTY_LEMMINX_SOURCE)); } preferredPlatformsWithoutVersion.add(platformNoVersionLower); - preferredPlatforms.add(platformNameLowerCase); + preferredPlatforms.add(platformName); } } diff --git a/lemminx-liberty/src/test/java/io/openliberty/LibertyDiagnosticTest.java b/lemminx-liberty/src/test/java/io/openliberty/LibertyDiagnosticTest.java index d83c7f20..41c0293c 100644 --- a/lemminx-liberty/src/test/java/io/openliberty/LibertyDiagnosticTest.java +++ b/lemminx-liberty/src/test/java/io/openliberty/LibertyDiagnosticTest.java @@ -607,7 +607,6 @@ public void testUnresolvedPlatformForVersionlessFeatureDiagnostic() throws BadLo @Test public void testValidPlatformDiagnostic() throws BadLocationException { - String serverXML = String.join(newLine, // "", // " ", // @@ -627,6 +626,7 @@ public void testValidPlatformDiagnostic() throws BadLocationException { " ", // "" // ); + XMLAssert.testDiagnosticsFor(serverXML, null, null, serverXMLURI); serverXML = String.join(newLine, // @@ -639,5 +639,17 @@ public void testValidPlatformDiagnostic() throws BadLocationException { "" // ); XMLAssert.testDiagnosticsFor(serverXML, null, null, serverXMLURI); + + serverXML = String.join(newLine, // + "", // + " ", // + " mpMetrics", // + " mpHealth", // + " microProfile-5.0", // + " ", // + "" // + ); + + XMLAssert.testDiagnosticsFor(serverXML, null, null, serverXMLURI); } } \ No newline at end of file From 4fda52e4b36db1cba4eca97c3c2ab1b946da0d3b Mon Sep 17 00:00:00 2001 From: Arun Venmany Date: Thu, 5 Sep 2024 22:03:34 +0530 Subject: [PATCH 2/2] microprofile platform diagnostic issue fix Signed-off-by: Arun Venmany --- .../lemminx/LibertyDiagnosticParticipant.java | 2 +- .../langserver/lemminx/services/FeatureService.java | 2 +- .../java/io/openliberty/LibertyDiagnosticTest.java | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lemminx-liberty/src/main/java/io/openliberty/tools/langserver/lemminx/LibertyDiagnosticParticipant.java b/lemminx-liberty/src/main/java/io/openliberty/tools/langserver/lemminx/LibertyDiagnosticParticipant.java index d228723b..5f47709b 100644 --- a/lemminx-liberty/src/main/java/io/openliberty/tools/langserver/lemminx/LibertyDiagnosticParticipant.java +++ b/lemminx-liberty/src/main/java/io/openliberty/tools/langserver/lemminx/LibertyDiagnosticParticipant.java @@ -344,7 +344,7 @@ private void validatePlatform(DOMDocument domDocument, List list, DO list.add(new Diagnostic(range, message, DiagnosticSeverity.Error, LIBERTY_LEMMINX_SOURCE)); } preferredPlatformsWithoutVersion.add(platformNoVersionLower); - preferredPlatforms.add(platformName); + preferredPlatforms.add(platformNameLowerCase); } } diff --git a/lemminx-liberty/src/main/java/io/openliberty/tools/langserver/lemminx/services/FeatureService.java b/lemminx-liberty/src/main/java/io/openliberty/tools/langserver/lemminx/services/FeatureService.java index 353fdb24..689fdc3c 100644 --- a/lemminx-liberty/src/main/java/io/openliberty/tools/langserver/lemminx/services/FeatureService.java +++ b/lemminx-liberty/src/main/java/io/openliberty/tools/langserver/lemminx/services/FeatureService.java @@ -634,7 +634,7 @@ public Set getAllPlatformsForVersionLessFeature(String featureName, Stri } return featureNames.stream() .map(f -> getAllPlatformsForFeature(f, libertyVersion, libertyRuntime, requestDelay, documentURI)) - .flatMap(Set::stream).collect(Collectors.toSet()); + .flatMap(Set::stream).map(String::toLowerCase).collect(Collectors.toSet()); } /** diff --git a/lemminx-liberty/src/test/java/io/openliberty/LibertyDiagnosticTest.java b/lemminx-liberty/src/test/java/io/openliberty/LibertyDiagnosticTest.java index 41c0293c..00532f24 100644 --- a/lemminx-liberty/src/test/java/io/openliberty/LibertyDiagnosticTest.java +++ b/lemminx-liberty/src/test/java/io/openliberty/LibertyDiagnosticTest.java @@ -651,5 +651,18 @@ public void testValidPlatformDiagnostic() throws BadLocationException { ); XMLAssert.testDiagnosticsFor(serverXML, null, null, serverXMLURI); + + serverXML = String.join(newLine, // + "", // + " ", // + " servlet", // + " jpa", // + " jaxrs", // + " jakartaee-9.1", // + " ", // + "" // + ); + + XMLAssert.testDiagnosticsFor(serverXML, null, null, serverXMLURI); } } \ No newline at end of file