Remove all references to artifactgenerator config

[aai/babel.git] / src / main / java / org / onap / aai / babel / xml / generator / data / WidgetConfigurationUtil.java

diff --git a/src/main/java/org/onap/aai/babel/xml/generator/data/WidgetConfigurationUtil.java b/src/main/java/org/onap/aai/babel/xml/generator/data/WidgetConfigurationUtil.java
index b340cd9..8f774c9 100644 (file)
--- a/src/main/java/org/onap/aai/babel/xml/generator/data/WidgetConfigurationUtil.java
+++ b/src/main/java/org/onap/aai/babel/xml/generator/data/WidgetConfigurationUtil.java
@@ -28,16 +28,17 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Properties;
 import org.onap.aai.babel.xml.generator.XmlArtifactGenerationException;
 import org.onap.aai.babel.xml.generator.model.Resource;
 import org.onap.aai.babel.xml.generator.model.Widget;
-import org.onap.aai.babel.xml.generator.model.Widget.Type;
+import org.onap.aai.babel.xml.generator.model.WidgetType;
 import org.onap.aai.babel.xml.generator.types.ModelType;
 
 public class WidgetConfigurationUtil {
 
-    private static Properties config;
+    public static final String GENERATOR_AAI_CONFIGLPROP_NOT_FOUND =
+            "Cannot generate artifacts. Widget configuration not found for %s";
+
     private static List<String> instanceGroups = Collections.emptyList();
     private static Map<String, Resource> typeToResource = new HashMap<>();
     private static Map<String, Widget> typeToWidget = new HashMap<>();
@@ -49,14 +50,6 @@ public class WidgetConfigurationUtil {
         throw new UnsupportedOperationException("This static class should not be instantiated!");
     }
 
-    public static Properties getConfig() {
-        return config;
-    }
-
-    public static void setConfig(Properties config) {
-        WidgetConfigurationUtil.config = config;
-    }
-
     public static void setSupportedInstanceGroups(List<String> supportedInstanceGroups) {
         instanceGroups = supportedInstanceGroups;
     }
@@ -66,11 +59,25 @@ public class WidgetConfigurationUtil {
     }
 
     public static Optional<Resource> createModelFromType(String typePrefix) {
-        return Optional.ofNullable(typeToResource.get(typePrefix));
+        Optional<Resource> resource = Optional.ofNullable(typeToResource.get(typePrefix));
+        if (resource.isPresent()) {
+            // Make a copy of the Resource found in the mappings table.
+            return Optional.of(new Resource(resource.get()));
+        }
+        return resource;
     }
 
-    public static Widget createWidgetFromType(Type type) throws XmlArtifactGenerationException {
-        Optional<Widget> widget = Optional.ofNullable(typeToWidget.get(type.toString()));
+    /**
+     * Create a new Widget object according to the supplied Widget Type.
+     *
+     * @param widgetType
+     *            a String identifying the type of Widget to create
+     * @return a new Widget object from the defined widget type, or else null
+     * @throws XmlArtifactGenerationException
+     *             if there is an internal error creating the Widget because of the defined widget mappings
+     */
+    public static Widget createWidgetFromType(String widgetType) throws XmlArtifactGenerationException {
+        Optional<Widget> widget = Optional.ofNullable(typeToWidget.get(widgetType));
         if (widget.isPresent()) {
             // Make a copy of the Widget found in the mappings table.
             return new Widget(widget.get());
@@ -78,15 +85,18 @@ public class WidgetConfigurationUtil {
         return null;
     }
 
-    public static void setWidgetTypes(List<WidgetType> types) {
-        for (WidgetType type : types) {
-            if (type.type == null || type.name == null) {
+    public static void setWidgetTypes(List<WidgetTypeConfig> types) {
+        WidgetType.clearElements();
+        for (WidgetTypeConfig type : types) {
+            if (type.type == null || type.name == null || type.modelInvariantId == null
+                    || type.modelVersionId == null) {
                 throw new IllegalArgumentException("Incomplete widget type specified: " + type);
             }
-            Type widgetType = Widget.Type.valueOf(type.type);
-            Widget widget = new Widget(widgetType, type.name, type.deleteFlag);
+            Widget widget = new Widget(new WidgetType(type.type), type.name, type.deleteFlag, //
+                    type.modelInvariantId, type.modelVersionId);
             typeToWidget.put(type.type, widget);
         }
+        WidgetType.validateElements();
     }
 
     public static void setWidgetMappings(List<WidgetMapping> mappings) throws IOException {
@@ -96,9 +106,10 @@ public class WidgetConfigurationUtil {
             if (mapping.prefix == null || mapping.widget == null || modelType == null) {
                 throw new IOException("Invalid widget mapping specified: " + mapping);
             }
-            Resource resource = new Resource(Widget.Type.valueOf(mapping.widget), mapping.deleteFlag);
+            Resource resource = new Resource(WidgetType.valueOf(mapping.widget), mapping.deleteFlag);
             resource.setModelType(modelType);
             typeToResource.put(mapping.prefix, resource);
         }
     }
+
 }