Micronaut: Provide Endpoint and Bean symbols originating from libraries.

apache · Jun 20, 2024 · 382aeba · 382aeba
1 parent b4f3d08
commit 382aeba
Show file tree

Hide file tree

Showing 6 changed files with 489 additions and 93 deletions.
diff --git a/...prise/micronaut/src/org/netbeans/modules/micronaut/symbol/MicronautStructureProvider.java b/...prise/micronaut/src/org/netbeans/modules/micronaut/symbol/MicronautStructureProvider.java
@@ -43,7 +43,8 @@ public List<StructureElement> getStructure(Document doc) {
         JavaSource js = JavaSource.forDocument(doc);
         if (js != null) {
             ClassPath cp = js.getClasspathInfo().getClassPath(ClasspathInfo.PathKind.COMPILE);
-            if (cp.findResource("io/micronaut/http/annotation/HttpMethodMapping.class") != null) {
+            if (cp.findResource("io/micronaut/http/annotation/HttpMethodMapping.class") != null
+                    || cp.findResource("io/micronaut/management/endpoint/annotation/Endpoint.class") != null) {
                 try {
                     List<StructureElement> elements = new ArrayList<>();
                     js.runUserActionTask(cc -> {

diff --git a/...ise/micronaut/src/org/netbeans/modules/micronaut/symbol/MicronautSymbolErrorProvider.java b/...ise/micronaut/src/org/netbeans/modules/micronaut/symbol/MicronautSymbolErrorProvider.java
@@ -65,8 +65,8 @@ public List<? extends Diagnostic> computeErrors(Context context) {
         "ERR_Duplicated_URI_path=Duplicated endpoint URI path: {0}"
     })
     private Diagnostic desc2diag(MicronautSymbolSearcher.SymbolDescriptor descriptor) {
-        OffsetRange offsetRange = descriptor.getOffsetRange(null);
-        return Diagnostic.Builder.create(() -> offsetRange.getStart(), () -> offsetRange.getEnd(), Bundle.ERR_Duplicated_URI_path(descriptor.getName()))
+        OffsetRange offsetRange = descriptor.getElement().getOffsetRange(null);
+        return Diagnostic.Builder.create(() -> offsetRange.getStart(), () -> offsetRange.getEnd(), Bundle.ERR_Duplicated_URI_path(descriptor.getElement().getName()))
                 .setCode("WARN_Duplicated_MN_Data_Endpoint_Path " + offsetRange.getStart() + " - " + offsetRange.getEnd())
                 .setSeverity(Diagnostic.Severity.Warning)
                 .build();