Rename packages from openecomp to onap.

[sdc.git] / common / onap-sdc-artifact-generator-lib / onap-sdc-artifact-generator-core / src / main / java / org / onap / sdc / generator / aai / AaiArtifactGenerator.java

diff --git a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiArtifactGenerator.java
similarity index 90%
rename from common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java
rename to common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiArtifactGenerator.java
index 8462a71..995d084 100644 (file)
--- a/common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-core/src/main/java/org/openecomp/sdc/generator/aai/AaiArtifactGenerator.java
+++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiArtifactGenerator.java
@@ -18,43 +18,37 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.sdc.generator.aai;
-
-import static org.openecomp.sdc.generator.data.GeneratorConstants.ARTIFACT_MODEL_INFO;
-import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGFILE_NOT_FOUND;
-import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND;
-import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING;
-import static org.openecomp.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_MISSING;
-import static org.openecomp.sdc.generator.data.GeneratorConstants.ID_LENGTH;
-import static org.openecomp.sdc.generator.util.ArtifactGeneratorUtil.logError;
-
+package org.onap.sdc.generator.aai;
+
+import static org.onap.sdc.generator.util.ArtifactGeneratorUtil.logError;
+
+import org.onap.sdc.generator.aai.model.AllotedResource;
+import org.onap.sdc.generator.aai.model.ProvidingService;
+import org.onap.sdc.generator.aai.model.Resource;
+import org.onap.sdc.generator.aai.model.Service;
+import org.onap.sdc.generator.aai.model.Widget;
+import org.onap.sdc.generator.aai.tosca.GroupDefinition;
+import org.onap.sdc.generator.aai.types.ModelType;
+import org.onap.sdc.generator.data.AdditionalParams;
+import org.onap.sdc.generator.data.ArtifactType;
+import org.onap.sdc.generator.data.GenerationData;
+import org.onap.sdc.generator.data.GeneratorConstants;
+import org.onap.sdc.generator.data.GroupType;
+import org.onap.sdc.generator.data.WidgetConfigurationUtil;
+import org.onap.sdc.generator.intf.ArtifactGenerator;
+import org.onap.sdc.generator.intf.Generator;
+import org.onap.sdc.generator.util.ArtifactGeneratorUtil;
 import org.openecomp.sdc.logging.api.Logger;
 import org.openecomp.sdc.logging.api.LoggerFactory;
-import org.openecomp.sdc.generator.aai.model.AllotedResource;
-import org.openecomp.sdc.generator.aai.model.ProvidingService;
-import org.openecomp.sdc.generator.aai.model.L3NetworkWidget;
-import org.openecomp.sdc.generator.aai.model.Model;
-import org.openecomp.sdc.generator.aai.model.Resource;
-import org.openecomp.sdc.generator.aai.model.Service;
-import org.openecomp.sdc.generator.aai.model.TunnelXconnectWidget;
-import org.openecomp.sdc.generator.aai.model.VfModule;
-import org.openecomp.sdc.generator.aai.model.Widget;
-import org.openecomp.sdc.generator.aai.tosca.GroupDefinition;
-import org.openecomp.sdc.generator.aai.tosca.NodeTemplate;
-import org.openecomp.sdc.generator.aai.tosca.ToscaTemplate;
-import org.openecomp.sdc.generator.aai.types.ModelType;
-import org.openecomp.sdc.generator.data.AdditionalParams;
-import org.openecomp.sdc.generator.data.Artifact;
-import org.openecomp.sdc.generator.data.ArtifactType;
-import org.openecomp.sdc.generator.data.GenerationData;
-import org.openecomp.sdc.generator.data.GeneratorConstants;
-import org.openecomp.sdc.generator.data.GeneratorUtil;
-import org.openecomp.sdc.generator.data.GroupType;
-import org.openecomp.sdc.generator.data.WidgetConfigurationUtil;
-import org.openecomp.sdc.generator.intf.ArtifactGenerator;
-import org.openecomp.sdc.generator.intf.Generator;
-import org.openecomp.sdc.generator.logging.annotations.Audit;
-import org.openecomp.sdc.generator.util.ArtifactGeneratorUtil;
+import org.onap.sdc.generator.aai.model.L3NetworkWidget;
+import org.onap.sdc.generator.aai.model.Model;
+import org.onap.sdc.generator.aai.model.TunnelXconnectWidget;
+import org.onap.sdc.generator.aai.model.VfModule;
+import org.onap.sdc.generator.aai.tosca.NodeTemplate;
+import org.onap.sdc.generator.aai.tosca.ToscaTemplate;
+import org.onap.sdc.generator.data.Artifact;
+import org.onap.sdc.generator.data.GeneratorUtil;
+import org.onap.sdc.generator.logging.annotations.Audit;
 import org.slf4j.MDC;
 
 import java.io.File;
