From b1248f701a8428d9e0df45af18e306a7e4545669 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Fri, 14 Sep 2018 16:03:35 -0400 Subject: SDN Controller Blueprint Processor Removing Config Property Map Table and Dao Implementation Reformatting Codebase as per Onap Code Style Change-Id: I0841d5173aa40268e3451fd793826835c74fec77 Issue-ID: CCSDK-572 Signed-off-by: Singal, Kapil (ks220y) --- .../main/java/org/onap/ccsdk/features/model/ConfigModelConstant.java | 2 -- .../org/onap/ccsdk/features/model/data/dict/ResourceDefinition.java | 2 -- .../java/org/onap/ccsdk/features/model/service/ConfigModelService.java | 1 - .../src/main/java/org/onap/ccsdk/features/model/utils/JsonUtils.java | 1 - .../java/org/onap/ccsdk/features/model/utils/PrepareContextUtils.java | 1 - .../org/onap/ccsdk/features/model/utils/ResourceAssignmentUtils.java | 1 - .../org/onap/ccsdk/features/model/utils/ResourceDictionaryUtils.java | 1 - .../java/org/onap/ccsdk/features/model/validator/NodeTypeValidator.java | 1 - .../ccsdk/features/model/validator/ResourceAssignmentValidator.java | 1 - .../onap/ccsdk/features/model/validator/ServiceTemplateValidator.java | 1 - .../onap/ccsdk/features/model/validator/TopologyTemplateValidator.java | 1 - .../java/org/onap/ccsdk/features/model/ResourceDictionaryUtilsTest.java | 1 - .../java/org/onap/ccsdk/features/model/utils/JsonParserUtilsTest.java | 1 - .../test/java/org/onap/ccsdk/features/model/utils/JsonUtilsTest.java | 1 - .../onap/ccsdk/features/model/utils/ResourceAssignmentUtilsTest.java | 1 - .../org/onap/ccsdk/features/model/utils/TransformationUtilsTest.java | 1 - .../ccsdk/features/model/validator/ServiceTemplateValidationTest.java | 1 - .../java/org/onap/ccsdk/features/params/service/MockComponentNode.java | 1 - 18 files changed, 20 deletions(-) (limited to 'blueprints-processor/plugin/model-provider/src') diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ConfigModelConstant.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ConfigModelConstant.java index 28572f666..02e4553b3 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ConfigModelConstant.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/ConfigModelConstant.java @@ -142,6 +142,4 @@ public class ConfigModelConstant { public static final String EXPRESSION_GET_ATTRIBUTE = "get_attribute"; public static final String EXPRESSION_SET_VALUE = "set_value"; - public static final String CONFIG_PROPERTY_MAP_KEY_PREFIX = "org.onap.ccsdk.sli.adaptors."; - } diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/ResourceDefinition.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/ResourceDefinition.java index 3b115b729..7a49979a5 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/ResourceDefinition.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/data/dict/ResourceDefinition.java @@ -18,9 +18,7 @@ package org.onap.ccsdk.features.model.data.dict; import java.util.Map; - import org.onap.ccsdk.features.model.data.PropertyDefinition; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelService.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelService.java index b0df3e607..38ade14de 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelService.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/service/ConfigModelService.java @@ -19,7 +19,6 @@ package org.onap.ccsdk.features.model.service; import java.util.List; import java.util.Map; - import org.onap.ccsdk.features.model.data.ServiceTemplate; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicException; diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/JsonUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/JsonUtils.java index 11f4de3e0..2db4b4875 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/JsonUtils.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/JsonUtils.java @@ -18,7 +18,6 @@ package org.onap.ccsdk.features.model.utils; import org.onap.ccsdk.features.model.ValidTypes; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.NullNode; diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/PrepareContextUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/PrepareContextUtils.java index 6678a1245..34c465cea 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/PrepareContextUtils.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/PrepareContextUtils.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.onap.ccsdk.features.model.ConfigModelConstant; - import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtils.java index 371acddf6..c68c52c3f 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtils.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtils.java @@ -29,7 +29,6 @@ import org.onap.ccsdk.features.model.ConfigModelException; import org.onap.ccsdk.features.model.ValidTypes; import org.onap.ccsdk.features.model.data.ResourceAssignment; import org.onap.ccsdk.features.model.data.dict.ResourceDefinition; - import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.fasterxml.jackson.databind.JsonNode; diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceDictionaryUtils.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceDictionaryUtils.java index c73f67c05..080171ef6 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceDictionaryUtils.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/utils/ResourceDictionaryUtils.java @@ -28,7 +28,6 @@ import org.onap.ccsdk.features.model.data.PropertyDefinition; import org.onap.ccsdk.features.model.data.ResourceAssignment; import org.onap.ccsdk.features.model.data.dict.ResourceDefinition; import org.onap.ccsdk.features.model.data.dict.SourcesDefinition; - import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/NodeTypeValidator.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/NodeTypeValidator.java index 4c719768d..4cb9ae14d 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/NodeTypeValidator.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/NodeTypeValidator.java @@ -31,7 +31,6 @@ import org.onap.ccsdk.features.model.data.OperationDefinition; import org.onap.ccsdk.features.model.data.PropertyDefinition; import org.onap.ccsdk.features.model.data.RequirementDefinition; import org.onap.ccsdk.features.model.data.ServiceTemplate; - import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ResourceAssignmentValidator.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ResourceAssignmentValidator.java index 83e9f6e9d..8f2efd110 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ResourceAssignmentValidator.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ResourceAssignmentValidator.java @@ -30,7 +30,6 @@ import org.onap.ccsdk.features.model.data.NodeTemplate; import org.onap.ccsdk.features.model.data.ResourceAssignment; import org.onap.ccsdk.features.model.utils.TopologicalSortingUtils; import org.onap.ccsdk.features.model.utils.TransformationUtils; - import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidator.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidator.java index 83927913a..f503427c8 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidator.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidator.java @@ -24,7 +24,6 @@ import org.onap.ccsdk.features.model.ConfigModelConstant; import org.onap.ccsdk.features.model.ConfigModelException; import org.onap.ccsdk.features.model.data.ServiceTemplate; import org.onap.ccsdk.features.model.utils.TransformationUtils; - import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/TopologyTemplateValidator.java b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/TopologyTemplateValidator.java index 0f1258a9c..c735a54cd 100644 --- a/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/TopologyTemplateValidator.java +++ b/blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/features/model/validator/TopologyTemplateValidator.java @@ -29,7 +29,6 @@ import org.onap.ccsdk.features.model.data.PropertyDefinition; import org.onap.ccsdk.features.model.data.RequirementAssignment; import org.onap.ccsdk.features.model.data.ServiceTemplate; import org.onap.ccsdk.features.model.data.TopologyTemplate; - import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/ResourceDictionaryUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/ResourceDictionaryUtilsTest.java index a84f52f50..9965f61c6 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/ResourceDictionaryUtilsTest.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/ResourceDictionaryUtilsTest.java @@ -28,7 +28,6 @@ import org.onap.ccsdk.features.model.data.dict.ResourceDefinition; import org.onap.ccsdk.features.model.data.dict.SourcesDefinition; import org.onap.ccsdk.features.model.data.dict.SourcesProperties; import org.onap.ccsdk.features.model.utils.ResourceDictionaryUtils; - import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonParserUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonParserUtilsTest.java index 98943db7e..1875f115d 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonParserUtilsTest.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonParserUtilsTest.java @@ -20,7 +20,6 @@ package org.onap.ccsdk.features.model.utils; import org.junit.Assert; import org.junit.Test; import org.onap.ccsdk.features.model.utils.JsonParserUtils; - import com.fasterxml.jackson.databind.JsonNode; public class JsonParserUtilsTest { diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonUtilsTest.java index d5db17008..9cc3fc681 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonUtilsTest.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/JsonUtilsTest.java @@ -21,7 +21,6 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.onap.ccsdk.features.model.ValidTypes; import org.onap.ccsdk.features.model.utils.JsonUtils; - import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtilsTest.java index 53eb624b5..01548b648 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtilsTest.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/ResourceAssignmentUtilsTest.java @@ -31,7 +31,6 @@ import org.onap.ccsdk.features.model.data.PropertyDefinition; import org.onap.ccsdk.features.model.data.ResourceAssignment; import org.onap.ccsdk.features.model.data.dict.ResourceDefinition; import org.onap.ccsdk.features.model.utils.ResourceAssignmentUtils; - import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/TransformationUtilsTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/TransformationUtilsTest.java index cfcf246cd..feb6321d2 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/TransformationUtilsTest.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/utils/TransformationUtilsTest.java @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.Map; import org.junit.Test; import org.onap.ccsdk.features.model.utils.TransformationUtils; - import com.fasterxml.jackson.databind.JsonNode; public class TransformationUtilsTest { diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidationTest.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidationTest.java index 83ac18022..a95f301f0 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidationTest.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/model/validator/ServiceTemplateValidationTest.java @@ -21,7 +21,6 @@ import java.nio.charset.Charset; import org.apache.commons.io.IOUtils; import org.junit.Test; import org.onap.ccsdk.features.model.validator.ServiceTemplateValidator; - import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/MockComponentNode.java b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/MockComponentNode.java index 35f23bcb1..e779a361a 100644 --- a/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/MockComponentNode.java +++ b/blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/features/params/service/MockComponentNode.java @@ -18,7 +18,6 @@ package org.onap.ccsdk.features.params.service; import java.util.Map; - import org.onap.ccsdk.features.model.service.ComponentNode; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicException; -- cgit 1.2.3-korg