add case and logs

zowe · Feb 16, 2022 · 49b012b · 49b012b
1 parent 8862e5e
commit 49b012b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/apiml-extension-loader/src/main/java/org/zowe/apiml/extension/ExtensionConfigReader.java b/apiml-extension-loader/src/main/java/org/zowe/apiml/extension/ExtensionConfigReader.java
@@ -14,6 +14,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -53,9 +54,13 @@ private List<ExtensionDefinition> getEnabledExtensions() {
         ObjectMapper yamlMapper = new ObjectMapper(new YAMLFactory());
         ObjectMapper jsonMapper = new ObjectMapper();
 
+        log.info("installed components: " + Arrays.toString(installedComponents.toArray()));
+        log.info("enabled components: " + Arrays.toString(enabledComponents.toArray()));
+
         for (String installedComponent : installedComponents) {
             if (enabledComponents.contains(installedComponent)) {
                 String parentPath = environment.getExtensionDirectory() + File.separator + installedComponent;
+                log.info("check path: " + parentPath);
                 Path manifestYamlPath = Paths.get(parentPath + "/manifest.yaml");
                 Path manifestJsonPath = Paths.get(parentPath + "/manifest.json");
                 try {

diff --git a/apiml-extension-loader/src/main/java/org/zowe/apiml/extension/ExtensionsLoader.java b/apiml-extension-loader/src/main/java/org/zowe/apiml/extension/ExtensionsLoader.java
@@ -40,14 +40,17 @@ public void onApplicationEvent(ApplicationContextInitializedEvent event) {
             BeanDefinitionRegistry registry = (BeanDefinitionRegistry) event.getApplicationContext();
             ClassPathBeanDefinitionScanner scanner = new ClassPathBeanDefinitionScanner(registry);
 
-            scanner.scan(configReader.getBasePackages());
+            String[] extensionsBasePackages = configReader.getBasePackages();
+            if (extensionsBasePackages.length > 0) {
+                scanner.scan(configReader.getBasePackages());
 
-            String[] beanNames = scanner.getRegistry().getBeanDefinitionNames();
-            for (String name : beanNames) {
-                if (!registry.containsBeanDefinition(name)) {
-                    registry.registerBeanDefinition(name, scanner.getRegistry().getBeanDefinition(name));
-                } else {
-                    log.info("Bean with name " + name + " is already registered in the context");
+                String[] beanNames = scanner.getRegistry().getBeanDefinitionNames();
+                for (String name : beanNames) {
+                    if (!registry.containsBeanDefinition(name)) {
+                        registry.registerBeanDefinition(name, scanner.getRegistry().getBeanDefinition(name));
+                    } else {
+                        log.info("Bean with name " + name + " is already registered in the context");
+                    }
                 }
             }
         }

diff --git a/apiml-extension-loader/src/test/java/org/zowe/apiml/extension/ExtensionsLoaderTest.java b/apiml-extension-loader/src/test/java/org/zowe/apiml/extension/ExtensionsLoaderTest.java
@@ -92,6 +92,18 @@ void onEvent_ContextAlreadyHasBean() {
         verify(registry, never()).registerBeanDefinition(anyString(), any());
     }
 
+    @Test
+    void onEvent_noExtensions() {
+        ConfigurableApplicationContext registry = mock(ConfigurableApplicationContext.class);
+        when(reader.getBasePackages()).thenReturn(new String[]{ });
+        ReflectionTestUtils.setField(extensionsLoader, "configReader", reader);
+        SpringApplication application = mock(SpringApplication.class);
+        ApplicationContextInitializedEvent event = new ApplicationContextInitializedEvent(application, new String[]{}, registry);
+        doCallRealMethod().when(extensionsLoader).onApplicationEvent(event);
+        publisher.publishEvent(event);
+        verify(registry, never()).containsBeanDefinition(anyString());
+    }
+
     @Test
     void onEvent_ContextIsRightType() {
         AnnotationConfigApplicationContext context = (AnnotationConfigApplicationContext) new TestContextManager(this.getClass()).getTestContext().getApplicationContext();