commit 03d924c1028bbb10792f045fe8cb0f5c670f36ae
author Bryan Bende <bbende@gmail.com> Tue May 10 13:57:35 2022 -0400
committer Kevin Doran <kdoran@apache.org> Wed Jun 15 12:31:44 2022 -0400
tree cea87f195ddb83dc02a104d5b02e98bda26ae515
parent 8a503445f095a6a13aa075714e4498ab4efa461c

NIFI-10011 Recursively look for provided API implementations

src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionDefinitionFactory.java

diff --git a/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionDefinitionFactory.java b/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionDefinitionFactory.java
index d632d19..5e51614 100644
--- a/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionDefinitionFactory.java
+++ b/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionDefinitionFactory.java
@@ -83,22 +83,30 @@
 
         final Set<ServiceAPIDefinition> serviceApis = new HashSet<>();
         final Class<?> controllerServiceClass = Class.forName("org.apache.nifi.controller.ControllerService", false, extensionClassLoader);
+        addProvidedServiceAPIs(controllerServiceClass, extensionClass, serviceApis);
+        return serviceApis;
+    }
 
-        for (final Class<?> implementedInterface : extensionClass.getInterfaces()) {
-            if (controllerServiceClass.isAssignableFrom(implementedInterface)) {
-                final ClassLoader interfaceClassLoader = implementedInterface.getClassLoader();
-                if (interfaceClassLoader instanceof ExtensionClassLoader) {
-                    final Artifact interfaceNarArtifact = ((ExtensionClassLoader) interfaceClassLoader).getNarArtifact();
+    private void addProvidedServiceAPIs(final Class<?> controllerServiceClass, final Class<?> extensionClass, final Set<ServiceAPIDefinition> serviceApis) {
+        if (extensionClass.getInterfaces() != null) {
+            for (final Class<?> implementedInterface : extensionClass.getInterfaces()) {
+                if (controllerServiceClass.isAssignableFrom(implementedInterface) && !controllerServiceClass.equals(implementedInterface)) {
+                    final ClassLoader interfaceClassLoader = implementedInterface.getClassLoader();
+                    if (interfaceClassLoader instanceof ExtensionClassLoader) {
+                        final Artifact interfaceNarArtifact = ((ExtensionClassLoader) interfaceClassLoader).getNarArtifact();
 
-                    final ServiceAPIDefinition serviceDefinition = new StandardServiceAPIDefinition(implementedInterface.getName(),
-                        interfaceNarArtifact.getGroupId(), interfaceNarArtifact.getArtifactId(), interfaceNarArtifact.getBaseVersion());
+                        final ServiceAPIDefinition serviceDefinition = new StandardServiceAPIDefinition(implementedInterface.getName(),
+                                interfaceNarArtifact.getGroupId(), interfaceNarArtifact.getArtifactId(), interfaceNarArtifact.getBaseVersion());
 
-                    serviceApis.add(serviceDefinition);
+                        serviceApis.add(serviceDefinition);
+                    }
                 }
             }
         }
 
-        return serviceApis;
+        if (extensionClass.getSuperclass() != null) {
+            addProvidedServiceAPIs(controllerServiceClass, extensionClass.getSuperclass(), serviceApis);
+        }
     }
 
     private Set<String> discoverClassNames(final String extensionType) throws IOException {