diff options
Diffstat (limited to 'common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-core/src/main/java/org/onap/sdc/generator/aai')
2 files changed, 13 insertions, 35 deletions
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 |