diff options
Diffstat (limited to 'common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main')
6 files changed, 27 insertions, 108 deletions
diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/GeneratorManager.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/GeneratorManager.java index e0049bd719..92314418f3 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/GeneratorManager.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/GeneratorManager.java @@ -20,8 +20,6 @@ package org.onap.sdc.generator; -import static org.onap.sdc.generator.util.ArtifactGeneratorUtil.logError; - import com.fasterxml.jackson.databind.ObjectMapper; import org.onap.sdc.generator.data.ArtifactType; import org.onap.sdc.generator.data.GeneratorConfiguration; @@ -33,6 +31,8 @@ import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.reflections.Reflections; +import static org.onap.sdc.generator.util.ArtifactGeneratorUtil.logError; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/MockArtifactGenerator.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/MockArtifactGenerator.java index 9753c26a03..6babf721dc 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/MockArtifactGenerator.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/MockArtifactGenerator.java @@ -20,12 +20,8 @@ package org.onap.sdc.generator; -import org.onap.sdc.generator.data.GenerationData; +import org.onap.sdc.generator.data.*; import org.onap.sdc.generator.intf.ArtifactGenerator; -import org.onap.sdc.generator.data.Artifact; -import org.onap.sdc.generator.data.ArtifactType; -import org.onap.sdc.generator.data.GeneratorUtil; -import org.onap.sdc.generator.data.GroupType; import org.onap.sdc.generator.intf.Generator; import java.util.Date; diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/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 index 995d0846be..1f8b537bec 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/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 @@ -20,35 +20,18 @@ 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.model.*; import org.onap.sdc.generator.aai.tosca.GroupDefinition; +import org.onap.sdc.generator.aai.tosca.NodeTemplate; +import org.onap.sdc.generator.aai.tosca.ToscaTemplate; 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.data.*; import org.onap.sdc.generator.intf.ArtifactGenerator; import org.onap.sdc.generator.intf.Generator; +import org.onap.sdc.generator.logging.annotations.Audit; import org.onap.sdc.generator.util.ArtifactGeneratorUtil; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -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; @@ -64,6 +47,8 @@ import java.util.Map; import java.util.Properties; import java.util.Set; +import static org.onap.sdc.generator.util.ArtifactGeneratorUtil.logError; + @Generator(artifactType = ArtifactType.AAI) public class AaiArtifactGenerator implements ArtifactGenerator { diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiModelGeneratorImpl.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiModelGeneratorImpl.java index 4a4f9f0923..fcb0deb66b 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiModelGeneratorImpl.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai/AaiModelGeneratorImpl.java @@ -20,28 +20,21 @@ package org.onap.sdc.generator.aai; -import org.openecomp.sdc.logging.api.Logger; -import org.openecomp.sdc.logging.api.LoggerFactory; 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.xml.Model; -import org.onap.sdc.generator.aai.xml.ModelElement; -import org.onap.sdc.generator.aai.xml.ModelElements; -import org.onap.sdc.generator.aai.xml.ModelVer; -import org.onap.sdc.generator.aai.xml.ModelVers; -import org.onap.sdc.generator.aai.xml.Relationship; -import org.onap.sdc.generator.aai.xml.RelationshipData; -import org.onap.sdc.generator.aai.xml.RelationshipList; +import org.onap.sdc.generator.aai.xml.*; import org.onap.sdc.generator.logging.annotations.Metrics; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; import org.w3c.dom.DOMException; -import java.io.StringWriter; -import java.util.List; -import java.util.Set; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; +import java.io.StringWriter; +import java.util.List; +import java.util.Set; /** * Implementation of the {@link AaiModelGenerator} which generates the XML models from the diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/impl/ArtifactGenerationServiceImpl.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/impl/ArtifactGenerationServiceImpl.java index 42975478fe..d6a934d58a 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/impl/ArtifactGenerationServiceImpl.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/impl/ArtifactGenerationServiceImpl.java @@ -20,23 +20,23 @@ package org.onap.sdc.generator.impl; -import static org.onap.sdc.generator.util.ArtifactGeneratorUtil.logError; - -import org.onap.sdc.generator.data.GeneratorConstants; -import org.onap.sdc.generator.util.ArtifactGeneratorUtil; -import org.openecomp.sdc.logging.api.Logger; -import org.openecomp.sdc.logging.api.LoggerFactory; import org.onap.sdc.generator.GeneratorManager; import org.onap.sdc.generator.GeneratorTask; import org.onap.sdc.generator.data.Artifact; import org.onap.sdc.generator.data.GenerationData; +import org.onap.sdc.generator.data.GeneratorConstants; import org.onap.sdc.generator.intf.ArtifactGenerator; import org.onap.sdc.generator.service.ArtifactGenerationService; +import org.onap.sdc.generator.util.ArtifactGeneratorUtil; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; import java.util.List; import java.util.Map; import java.util.concurrent.ForkJoinPool; +import static org.onap.sdc.generator.util.ArtifactGeneratorUtil.logError; + /** * Artifact Generation Service implementation class. */ diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/util/ArtifactGeneratorUtil.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/util/ArtifactGeneratorUtil.java index 8e6e2c0829..afb61f873b 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/util/ArtifactGeneratorUtil.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/util/ArtifactGeneratorUtil.java @@ -20,70 +20,12 @@ package org.onap.sdc.generator.util; -import static org.onap.sdc.generator.data.GeneratorConstants.BEGIN_TIMESTAMP; -import static org.onap.sdc.generator.data.GeneratorConstants.BE_FQDN; -import static org.onap.sdc.generator.data.GeneratorConstants.CATEGORY_LOG_LEVEL; -import static org.onap.sdc.generator.data.GeneratorConstants.CLIENT_IP; -import static org.onap.sdc.generator.data.GeneratorConstants.ELAPSED_TIME; -import static org.onap.sdc.generator.data.GeneratorConstants.END_TIMESTAMP; -import static org.onap.sdc.generator.data.GeneratorConstants.ERROR_CATEGORY; -import static org.onap.sdc.generator.data.GeneratorConstants.ERROR_CODE; -import static org.onap.sdc.generator.data.GeneratorConstants.ERROR_DESCRIPTION; -import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGFILE_NOT_FOUND; -import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGLOCATION_NOT_FOUND; -import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_CONFIGLPROP_NOT_FOUND; -import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_METADATA_MISSING; -import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_PROVIDING_SERVICE_MISSING; -import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_ID; -import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_RESOURCE_VERSION_IN_SERVICE_TOSCA; -import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_INVALID_TOSCA_MSG; -import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_MANDATORY_METADATA_DEFINITION_MSG; -import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_RESOURCE_TOSCA; -import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_SERVICE_TOSCA_MSG; -import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_MISSING_SERVICE_VERSION; -import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_ERROR_NULL_RESOURCE_VERSION_IN_SERVICE_TOSCA; -import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_AAI_INVALID_SERVICE_VERSION; -import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_ERROR_ARTIFACT_GENERATION_FAILED_MSG; -import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_ERROR_INVALID_CLIENT_CONFIGURATION_MSG; -import static org.onap.sdc.generator.data.GeneratorConstants.GENERATOR_PARTNER_NAME; -import static org.onap.sdc.generator.data.GeneratorConstants.INSTANCE_UUID; -import static org.onap.sdc.generator.data.GeneratorConstants.LOCAL_ADDR; -import static org.onap.sdc.generator.data.GeneratorConstants.MDC_SDC_INSTANCE_UUID; -import static org.onap.sdc.generator.data.GeneratorConstants.PARTNER_NAME; -import static org.onap.sdc.generator.data.GeneratorConstants.REMOTE_HOST; -import static org.onap.sdc.generator.data.GeneratorConstants.REQUEST_ID; -import static org.onap.sdc.generator.data.GeneratorConstants.RESPONSE_CODE; -import static org.onap.sdc.generator.data.GeneratorConstants.RESPONSE_DESCRIPTION; -import static org.onap.sdc.generator.data.GeneratorConstants.SERVICE_INSTANCE_ID; -import static org.onap.sdc.generator.data.GeneratorConstants.SERVICE_METRIC_BEGIN_TIMESTAMP; -import static org.onap.sdc.generator.data.GeneratorConstants.SERVICE_NAME; -import static org.onap.sdc.generator.data.GeneratorConstants.STATUS_CODE; -import static org.onap.sdc.generator.data.GeneratorConstants.TARGET_ENTITY; -import static org.onap.sdc.generator.data.GeneratorConstants.TARGET_SERVICE_NAME; -import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INTERNAL_SERVER_ERROR; -import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_CLIENT_CONFIGURATION; -import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_ID_VALUE; -import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_RESOURCE_VERSION; -import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_SERVICE_VERSION; -import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.INVALID_TOSCA_YAML; -import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MANDATORY_ATTRIBUTE_MISSING; -import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_CONFIG_PROPERTIES_FILE; -import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_PRO_SERVICE; -import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_PRO_SERVICE_METADATA; -import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_RESOURCE_VERSION; -import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_SERVICE_VERSION; -import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_SYSTME_PROPERY_CONFIGURATION; -import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.MISSING_WIDGET_CONFIGURATION; -import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.RESOURCE_TOSCA_MISSING; -import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.SERVICE_TOSCA_MISSING; -import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.UNABLE_TO_GENERATE_ARTIFACT; - -import org.openecomp.sdc.logging.api.Logger; -import org.openecomp.sdc.logging.api.LoggerFactory; import org.onap.sdc.generator.data.Artifact; import org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode; import org.onap.sdc.generator.logging.CategoryLogLevel; import org.onap.sdc.generator.logging.StatusCode; +import org.openecomp.sdc.logging.api.Logger; +import org.openecomp.sdc.logging.api.LoggerFactory; import org.slf4j.MDC; import java.io.PrintWriter; @@ -95,6 +37,9 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; +import static org.onap.sdc.generator.data.GeneratorConstants.*; +import static org.onap.sdc.generator.logging.ArtifactGeneratorLogResponseCode.*; + public class ArtifactGeneratorUtil { |