diff options
Diffstat (limited to 'dcaedt_validator')
16 files changed, 15 insertions, 22 deletions
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; /** |