From 56adc770bf0f2436fad464c3b9d6333aa279eb31 Mon Sep 17 00:00:00 2001 From: "k.kedron" Date: Mon, 24 Jun 2019 11:03:24 +0200 Subject: Change import for 'enums' packaged. In the DCAE-BE-PROPERTY the Enums package was renamed (90067), the import of this package must be updated. Cleaned not used import. Issue-ID: SDC-2327 Signed-off-by: Krystian Kedron Change-Id: I17e0603cee5e4ba36f815a340607e76b5fc0d24b --- .../main/java/org/onap/sdc/dcae/composition/CompositionConfig.java | 2 +- .../main/java/org/onap/sdc/dcae/composition/CompositionEngine.java | 2 +- .../org/onap/sdc/dcae/composition/controller/BaseController.java | 2 +- .../onap/sdc/dcae/composition/controller/CompositionController.java | 2 +- .../sdc/dcae/composition/controller/ConfigurationController.java | 2 +- .../onap/sdc/dcae/composition/controller/RuleEditorController.java | 2 +- .../onap/sdc/dcae/composition/controller/ServicesController.java | 2 +- .../org/onap/sdc/dcae/composition/controller/VfcmtController.java | 2 +- .../sdc/dcae/composition/controller/health/HealthController.java | 2 +- .../onap/sdc/dcae/composition/controller/health/HealthPoller.java | 2 +- .../java/org/onap/sdc/dcae/composition/impl/BaseBusinessLogic.java | 2 +- .../org/onap/sdc/dcae/composition/impl/BlueprintBusinessLogic.java | 3 +-- .../onap/sdc/dcae/composition/impl/CompositionBusinessLogic.java | 2 +- .../sdc/dcae/composition/impl/CompositionCatalogBusinessLogic.java | 2 +- .../org/onap/sdc/dcae/composition/impl/ReferenceBusinessLogic.java | 2 +- .../org/onap/sdc/dcae/composition/impl/RuleEditorBusinessLogic.java | 2 +- .../org/onap/sdc/dcae/composition/impl/ServiceBusinessLogic.java | 2 +- .../java/org/onap/sdc/dcae/composition/impl/VfcmtBusinessLogic.java | 2 +- .../java/org/onap/sdc/dcae/errormng/ErrorConfigurationLoader.java | 2 +- dcaedt_be/src/main/java/org/onap/sdc/dcae/errormng/ErrorInfo.java | 2 +- .../main/java/org/onap/sdc/dcae/errormng/ResponseFormatManager.java | 2 +- dcaedt_be/src/main/java/org/onap/sdc/dcae/filter/LoggingFilter.java | 4 ++-- .../java/org/onap/sdc/dcae/rule/editor/impl/RulesBusinessLogic.java | 2 +- .../org/onap/sdc/dcae/rule/editor/translators/ActionTranslator.java | 2 +- .../onap/sdc/dcae/rule/editor/translators/CopyActionTranslator.java | 2 +- .../sdc/dcae/rule/editor/translators/RegexActionTranslator.java | 2 +- .../org/onap/sdc/dcae/rule/editor/translators/RuleTranslator.java | 2 +- .../java/org/onap/sdc/dcae/rule/editor/utils/RulesPayloadUtils.java | 2 +- .../onap/sdc/dcae/rule/editor/validators/MapActionValidator.java | 2 +- .../onap/sdc/dcae/rule/editor/validators/TopoSearchValidator.java | 2 +- .../src/main/java/org/onap/sdc/dcae/ves/VesStructureLoader.java | 2 +- .../src/test/java/org/onap/sdc/dcae/filter/LoggingFilterTest.java | 6 ------ .../src/main/java/org/onap/sdc/dcae/catalog/asdc/ASDCCatalog.java | 2 +- .../asdc/src/main/java/org/onap/sdc/dcae/client/SdcRestClient.java | 2 +- .../main/java/org/onap/sdc/dcae/errormng/AbstractSdncException.java | 2 +- .../src/main/java/org/onap/sdc/dcae/catalog/commons/Futures.java | 2 +- .../src/main/java/org/onap/sdc/dcae/catalog/commons/Recycler.java | 2 +- .../java/org/onap/sdc/dcae/catalog/engine/CatalogController.java | 2 +- .../checker/src/main/java/org/onap/sdc/dcae/checker/Catalog.java | 2 +- .../checker/src/main/java/org/onap/sdc/dcae/checker/Checker.java | 2 +- .../src/main/java/org/onap/sdc/dcae/checker/CommonLocator.java | 2 +- .../checker/src/main/java/org/onap/sdc/dcae/checker/Data.java | 2 +- .../checker/src/main/java/org/onap/sdc/dcae/checker/JSP.java | 2 +- .../src/main/java/org/onap/sdc/dcae/checker/common/DataCommon.java | 2 +- .../src/main/java/org/onap/sdc/dcae/checker/common/FacetCommon.java | 2 +- .../java/org/onap/sdc/dcae/checker/common/InputsOutputsCommon.java | 5 ----- .../main/java/org/onap/sdc/dcae/checker/common/InterfaceCommon.java | 2 +- .../src/main/java/org/onap/sdc/dcae/checker/common/NodeCommon.java | 2 +- .../java/org/onap/sdc/dcae/checker/common/RequirementCommon.java | 2 +- .../src/main/java/org/onap/sdc/dcae/checker/common/TypeCommon.java | 4 +--- .../java/org/onap/sdc/dcae/checker/validation/TOSCAValidator.java | 2 +- dcaedt_validator/kwalify/src/main/java/kwalify/Main.java | 2 +- dcaedt_validator/kwalify/src/main/java/kwalify/MetaValidator.java | 2 +- dcaedt_validator/kwalify/src/main/java/kwalify/Rule.java | 2 +- 54 files changed, 53 insertions(+), 67 deletions(-) diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/CompositionConfig.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/CompositionConfig.java index f6f2cd0..d583e5e 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/CompositionConfig.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/CompositionConfig.java @@ -8,7 +8,7 @@ import javax.annotation.PostConstruct; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.common.onaplog.OnapLoggerError; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.PropertySource; import org.springframework.context.annotation.PropertySources; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/CompositionEngine.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/CompositionEngine.java index c633c59..d870b1f 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/CompositionEngine.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/CompositionEngine.java @@ -1,6 +1,6 @@ package org.onap.sdc.dcae.composition; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.common.onaplog.OnapLoggerError; import org.onap.sdc.dcae.composition.util.SystemProperties; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/BaseController.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/BaseController.java index 131efad..76e6d16 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/BaseController.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/BaseController.java @@ -1,7 +1,7 @@ package org.onap.sdc.dcae.composition.controller; import com.google.gson.Gson; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.common.onaplog.OnapLoggerError; import org.onap.sdc.dcae.composition.impl.BaseBusinessLogic; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/CompositionController.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/CompositionController.java index 13eb724..085f5c0 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/CompositionController.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/CompositionController.java @@ -1,6 +1,6 @@ package org.onap.sdc.dcae.composition.controller; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.composition.impl.CompositionBusinessLogic; import org.onap.sdc.dcae.composition.impl.CompositionCatalogBusinessLogic; import org.onap.sdc.dcae.composition.restmodels.CreateMcResponse; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/ConfigurationController.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/ConfigurationController.java index ffedde8..1cdd422 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/ConfigurationController.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/ConfigurationController.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.composition.CompositionConfig; import org.onap.sdc.dcae.errormng.ActionStatus; import org.onap.sdc.dcae.errormng.ErrConfMgr; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/RuleEditorController.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/RuleEditorController.java index 084775e..ba0b298 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/RuleEditorController.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/RuleEditorController.java @@ -1,7 +1,7 @@ package org.onap.sdc.dcae.composition.controller; import com.google.gson.JsonParseException; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.composition.impl.RuleEditorBusinessLogic; import org.onap.sdc.dcae.composition.restmodels.ruleeditor.MappingRulesResponse; import org.onap.sdc.dcae.composition.restmodels.ruleeditor.TranslateRequest; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/ServicesController.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/ServicesController.java index b59f4a4..da408b5 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/ServicesController.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/ServicesController.java @@ -1,6 +1,6 @@ package org.onap.sdc.dcae.composition.controller; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.composition.impl.ServiceBusinessLogic; import org.onap.sdc.dcae.composition.restmodels.AttachVFCMTServiceRequest; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/VfcmtController.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/VfcmtController.java index 8d29412..44bdad5 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/VfcmtController.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/VfcmtController.java @@ -1,6 +1,6 @@ package org.onap.sdc.dcae.composition.controller; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.composition.impl.ReferenceBusinessLogic; import org.onap.sdc.dcae.composition.impl.VfcmtBusinessLogic; import org.onap.sdc.dcae.composition.restmodels.CreateVFCMTRequest; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/health/HealthController.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/health/HealthController.java index eaad1b0..3a60c83 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/health/HealthController.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/health/HealthController.java @@ -5,7 +5,7 @@ import java.util.List; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.common.onaplog.OnapLoggerError; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.composition.restmodels.health.ComponentsInfo; import org.onap.sdc.dcae.composition.restmodels.health.HealthResponse; import org.onap.sdc.dcae.composition.CompositionEngine; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/health/HealthPoller.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/health/HealthPoller.java index 9cb8801..a7156a6 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/health/HealthPoller.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/controller/health/HealthPoller.java @@ -1,7 +1,7 @@ package org.onap.sdc.dcae.composition.controller.health; import com.google.gson.Gson; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.common.onaplog.OnapLoggerError; import org.onap.sdc.dcae.catalog.commons.Http; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/BaseBusinessLogic.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/BaseBusinessLogic.java index 66e2783..845f937 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/BaseBusinessLogic.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/BaseBusinessLogic.java @@ -3,7 +3,7 @@ package org.onap.sdc.dcae.composition.impl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang.StringUtils; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.common.onaplog.OnapLoggerError; import org.onap.sdc.dcae.client.ISdcClient; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/BlueprintBusinessLogic.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/BlueprintBusinessLogic.java index fba8245..2c0dda3 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/BlueprintBusinessLogic.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/BlueprintBusinessLogic.java @@ -2,7 +2,7 @@ package org.onap.sdc.dcae.composition.impl; import com.google.gson.Gson; import org.apache.commons.lang.StringUtils; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.catalog.commons.Recycler; import org.onap.sdc.dcae.composition.restmodels.MessageResponse; import org.onap.sdc.dcae.composition.restmodels.VfcmtData; @@ -20,7 +20,6 @@ import org.springframework.web.client.RestTemplate; import org.yaml.snakeyaml.Yaml; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.StringReader; import java.util.*; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionBusinessLogic.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionBusinessLogic.java index 2791028..f46b4fd 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionBusinessLogic.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionBusinessLogic.java @@ -1,7 +1,7 @@ package org.onap.sdc.dcae.composition.impl; import com.fasterxml.jackson.core.JsonProcessingException; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.composition.restmodels.CreateMcResponse; import org.onap.sdc.dcae.composition.restmodels.VfcmtData; import org.onap.sdc.dcae.composition.restmodels.sdc.Artifact; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionCatalogBusinessLogic.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionCatalogBusinessLogic.java index 0847a50..4a88822 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionCatalogBusinessLogic.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/CompositionCatalogBusinessLogic.java @@ -1,6 +1,6 @@ package org.onap.sdc.dcae.composition.impl; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.common.onaplog.OnapLoggerError; import org.onap.sdc.dcae.catalog.Catalog; import org.onap.sdc.dcae.catalog.commons.Future; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/ReferenceBusinessLogic.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/ReferenceBusinessLogic.java index 522b866..7dbd969 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/ReferenceBusinessLogic.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/ReferenceBusinessLogic.java @@ -1,6 +1,6 @@ package org.onap.sdc.dcae.composition.impl; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.composition.restmodels.MonitoringComponent; import org.onap.sdc.dcae.composition.restmodels.ReferenceUUID; import org.onap.sdc.dcae.composition.restmodels.VfcmtData; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/RuleEditorBusinessLogic.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/RuleEditorBusinessLogic.java index cc0fcb6..a676a9a 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/RuleEditorBusinessLogic.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/RuleEditorBusinessLogic.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.google.gson.JsonParseException; import org.apache.commons.collections.ListUtils; import org.apache.commons.lang3.StringUtils; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.composition.restmodels.ruleeditor.*; import org.onap.sdc.dcae.composition.restmodels.sdc.Artifact; import org.onap.sdc.dcae.composition.restmodels.sdc.ResourceDetailed; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/ServiceBusinessLogic.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/ServiceBusinessLogic.java index 8dbe2e9..8ef416b 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/ServiceBusinessLogic.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/ServiceBusinessLogic.java @@ -1,6 +1,6 @@ package org.onap.sdc.dcae.composition.impl; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.composition.restmodels.AttachVFCMTServiceRequest; import org.onap.sdc.dcae.composition.restmodels.DcaeMinimizedService; import org.onap.sdc.dcae.composition.restmodels.MessageResponse; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/VfcmtBusinessLogic.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/VfcmtBusinessLogic.java index 4093555..438ce34 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/VfcmtBusinessLogic.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/composition/impl/VfcmtBusinessLogic.java @@ -2,7 +2,7 @@ package org.onap.sdc.dcae.composition.impl; import com.fasterxml.jackson.core.JsonProcessingException; import org.apache.commons.lang.StringUtils; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.composition.restmodels.CreateVFCMTRequest; import org.onap.sdc.dcae.composition.restmodels.ImportVFCMTRequest; import org.onap.sdc.dcae.composition.restmodels.ReferenceUUID; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/errormng/ErrorConfigurationLoader.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/errormng/ErrorConfigurationLoader.java index 8b7ab44..2180ca5 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/errormng/ErrorConfigurationLoader.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/errormng/ErrorConfigurationLoader.java @@ -12,7 +12,7 @@ import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Paths; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; public class ErrorConfigurationLoader { diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/errormng/ErrorInfo.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/errormng/ErrorInfo.java index 3ec3cef..37a1c41 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/errormng/ErrorInfo.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/errormng/ErrorInfo.java @@ -22,7 +22,7 @@ package org.onap.sdc.dcae.errormng; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.common.onaplog.OnapLoggerError; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; public class ErrorInfo { diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/errormng/ResponseFormatManager.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/errormng/ResponseFormatManager.java index 58d76be..9d5dc00 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/errormng/ResponseFormatManager.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/errormng/ResponseFormatManager.java @@ -2,7 +2,7 @@ package org.onap.sdc.dcae.errormng; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.common.onaplog.OnapLoggerError; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.errormng.ErrorInfo.ErrorInfoType; import java.util.HashMap; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/filter/LoggingFilter.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/filter/LoggingFilter.java index 84ce0b7..ba9783a 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/filter/LoggingFilter.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/filter/LoggingFilter.java @@ -19,8 +19,8 @@ import org.apache.http.impl.EnglishReasonPhraseCatalog; import org.onap.sdc.common.onaplog.OnapLoggerAudit; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.common.onaplog.OnapMDCWrapper; -import org.onap.sdc.common.onaplog.Enums.OnapLoggerErrorCode; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.OnapLoggerErrorCode; +import org.onap.sdc.common.onaplog.enums.LogLevel; public class LoggingFilter implements Filter { diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/impl/RulesBusinessLogic.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/impl/RulesBusinessLogic.java index ced922b..9662693 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/impl/RulesBusinessLogic.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/impl/RulesBusinessLogic.java @@ -4,7 +4,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import org.apache.commons.lang3.StringUtils; import org.onap.sdc.common.onaplog.OnapLoggerDebug; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.composition.restmodels.ruleeditor.*; import org.onap.sdc.dcae.errormng.ActionStatus; import org.onap.sdc.dcae.errormng.ErrConfMgr; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/ActionTranslator.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/ActionTranslator.java index c3f5c89..391920a 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/ActionTranslator.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/ActionTranslator.java @@ -1,6 +1,6 @@ package org.onap.sdc.dcae.rule.editor.translators; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.composition.restmodels.ruleeditor.BaseAction; import java.util.LinkedHashMap; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/CopyActionTranslator.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/CopyActionTranslator.java index 3e42b60..f9cca7a 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/CopyActionTranslator.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/CopyActionTranslator.java @@ -1,6 +1,6 @@ package org.onap.sdc.dcae.rule.editor.translators; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.composition.restmodels.ruleeditor.BaseCopyAction; import java.util.List; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/RegexActionTranslator.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/RegexActionTranslator.java index f8da7cb..9d6bbc3 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/RegexActionTranslator.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/RegexActionTranslator.java @@ -1,6 +1,6 @@ package org.onap.sdc.dcae.rule.editor.translators; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.composition.restmodels.ruleeditor.BaseCopyAction; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/RuleTranslator.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/RuleTranslator.java index c652923..bf0fe7f 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/RuleTranslator.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/translators/RuleTranslator.java @@ -1,7 +1,7 @@ package org.onap.sdc.dcae.rule.editor.translators; import com.google.gson.Gson; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.composition.restmodels.ruleeditor.*; import org.onap.sdc.dcae.rule.editor.enums.OperatorTypeEnum; import org.onap.sdc.dcae.rule.editor.enums.RuleEditorElementType; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/utils/RulesPayloadUtils.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/utils/RulesPayloadUtils.java index 4422da5..b4eb241 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/utils/RulesPayloadUtils.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/utils/RulesPayloadUtils.java @@ -2,7 +2,7 @@ package org.onap.sdc.dcae.rule.editor.utils; import java.util.List; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.common.onaplog.OnapLoggerError; import org.onap.sdc.dcae.composition.restmodels.sdc.Artifact; import org.onap.sdc.dcae.composition.restmodels.ruleeditor.*; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/validators/MapActionValidator.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/validators/MapActionValidator.java index 64c2088..6270140 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/validators/MapActionValidator.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/validators/MapActionValidator.java @@ -1,6 +1,6 @@ package org.onap.sdc.dcae.rule.editor.validators; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.composition.restmodels.ruleeditor.MapAction; import org.onap.sdc.dcae.errormng.ActionStatus; import org.onap.sdc.dcae.errormng.ErrConfMgr; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/validators/TopoSearchValidator.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/validators/TopoSearchValidator.java index 90073e5..d95d752 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/validators/TopoSearchValidator.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/rule/editor/validators/TopoSearchValidator.java @@ -1,6 +1,6 @@ package org.onap.sdc.dcae.rule.editor.validators; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.composition.restmodels.ruleeditor.Condition; import org.onap.sdc.dcae.composition.restmodels.ruleeditor.TopoSearchAction; import org.onap.sdc.dcae.errormng.ActionStatus; diff --git a/dcaedt_be/src/main/java/org/onap/sdc/dcae/ves/VesStructureLoader.java b/dcaedt_be/src/main/java/org/onap/sdc/dcae/ves/VesStructureLoader.java index cb8a16c..705ab25 100644 --- a/dcaedt_be/src/main/java/org/onap/sdc/dcae/ves/VesStructureLoader.java +++ b/dcaedt_be/src/main/java/org/onap/sdc/dcae/ves/VesStructureLoader.java @@ -9,7 +9,7 @@ import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.common.onaplog.OnapLoggerError; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; diff --git a/dcaedt_be/src/test/java/org/onap/sdc/dcae/filter/LoggingFilterTest.java b/dcaedt_be/src/test/java/org/onap/sdc/dcae/filter/LoggingFilterTest.java index cfe9f56..94701bf 100644 --- a/dcaedt_be/src/test/java/org/onap/sdc/dcae/filter/LoggingFilterTest.java +++ b/dcaedt_be/src/test/java/org/onap/sdc/dcae/filter/LoggingFilterTest.java @@ -1,21 +1,15 @@ package org.onap.sdc.dcae.filter; -import org.apache.http.impl.EnglishReasonPhraseCatalog; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.onap.sdc.common.onaplog.Enums.LogLevel; -import org.onap.sdc.common.onaplog.Enums.OnapLoggerErrorCode; -import org.onap.sdc.common.onaplog.OnapMDCWrapper; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; import javax.servlet.http.HttpServletResponse; import java.util.Enumeration; -import java.util.Locale; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.never; diff --git a/dcaedt_catalog/api/src/main/java/org/onap/sdc/dcae/catalog/asdc/ASDCCatalog.java b/dcaedt_catalog/api/src/main/java/org/onap/sdc/dcae/catalog/asdc/ASDCCatalog.java index 8557242..45fe21b 100644 --- a/dcaedt_catalog/api/src/main/java/org/onap/sdc/dcae/catalog/asdc/ASDCCatalog.java +++ b/dcaedt_catalog/api/src/main/java/org/onap/sdc/dcae/catalog/asdc/ASDCCatalog.java @@ -6,7 +6,7 @@ import org.apache.commons.jxpath.JXPathContext; import org.apache.commons.jxpath.JXPathNotFoundException; import org.apache.commons.lang3.StringUtils; import org.json.JSONObject; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.dcae.catalog.Catalog; import org.onap.sdc.dcae.catalog.commons.*; diff --git a/dcaedt_catalog/asdc/src/main/java/org/onap/sdc/dcae/client/SdcRestClient.java b/dcaedt_catalog/asdc/src/main/java/org/onap/sdc/dcae/client/SdcRestClient.java index e405ffc..097506c 100644 --- a/dcaedt_catalog/asdc/src/main/java/org/onap/sdc/dcae/client/SdcRestClient.java +++ b/dcaedt_catalog/asdc/src/main/java/org/onap/sdc/dcae/client/SdcRestClient.java @@ -5,7 +5,7 @@ import org.apache.commons.codec.digest.DigestUtils; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.message.BasicHeader; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.dcae.composition.restmodels.CreateVFCMTRequest; import org.onap.sdc.dcae.composition.restmodels.ReferenceUUID; diff --git a/dcaedt_catalog/asdc/src/main/java/org/onap/sdc/dcae/errormng/AbstractSdncException.java b/dcaedt_catalog/asdc/src/main/java/org/onap/sdc/dcae/errormng/AbstractSdncException.java index 360e28b..12eb87d 100644 --- a/dcaedt_catalog/asdc/src/main/java/org/onap/sdc/dcae/errormng/AbstractSdncException.java +++ b/dcaedt_catalog/asdc/src/main/java/org/onap/sdc/dcae/errormng/AbstractSdncException.java @@ -3,7 +3,7 @@ package org.onap.sdc.dcae.errormng; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.common.onaplog.OnapLoggerError; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import java.util.Arrays; import java.util.Formatter; diff --git a/dcaedt_catalog/commons/src/main/java/org/onap/sdc/dcae/catalog/commons/Futures.java b/dcaedt_catalog/commons/src/main/java/org/onap/sdc/dcae/catalog/commons/Futures.java index 1773fdd..b5135ea 100644 --- a/dcaedt_catalog/commons/src/main/java/org/onap/sdc/dcae/catalog/commons/Futures.java +++ b/dcaedt_catalog/commons/src/main/java/org/onap/sdc/dcae/catalog/commons/Futures.java @@ -8,7 +8,7 @@ import java.util.concurrent.CountDownLatch; import java.util.function.Function; import org.onap.sdc.common.onaplog.OnapLoggerDebug; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; /** diff --git a/dcaedt_catalog/commons/src/main/java/org/onap/sdc/dcae/catalog/commons/Recycler.java b/dcaedt_catalog/commons/src/main/java/org/onap/sdc/dcae/catalog/commons/Recycler.java index 2711722..d7a597b 100644 --- a/dcaedt_catalog/commons/src/main/java/org/onap/sdc/dcae/catalog/commons/Recycler.java +++ b/dcaedt_catalog/commons/src/main/java/org/onap/sdc/dcae/catalog/commons/Recycler.java @@ -21,7 +21,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.type.TypeReference; import org.onap.sdc.common.onaplog.OnapLoggerDebug; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.yaml.snakeyaml.Yaml; diff --git a/dcaedt_catalog/service/src/main/java/org/onap/sdc/dcae/catalog/engine/CatalogController.java b/dcaedt_catalog/service/src/main/java/org/onap/sdc/dcae/catalog/engine/CatalogController.java index b364087..e849cde 100644 --- a/dcaedt_catalog/service/src/main/java/org/onap/sdc/dcae/catalog/engine/CatalogController.java +++ b/dcaedt_catalog/service/src/main/java/org/onap/sdc/dcae/catalog/engine/CatalogController.java @@ -18,7 +18,7 @@ under the License. */ package org.onap.sdc.dcae.catalog.engine; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.dcae.catalog.asdc.ASDCCatalog; import org.onap.sdc.dcae.catalog.commons.Future; diff --git a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/Catalog.java b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/Catalog.java index bdddce3..7a19525 100644 --- a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/Catalog.java +++ b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/Catalog.java @@ -23,7 +23,7 @@ import com.google.common.collect.Iterators; import com.google.common.collect.Table; import com.google.common.collect.HashBasedTable; import org.onap.sdc.common.onaplog.OnapLoggerDebug; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; /* * Oddball: tracking inputs as data templates could be seen as rather diff --git a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/Checker.java b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/Checker.java index c75dc8d..8268dc3 100644 --- a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/Checker.java +++ b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/Checker.java @@ -26,7 +26,7 @@ import java.util.stream.IntStream; import com.google.common.reflect.Invokable; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.common.onaplog.OnapLoggerError; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.checker.common.*; import org.onap.sdc.dcae.checker.validation.TOSCAValidator; import org.yaml.snakeyaml.Yaml; diff --git a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/CommonLocator.java b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/CommonLocator.java index acc0a4a..f67547b 100644 --- a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/CommonLocator.java +++ b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/CommonLocator.java @@ -15,7 +15,7 @@ import java.util.LinkedHashSet; import com.google.common.collect.Iterables; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.common.onaplog.OnapLoggerError; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; public class CommonLocator implements TargetLocator { diff --git a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/Data.java b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/Data.java index 879e5dc..98d2d88 100644 --- a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/Data.java +++ b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/Data.java @@ -14,7 +14,7 @@ import java.util.regex.PatternSyntaxException; import com.google.common.collect.Table; import com.google.common.collect.HashBasedTable; import org.onap.sdc.common.onaplog.OnapLoggerDebug; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; /* * String -- 'primitive tosca type' converters, used in verifying valuations diff --git a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/JSP.java b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/JSP.java index 797b4e2..364017c 100644 --- a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/JSP.java +++ b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/JSP.java @@ -31,7 +31,7 @@ import jdk.nashorn.api.scripting.AbstractJSObject; import org.apache.commons.jxpath.JXPathContext; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.common.onaplog.OnapLoggerError; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; /** diff --git a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/DataCommon.java b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/DataCommon.java index 52ceef3..7e614c9 100644 --- a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/DataCommon.java +++ b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/DataCommon.java @@ -1,6 +1,6 @@ package org.onap.sdc.dcae.checker.common; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.checker.*; import java.util.Map; diff --git a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/FacetCommon.java b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/FacetCommon.java index 93c8416..ffbc539 100644 --- a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/FacetCommon.java +++ b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/FacetCommon.java @@ -2,7 +2,7 @@ package org.onap.sdc.dcae.checker.common; import com.google.common.collect.MapDifference; import com.google.common.collect.Maps; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.checker.*; import java.util.HashMap; diff --git a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/InputsOutputsCommon.java b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/InputsOutputsCommon.java index 04fd4b1..73f7f5e 100644 --- a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/InputsOutputsCommon.java +++ b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/InputsOutputsCommon.java @@ -1,12 +1,7 @@ package org.onap.sdc.dcae.checker.common; -import kwalify.Rule; -import kwalify.Validator; -import org.onap.sdc.common.onaplog.Enums.LogLevel; import org.onap.sdc.dcae.checker.*; -import org.onap.sdc.dcae.checker.validation.TOSCAValidator; -import java.util.Iterator; import java.util.Map; import static org.onap.sdc.dcae.checker.common.ConstCommon.DEFAULT; diff --git a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/InterfaceCommon.java b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/InterfaceCommon.java index 3d7dfef..ce1b48b 100644 --- a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/InterfaceCommon.java +++ b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/InterfaceCommon.java @@ -1,6 +1,6 @@ package org.onap.sdc.dcae.checker.common; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.checker.*; import java.util.Iterator; diff --git a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/NodeCommon.java b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/NodeCommon.java index 2fa9752..34022bf 100644 --- a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/NodeCommon.java +++ b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/NodeCommon.java @@ -1,6 +1,6 @@ package org.onap.sdc.dcae.checker.common; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.checker.*; import java.util.Iterator; diff --git a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/RequirementCommon.java b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/RequirementCommon.java index ff2c2f2..698108b 100644 --- a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/RequirementCommon.java +++ b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/RequirementCommon.java @@ -1,7 +1,7 @@ package org.onap.sdc.dcae.checker.common; import org.apache.commons.jxpath.JXPathContext; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.checker.*; import java.util.*; diff --git a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/TypeCommon.java b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/TypeCommon.java index 9fb4226..4103d2d 100644 --- a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/TypeCommon.java +++ b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/common/TypeCommon.java @@ -1,10 +1,8 @@ package org.onap.sdc.dcae.checker.common; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.dcae.checker.*; -import java.util.Iterator; -import java.util.List; import java.util.Map; import static org.onap.sdc.dcae.checker.common.ConstCommon.*; diff --git a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/validation/TOSCAValidator.java b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/validation/TOSCAValidator.java index 38bd84f..099502e 100644 --- a/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/validation/TOSCAValidator.java +++ b/dcaedt_validator/checker/src/main/java/org/onap/sdc/dcae/checker/validation/TOSCAValidator.java @@ -3,7 +3,7 @@ package org.onap.sdc.dcae.checker.validation; import kwalify.Rule; import kwalify.Types; import kwalify.Validator; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.common.onaplog.OnapLoggerError; import org.onap.sdc.dcae.checker.IChecker; diff --git a/dcaedt_validator/kwalify/src/main/java/kwalify/Main.java b/dcaedt_validator/kwalify/src/main/java/kwalify/Main.java index d2f1881..0fb8547 100644 --- a/dcaedt_validator/kwalify/src/main/java/kwalify/Main.java +++ b/dcaedt_validator/kwalify/src/main/java/kwalify/Main.java @@ -8,7 +8,7 @@ package kwalify; import org.onap.sdc.common.onaplog.OnapLoggerDebug; import org.onap.sdc.common.onaplog.OnapLoggerError; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import java.util.List; import java.util.Map; diff --git a/dcaedt_validator/kwalify/src/main/java/kwalify/MetaValidator.java b/dcaedt_validator/kwalify/src/main/java/kwalify/MetaValidator.java index 8c4d6a2..8fed264 100644 --- a/dcaedt_validator/kwalify/src/main/java/kwalify/MetaValidator.java +++ b/dcaedt_validator/kwalify/src/main/java/kwalify/MetaValidator.java @@ -5,7 +5,7 @@ package kwalify; import org.onap.sdc.common.onaplog.OnapLoggerError; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import java.util.Map; import java.util.List; diff --git a/dcaedt_validator/kwalify/src/main/java/kwalify/Rule.java b/dcaedt_validator/kwalify/src/main/java/kwalify/Rule.java index 29a0fb5..f9dbfd6 100644 --- a/dcaedt_validator/kwalify/src/main/java/kwalify/Rule.java +++ b/dcaedt_validator/kwalify/src/main/java/kwalify/Rule.java @@ -10,7 +10,7 @@ import java.util.regex.Pattern; import java.util.regex.Matcher; import java.util.regex.PatternSyntaxException; -import org.onap.sdc.common.onaplog.Enums.LogLevel; +import org.onap.sdc.common.onaplog.enums.LogLevel; import org.onap.sdc.common.onaplog.OnapLoggerDebug; /** -- cgit 1.2.3-korg