Merge "Controller Blueprints Microservice"

diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/db-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/db-source.json
index cd4e282..c53a6dd 100644 (file)
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/db-source.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/db-source.json
@@ -22,15 +22,5 @@
         }\r
       }\r
     }\r
-  },\r
-  "decryption-rules": [\r
-    {\r
-      "sources": [\r
-        "input"\r
-      ],\r
-      "path": "/.",\r
-      "rule": "LOCAL-Decrypt",\r
-      "decrypt-type": "AES128"\r
-    }\r
-  ]\r
+  }\r
 }
\ No newline at end of file

diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/DecryptionRule.java b/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/DecryptionRule.java
deleted file mode 100644 (file)
index be43524..0000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/DecryptionRule.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*\r
- * Copyright © 2017-2018 AT&T Intellectual Property.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.data;\r
-\r
-import com.fasterxml.jackson.annotation.JsonProperty;\r
-\r
-import java.util.List;\r
-/**\r
- *\r
- * DecryptionRule.java Purpose:\r
- * @author Brinda Santh\r
- */\r
-public class DecryptionRule {\r
-\r
-    private List<String> sources = null;\r
-    private String path;\r
-    private String rule;\r
-    @JsonProperty("decrypt-type")\r
-    private String decryptType;\r
-\r
-    public List<String> getSources() {\r
-        return sources;\r
-    }\r
-\r
-    public void setSources(List<String> sources) {\r
-        this.sources = sources;\r
-    }\r
-\r
-    public String getPath() {\r
-        return path;\r
-    }\r
-\r
-    public void setPath(String path) {\r
-        this.path = path;\r
-    }\r
-\r
-    public String getRule() {\r
-        return rule;\r
-    }\r
-\r
-    public void setRule(String rule) {\r
-        this.rule = rule;\r
-    }\r
-\r
-    public String getDecryptType() {\r
-        return decryptType;\r
-    }\r
-\r
-    public void setDecryptType(String decryptType) {\r
-        this.decryptType = decryptType;\r
-    }\r
-\r
-}\r

diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt
index 525ed9a..2287c6c 100644 (file)
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt
+++ b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt
@@ -20,7 +20,6 @@ import com.fasterxml.jackson.annotation.JsonFormat
 import com.fasterxml.jackson.annotation.JsonProperty
 import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeTemplate
 import org.onap.ccsdk.apps.controllerblueprints.core.data.PropertyDefinition
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.data.DecryptionRule
 import java.io.Serializable
 import java.util.*
 
@@ -45,10 +44,6 @@ open class ResourceDefinition{
 
     @JsonProperty(value = "sources", required = true)
     lateinit var sources: MutableMap<String, NodeTemplate>
-
-    @JsonProperty("decryption-rules")
-    var decryptionRules: MutableList<DecryptionRule>? = null
-
 }
 
 open class ResourceAssignment {

diff --git a/ms/controllerblueprints/modules/service/load/resource_dictionary/db-source.json b/ms/controllerblueprints/modules/service/load/resource_dictionary/db-source.json
index cd4e282..c53a6dd 100644 (file)
--- a/ms/controllerblueprints/modules/service/load/resource_dictionary/db-source.json
+++ b/ms/controllerblueprints/modules/service/load/resource_dictionary/db-source.json
@@ -22,15 +22,5 @@
         }\r
       }\r
     }\r
-  },\r
-  "decryption-rules": [\r
-    {\r
-      "sources": [\r
-        "input"\r
-      ],\r
-      "path": "/.",\r
-      "rule": "LOCAL-Decrypt",\r
-      "decrypt-type": "AES128"\r
-    }\r
-  ]\r
+  }\r
 }
\ No newline at end of file

diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRestTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRestTest.java
index 8257dc3..ec036ee 100644 (file)
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRestTest.java
+++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRestTest.java
@@ -19,13 +19,11 @@ package org.onap.ccsdk.apps.controllerblueprints.service.rs;
 \r
 import org.apache.commons.io.IOUtils;\r
 import org.junit.Assert;\r
-import org.junit.Before;\r
 import org.junit.FixMethodOrder;\r
 import org.junit.Test;\r
 import org.junit.runner.RunWith;\r
 import org.junit.runners.MethodSorters;\r
 import org.onap.ccsdk.apps.controllerblueprints.TestApplication;\r
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.data.*;\r
 import org.onap.ccsdk.apps.controllerblueprints.service.domain.ResourceDictionary;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r