From f8f630ce1ed2b089b1d4d96b2272fcd350e8e27e Mon Sep 17 00:00:00 2001 From: Anusree Lakshmi Date: Mon, 20 Jan 2025 11:14:46 +0530 Subject: [PATCH 1/3] URL changed to URI.toURL --- .../jaxrs/java/JaxRsWorkspaceSymbolParticipant.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java index 068eb33e9..2d6c51714 100644 --- a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java +++ b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java @@ -28,7 +28,9 @@ import org.eclipse.lsp4j.SymbolKind; import java.net.MalformedURLException; +import java.net.URISyntaxException; import java.net.URL; +import java.net.URI; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -112,7 +114,12 @@ private static SymbolInformation createSymbol(JaxRsMethodInfo methodInfo, IPsiUt Location location = new Location(methodInfo.getDocumentUri(), r); StringBuilder nameBuilder = new StringBuilder("@"); - URL url = new URL(methodInfo.getUrl()); + URL url; + try { + url = new URI(methodInfo.getUrl()).toURL(); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } String path = url.getPath(); nameBuilder.append(path); nameBuilder.append(": "); From cf7ec94d6098a8c15898cc0878ad5d61fe91950d Mon Sep 17 00:00:00 2001 From: Anusree Lakshmi Date: Mon, 20 Jan 2025 11:34:40 +0530 Subject: [PATCH 2/3] copyright year updated --- .../internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java index 2d6c51714..6fd6e9ed8 100644 --- a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java +++ b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2024 Red Hat Inc. and others. +* Copyright (c) 2024, 2025 Red Hat Inc. and others. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0 which is available at From 363852022e6795514a6f133ff0a5d0a06ae8cd10 Mon Sep 17 00:00:00 2001 From: Anusree Lakshmi Date: Tue, 28 Jan 2025 11:13:27 +0530 Subject: [PATCH 3/3] Removed the try-catch block for URISyntaxException and added it to the throws clause --- .../jaxrs/java/JaxRsWorkspaceSymbolParticipant.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java index 6fd6e9ed8..02041fe8b 100644 --- a/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java +++ b/src/main/java/io/openliberty/tools/intellij/lsp4mp4ij/psi/internal/jaxrs/java/JaxRsWorkspaceSymbolParticipant.java @@ -108,18 +108,13 @@ private static Set getAllJaxRsTypes(Module javaProject, IPsiUtils util return jaxrsTypes; } - private static SymbolInformation createSymbol(JaxRsMethodInfo methodInfo, IPsiUtils utils) throws MalformedURLException { + private static SymbolInformation createSymbol(JaxRsMethodInfo methodInfo, IPsiUtils utils) throws MalformedURLException, URISyntaxException { TextRange sourceRange = methodInfo.getJavaMethod().getNameIdentifier().getTextRange(); Range r = utils.toRange(methodInfo.getJavaMethod(), sourceRange.getStartOffset(), sourceRange.getLength()); Location location = new Location(methodInfo.getDocumentUri(), r); StringBuilder nameBuilder = new StringBuilder("@"); - URL url; - try { - url = new URI(methodInfo.getUrl()).toURL(); - } catch (URISyntaxException e) { - throw new RuntimeException(e); - } + URL url = new URI(methodInfo.getUrl()).toURL(); String path = url.getPath(); nameBuilder.append(path); nameBuilder.append(": ");