@@ -92,7 +86,7 @@ public class AaiArtifactGenerator implements ArtifactGenerator {
       initWidgetConfiguration();
       return generateArtifactInternal(input, additionalParams);
     } catch (Exception exception) {
-      logError(exception.getMessage(), exception);
+      ArtifactGeneratorUtil.logError(exception.getMessage(), exception);
       GenerationData generationData = new GenerationData();
       generationData.add(ArtifactType.AAI.name(), exception.getMessage());
       return generationData;
@@ -201,13 +195,13 @@ public class AaiArtifactGenerator implements ArtifactGenerator {
 
     AaiModelGenerator modelGenerator = AaiModelGenerator.getInstance();
     //Generate AAI XML service model
-    MDC.put(ARTIFACT_MODEL_INFO , service.getModelName() + "," + getArtifactLabel(service));
+    MDC.put(GeneratorConstants.ARTIFACT_MODEL_INFO , service.getModelName() + "," + getArtifactLabel(service));
     String aaiServiceModel = modelGenerator.generateModelFor(service);
     generationData.add(getServiceArtifact(service, aaiServiceModel));
 
     //Generate AAI XML resource model
     for (Resource res : resources) {
-      MDC.put(ARTIFACT_MODEL_INFO , res.getModelName() + "," + getArtifactLabel(res));
+      MDC.put(GeneratorConstants.ARTIFACT_MODEL_INFO , res.getModelName() + "," + getArtifactLabel(res));
       String aaiResourceModel = modelGenerator.generateModelFor(res);
       generationData.add(getResourceArtifact(res, aaiResourceModel));
     }
@@ -283,7 +277,7 @@ public class AaiArtifactGenerator implements ArtifactGenerator {
           if (nodeProperties.get("providing_service_uuid") == null || nodeProperties.get(
               "providing_service_invariant_uuid") == null) {
             throw new IllegalArgumentException(String.format(
-                GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING
+                GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING
                 , model.getModelId()));
           }
           for (String key1 : nodeProperties.keySet()) {
@@ -305,7 +299,8 @@ public class AaiArtifactGenerator implements ArtifactGenerator {
     }
     if(model instanceof AllotedResource){
       if(!flag) {
-        throw new IllegalArgumentException(String.format(GENERATOR_AAI_PROVIDING_SERVICE_MISSING,
+        throw new IllegalArgumentException(String.format(
+            GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_MISSING,
             model.getModelId()));
       }
     }
@@ -576,7 +571,7 @@ public class AaiArtifactGenerator implements ArtifactGenerator {
             .format(GeneratorConstants.GENERATOR_AAI_ERROR_MANDATORY_METADATA_DEFINITION,
                 "invariantUUID",
                 input.getName()));
-      } else if (tosca.getMetadata().get("invariantUUID").length() != ID_LENGTH) {
+      } else if (tosca.getMetadata().get("invariantUUID").length() != GeneratorConstants.ID_LENGTH) {
         throw new IllegalArgumentException(String.format(
             GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID, "invariantUUID", input.getName()));
       }
@@ -587,7 +582,7 @@ public class AaiArtifactGenerator implements ArtifactGenerator {
         throw new IllegalArgumentException(String
             .format(GeneratorConstants.GENERATOR_AAI_ERROR_MANDATORY_METADATA_DEFINITION, "UUID",
                 input.getName()));
-      } else if (tosca.getMetadata().get("UUID").length() != ID_LENGTH) {
+      } else if (tosca.getMetadata().get("UUID").length() != GeneratorConstants.ID_LENGTH) {
         throw new IllegalArgumentException(String
             .format(GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID, "UUID", input.getName()));
       }
@@ -619,7 +614,7 @@ public class AaiArtifactGenerator implements ArtifactGenerator {
             throw new IllegalArgumentException(String
                 .format(GeneratorConstants.GENERATOR_AAI_ERROR_MANDATORY_METADATA_DEFINITION,
                     "vfModuleModelInvariantUUID", input.getName()));
-          } else if (gd.getMetadata().get("vfModuleModelInvariantUUID").length() != ID_LENGTH) {
+          } else if (gd.getMetadata().get("vfModuleModelInvariantUUID").length() != GeneratorConstants.ID_LENGTH) {
             throw new IllegalArgumentException(String.format(
                  GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID, "vfModuleModelInvariantUUID",
                  input.getName()));
@@ -631,7 +626,7 @@ public class AaiArtifactGenerator implements ArtifactGenerator {
                 .format(GeneratorConstants.GENERATOR_AAI_ERROR_MANDATORY_METADATA_DEFINITION,
                     "vfModuleModelUUID",
                     input.getName()));
-          } else if (gd.getMetadata().get("vfModuleModelUUID").length() != ID_LENGTH) {
+          } else if (gd.getMetadata().get("vfModuleModelUUID").length() != GeneratorConstants.ID_LENGTH) {
             throw new IllegalArgumentException(String.format(
                 GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID, "vfModuleModelUUID",
                 input.getName()));
@@ -677,11 +672,12 @@ public class AaiArtifactGenerator implements ArtifactGenerator {
         properties.load(new FileInputStream(file));
         WidgetConfigurationUtil.setConfig(properties);
       } else {
-        throw new IllegalArgumentException(String.format(GENERATOR_AAI_CONFIGFILE_NOT_FOUND,
+        throw new IllegalArgumentException(String.format(
+            GeneratorConstants.GENERATOR_AAI_CONFIGFILE_NOT_FOUND,
             configLocation));
       }
     } else {
-      throw new IllegalArgumentException(GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND);
+      throw new IllegalArgumentException(GeneratorConstants.GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND);
     }
   }