From 5b593496b8f1b8e8be8d7d2dbcc223332e65a49b Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 29 Jul 2018 16:13:45 +0300 Subject: re base code Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5 Issue-ID: SDC-1566 Signed-off-by: Michael Lando --- .../java/org/onap/sdc/generator/aai/AaiModelGenerator.java | 2 +- .../org/onap/sdc/generator/aai/model/FlavorWidget.java | 2 +- .../java/org/onap/sdc/generator/aai/model/ImageWidget.java | 2 +- .../java/org/onap/sdc/generator/aai/model/LIntfWidget.java | 2 +- .../java/org/onap/sdc/generator/aai/model/OamNetwork.java | 2 +- .../org/onap/sdc/generator/aai/model/TenantWidget.java | 2 +- .../org/onap/sdc/generator/aai/model/VServerWidget.java | 2 +- .../org/onap/sdc/generator/aai/model/VfModuleWidget.java | 2 +- .../main/java/org/onap/sdc/generator/aai/model/Widget.java | 14 +++++++------- .../org/onap/sdc/generator/intf/ArtifactGenerator.java | 2 +- .../sdc/generator/service/ArtifactGenerationService.java | 4 ++-- 11 files changed, 18 insertions(+), 18 deletions(-) (limited to 'common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap') diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/AaiModelGenerator.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/AaiModelGenerator.java index 5c81ff5dda..ac39bb4b60 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/AaiModelGenerator.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/AaiModelGenerator.java @@ -20,9 +20,9 @@ package org.onap.sdc.generator.aai; -import org.onap.sdc.generator.data.GeneratorConstants; import org.onap.sdc.generator.aai.model.Resource; import org.onap.sdc.generator.aai.model.Service; +import org.onap.sdc.generator.data.GeneratorConstants; import org.onap.sdc.generator.logging.CategoryLogLevel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/FlavorWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/FlavorWidget.java index a427918bff..b08a3d4e27 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/FlavorWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/FlavorWidget.java @@ -21,8 +21,8 @@ package org.onap.sdc.generator.aai.model; import org.onap.sdc.generator.aai.types.Cardinality; -import org.onap.sdc.generator.aai.types.ModelType; import org.onap.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.ModelType; import org.onap.sdc.generator.aai.types.ModelWidget; @Model(widget = Widget.Type.FLAVOR, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = false) diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ImageWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ImageWidget.java index 52a52fc71e..aef01d8a5b 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ImageWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/ImageWidget.java @@ -21,8 +21,8 @@ package org.onap.sdc.generator.aai.model; import org.onap.sdc.generator.aai.types.Cardinality; -import org.onap.sdc.generator.aai.types.ModelType; import org.onap.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.ModelType; import org.onap.sdc.generator.aai.types.ModelWidget; @Model(widget = Widget.Type.IMAGE, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = false) diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/LIntfWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/LIntfWidget.java index de62624392..d5f00ff50c 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/LIntfWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/LIntfWidget.java @@ -21,8 +21,8 @@ package org.onap.sdc.generator.aai.model; import org.onap.sdc.generator.aai.types.Cardinality; -import org.onap.sdc.generator.aai.types.ModelType; import org.onap.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.ModelType; import org.onap.sdc.generator.aai.types.ModelWidget; @Model(widget = Widget.Type.LINT, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true) diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/OamNetwork.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/OamNetwork.java index d51bf7af96..72686b5bc2 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/OamNetwork.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/OamNetwork.java @@ -21,9 +21,9 @@ package org.onap.sdc.generator.aai.model; import org.onap.sdc.generator.aai.types.Cardinality; +import org.onap.sdc.generator.aai.types.Model; import org.onap.sdc.generator.aai.types.ModelType; import org.onap.sdc.generator.aai.types.ModelWidget; -import org.onap.sdc.generator.aai.types.Model; @Model(widget = Widget.Type.L3_NET, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true) @ModelWidget(type = ModelType.WIDGET, name = "oam-network") diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/TenantWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/TenantWidget.java index 23e57be12f..93ca9c5178 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/TenantWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/TenantWidget.java @@ -21,8 +21,8 @@ package org.onap.sdc.generator.aai.model; import org.onap.sdc.generator.aai.types.Cardinality; -import org.onap.sdc.generator.aai.types.ModelType; import org.onap.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.ModelType; import org.onap.sdc.generator.aai.types.ModelWidget; @Model(widget = Widget.Type.TENANT, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = false) diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VServerWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VServerWidget.java index 6df5bb1407..c633f5b338 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VServerWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VServerWidget.java @@ -21,8 +21,8 @@ package org.onap.sdc.generator.aai.model; import org.onap.sdc.generator.aai.types.Cardinality; -import org.onap.sdc.generator.aai.types.ModelType; import org.onap.sdc.generator.aai.types.Model; +import org.onap.sdc.generator.aai.types.ModelType; import org.onap.sdc.generator.aai.types.ModelWidget; @Model(widget = Widget.Type.VSERVER, cardinality = Cardinality.UNBOUNDED, dataDeleteFlag = true) diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfModuleWidget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfModuleWidget.java index 9753db600c..b191538e50 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfModuleWidget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/VfModuleWidget.java @@ -20,9 +20,9 @@ package org.onap.sdc.generator.aai.model; +import org.onap.sdc.generator.aai.types.Cardinality; import org.onap.sdc.generator.aai.types.Model; import org.onap.sdc.generator.aai.types.ModelType; -import org.onap.sdc.generator.aai.types.Cardinality; import org.onap.sdc.generator.aai.types.ModelWidget; @Model(widget = Widget.Type.VFMODULE, diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Widget.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Widget.java index b289b0a83c..dfb17cc660 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Widget.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/aai/model/Widget.java @@ -20,19 +20,19 @@ package org.onap.sdc.generator.aai.model; -import org.onap.sdc.generator.aai.types.ModelType; -import org.onap.sdc.generator.data.ArtifactType; -import org.onap.sdc.generator.data.GeneratorConstants; -import org.onap.sdc.generator.aai.types.ModelWidget; -import org.onap.sdc.generator.data.WidgetConfigurationUtil; -import org.onap.sdc.generator.error.IllegalAccessException; - import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Properties; import java.util.Set; +import org.onap.sdc.generator.aai.types.ModelType; +import org.onap.sdc.generator.aai.types.ModelWidget; +import org.onap.sdc.generator.data.ArtifactType; +import org.onap.sdc.generator.data.GeneratorConstants; +import org.onap.sdc.generator.data.WidgetConfigurationUtil; +import org.onap.sdc.generator.error.IllegalAccessException; + public abstract class Widget extends Model { private Set keys = new HashSet<>(); diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/intf/ArtifactGenerator.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/intf/ArtifactGenerator.java index 4578a150e0..7e198df4bb 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/intf/ArtifactGenerator.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/intf/ArtifactGenerator.java @@ -20,8 +20,8 @@ package org.onap.sdc.generator.intf; -import org.onap.sdc.generator.data.GenerationData; import org.onap.sdc.generator.data.Artifact; +import org.onap.sdc.generator.data.GenerationData; import java.util.List; import java.util.Map; diff --git a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/service/ArtifactGenerationService.java b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/service/ArtifactGenerationService.java index 2af9664481..60a90e9a9e 100644 --- a/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/service/ArtifactGenerationService.java +++ b/common/onap-sdc-artifact-generator-lib/onap-sdc-artifact-generator-api/src/main/java/org/onap/sdc/generator/service/ArtifactGenerationService.java @@ -20,12 +20,12 @@ package org.onap.sdc.generator.service; +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.logging.CategoryLogLevel; 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.CategoryLogLevel; import org.slf4j.MDC; import java.util.List; -- cgit 1.2.3-korg