fix (jkube-kit/common) : PluginServiceFactory fails to resolve constr…

…uctor arguments for more than one level subclasses

PluginServiceFactory tries to create ServiceImpl objects by invoking
their constructors with constructor parameter. This works fine when
constructor parameter is not using complex inheritance; but if we
provide a nested subtype as constructor argument to PluginServiceFactory (let's
say BaseA > BaseB > BaseC) it fails to resolve constructor argument.

Instead of just getting types via `constructorParameter.getClass().getInterfaces()` try getting all possible
subtypes recursively.

Signed-off-by: Rohan Kumar <rohaan@redhat.com>

jkube-kit/common/src/main/java/org/eclipse/jkube/kit/common/util/PluginServiceFactory.java

@@ -20,7 +20,6 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -155,7 +154,7 @@ private <T> Constructor<T> findConstructor(Class<T> clazz) {
         }
         final List<Class<?>> types = new ArrayList<>();
         types.add(constructorParameter.getClass());
-        types.addAll(Arrays.asList(constructorParameter.getClass().getInterfaces()));
+        types.addAll(getInterfacesForClass(constructorParameter.getClass()));
         for (Class<?> type : types) {
             try {
                 return clazz.getConstructor(type);
@@ -166,6 +165,15 @@ private <T> Constructor<T> findConstructor(Class<T> clazz) {
         throw new IllegalStateException("Cannot load service " + clazz.getName());
     }
 
+    private List<Class<?>> getInterfacesForClass(Class<?> clazz) {
+        List<Class<?>> interfacesList = new ArrayList<>();
+        for (Class<?> type : clazz.getInterfaces()) {
+            interfacesList.add(type);
+            interfacesList.addAll(getInterfacesForClass(type));
+        }
+        return interfacesList;
+    }
+
     static class ServiceEntry implements Comparable<ServiceEntry> {
 
         private final String className;

jkube-kit/common/src/test/java/org/eclipse/jkube/kit/common/util/PluginServiceFactoryNestedContextTest.java

@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) 2019 Red Hat, Inc.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at:
+ *
+ *     https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   Red Hat, Inc. - initial API and implementation
+ */
+package org.eclipse.jkube.kit.common.util;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class PluginServiceFactoryNestedContextTest {
+  private PluginServiceFactory<TestContext> pluginServiceFactory;
+
+  @BeforeEach
+  public void setup() {
+    pluginServiceFactory = new PluginServiceFactory<>(new DefaultTestContext());
+  }
+
+  @Test
+  void createServiceObjects_whenSubInterfacePassed_shouldMatchServiceImplementation() {
+    // Given
+    final String[] descriptorPaths = new String[] { "service/test-services-nested-context"};
+    // When
+    final List<TestService> result = pluginServiceFactory.createServiceObjects(descriptorPaths);
+    // Then
+    assertThat(result).hasSize(1);
+  }
+
+  public static class TestServiceImplWithBaseContext implements TestService {
+    public TestServiceImplWithBaseContext(BaseContext ctx) { }
+
+    @Override
+    public String getName() { return "one"; }
+  }
+
+  private interface TestService {
+    String getName();
+  }
+
+  private static class DefaultTestContext implements TestContext { }
+
+  private interface TestContext extends BaseContext { }
+
+  private interface BaseContext { }
+}

jkube-kit/common/src/test/resources/service/test-services-nested-context

@@ -0,0 +1 @@
+org.eclipse.jkube.kit.common.util.PluginServiceFactoryNestedContextTest$TestServiceImplWithBaseContext,5