Allow user to specify default installer versions in user config

Author: ddsharpe

imagetool/src/main/java/com/oracle/weblogic/imagetool/settings/UserSettings.java

@@ -10,6 +10,7 @@
 import java.nio.file.Paths;
 import java.util.Map;
 
+import com.oracle.weblogic.imagetool.installer.InstallerType;
 import com.oracle.weblogic.imagetool.logging.LoggingFacade;
 import com.oracle.weblogic.imagetool.logging.LoggingFactory;
 import com.oracle.weblogic.imagetool.util.Utils;
@@ -65,6 +66,11 @@ public class UserSettings {
      */
     private final Integer aruRetryInterval;
 
+    /**
+     * The time between each ARU REST call in milliseconds.
+     */
+    private final Map<String, Object> installers;
+
     /**
      * Default construct with all default values for settings.
      */
@@ -77,6 +83,7 @@ public UserSettings() {
 
         aruRetryMax = null;
         aruRetryInterval = null;
+        installers = null;
     }
 
     /**
@@ -94,6 +101,8 @@ public UserSettings(Map<String, Object> settings) {
 
         aruRetryMax = getValue("aruRetryMax", Integer.class, settings);
         aruRetryInterval = getValue("aruRetryInterval", Integer.class, settings);
+
+        installers = getValue("installers", Map.class, settings);
     }
 
     /**
@@ -130,18 +139,22 @@ public static UserSettings load(InputStream settings) {
     }
 
     private <T> T getValue(String settingName, Class<T> type, Map<String, Object> settings) {
+        if (settings == null) {
+            return null;
+        }
+
         Object value = settings.get(settingName);
         if (value == null) {
             return null;
         }
 
         if (type.isInstance(value)) {
             return type.cast(value);
-        } else {
-            logger.severe("Setting for {0} could not be loaded.  Expected {1}, but found {2}. Invalid value: {3}",
-                settingName, type, value.getClass(), value.toString());
-            return null;
         }
+
+        logger.severe("Setting for {0} could not be loaded.  Expected {1}, but found {2}. Invalid value: {3}",
+        settingName, type, value.getClass(), value.toString());
+        return null;
     }
 
     /**
@@ -222,6 +235,22 @@ public int getAruRetryInterval() {
         return aruRetryInterval;
     }
 
+    /**
+     * The settings asscociated with the installers to be used.
+     * @return a map of settings for installers
+     */
+    public Map<String,Object> getInstallers() {
+        return installers;
+    }
+
+    public String getDefaultInstallerVersion(InstallerType installerType) {
+        if (installers == null) {
+            return null;
+        }
+        Map<String, Object> installerSettings = getValue(installerType.toString(), Map.class, installers);
+        return getValue("defaultVersion", String.class, installerSettings);
+    }
+
     /**
      * UserSettings as a YAML string.
      * @return UserSettings as a YAML string.

imagetool/src/test/java/com/oracle/weblogic/imagetool/settings/UserSettingsTest.java

@@ -5,6 +5,7 @@
 
 import java.io.InputStream;
 
+import com.oracle.weblogic.imagetool.installer.InstallerType;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -25,6 +26,16 @@ void testSimpleSettingsFile() {
         assertEquals(200, settings.getAruRetryInterval());
     }
 
+    @Test
+    void testDefaultInstallers() {
+        InputStream inputStream = this.getClass()
+            .getClassLoader()
+            .getResourceAsStream("settings/basic_settings.yaml");
+        UserSettings settings = UserSettings.load(inputStream);
+        assertEquals("8u241", settings.getDefaultInstallerVersion(InstallerType.JDK));
+        assertEquals("12.2.1.4.0", settings.getDefaultInstallerVersion(InstallerType.WLS));
+    }
+
     @Test
     void testInvalidSettings() {
         InputStream inputStream = this.getClass()
@@ -40,6 +51,13 @@ void testOutput() {
         //TODO: re-enable this test
         String expected = "aruRetryInterval: 200\n"
             + "imageBuildDirectory: ./builds\n"
+            + "installers:\n"
+            + "    JDK:\n"
+            + "        defaultVersion: 8u241\n"
+            + "    WLS:\n"
+            + "        defaultVersion: 12.2.1.4.0\n"
+            + "    WDT:\n"
+            + "        defaultVersion: latest"
             + "patchDirectory: /home/user/patches\n";
 
         InputStream inputStream = this.getClass()

imagetool/src/test/resources/settings/basic_settings.yaml

@@ -1,3 +1,10 @@
 aruRetryInterval: 200
 imageBuildDirectory: ./builds
+installers:
+  jdk:
+    defaultVersion: 8u241
+  wls:
+    defaultVersion: 12.2.1.4.0
+  wdt:
+    defaultVersion: latest
 patchDirectory: /home/user/patches