diff options
10 files changed, 3 insertions, 603 deletions
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/DictionaryDefinition.java b/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/DictionaryDefinition.java deleted file mode 100644 index 92178673..00000000 --- a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/DictionaryDefinition.java +++ /dev/null @@ -1,186 +0,0 @@ -/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2018 IBM.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.data;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-import java.util.List;
-import java.util.Map;
-/**
- *
- * DictionaryDefinition.java Purpose:
- * @author Brinda Santh
- */
-@Deprecated
-public class DictionaryDefinition {
- @JsonProperty(value = "name", required = true)
- private String name;
-
- @JsonProperty(value = "description")
- private String description;
-
- @JsonProperty(value = "valid-values")
- private String validValues;
-
- @JsonProperty(value = "sample-value")
- private String sampleValue;
-
- private String tags;
-
- @JsonProperty(value = "updated-by")
- private String updatedBy;
-
- @JsonProperty(value = "resource-type", required = true)
- private String resourceType;
-
- @JsonProperty(value = "resource-path", required = true)
- private String resourcePath;
-
- @JsonProperty(value = "data-type", required = true)
- private String dataType;
-
- @JsonProperty("entry-schema")
- private String entrySchema;
-
- @JsonProperty(value = "default")
- private Object defaultValue;
-
- @JsonProperty(value = "source", required = true)
- @JsonDeserialize(using = SourceDeserializer.class, keyAs = String.class, contentAs = ResourceSource.class)
- private Map<String, ResourceSource> source;
-
- @JsonProperty("candidate-dependency")
- private Map<String, DictionaryDependency> dependency;
-
- @JsonProperty("decryption-rules")
- private List<DecryptionRule> decryptionRules;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getValidValues() {
- return validValues;
- }
-
- public void setValidValues(String validValues) {
- this.validValues = validValues;
- }
-
- public String getSampleValue() {
- return sampleValue;
- }
-
- public void setSampleValue(String sampleValue) {
- this.sampleValue = sampleValue;
- }
-
- public String getTags() {
- return tags;
- }
-
- public void setTags(String tags) {
- this.tags = tags;
- }
-
- public String getUpdatedBy() {
- return updatedBy;
- }
-
- public void setUpdatedBy(String updatedBy) {
- this.updatedBy = updatedBy;
- }
-
- public String getResourceType() {
- return resourceType;
- }
-
- public void setResourceType(String resourceType) {
- this.resourceType = resourceType;
- }
-
- public String getResourcePath() {
- return resourcePath;
- }
-
- public void setResourcePath(String resourcePath) {
- this.resourcePath = resourcePath;
- }
-
- public String getDataType() {
- return dataType;
- }
-
- public void setDataType(String dataType) {
- this.dataType = dataType;
- }
-
- public String getEntrySchema() {
- return entrySchema;
- }
-
- public void setEntrySchema(String entrySchema) {
- this.entrySchema = entrySchema;
- }
-
- public Object getDefaultValue() {
- return defaultValue;
- }
-
- public void setDefaultValue(Object defaultValue) {
- this.defaultValue = defaultValue;
- }
-
- public Map<String, ResourceSource> getSource() {
- return source;
- }
-
- public void setSource(Map<String, ResourceSource> source) {
- this.source = source;
- }
-
- public Map<String, DictionaryDependency> getDependency() {
- return dependency;
- }
-
- public void setDependency(Map<String, DictionaryDependency> dependency) {
- this.dependency = dependency;
- }
-
- public List<DecryptionRule> getDecryptionRules() {
- return decryptionRules;
- }
-
- public void setDecryptionRules(List<DecryptionRule> decryptionRules) {
- this.decryptionRules = decryptionRules;
- }
-
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/DictionaryDependency.java b/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/DictionaryDependency.java deleted file mode 100644 index 6ffbca26..00000000 --- a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/DictionaryDependency.java +++ /dev/null @@ -1,38 +0,0 @@ -/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2018 IBM.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.data;
-
-import java.util.List;
-/**
- *
- * DictionaryDependency
- * @author Brinda Santh
- */
-@Deprecated
-public class DictionaryDependency {
- private List<String> names;
-
- public List<String> getNames() {
- return names;
- }
-
- public void setNames(List<String> names) {
- this.names = names;
- }
-
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/ResourceSource.java b/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/ResourceSource.java deleted file mode 100644 index 1ef69fa9..00000000 --- a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/ResourceSource.java +++ /dev/null @@ -1,22 +0,0 @@ -/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.data;
-
-import java.io.Serializable;
-@Deprecated
-public interface ResourceSource extends Serializable {
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/SourceDb.java b/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/SourceDb.java deleted file mode 100644 index fbeab52f..00000000 --- a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/SourceDb.java +++ /dev/null @@ -1,85 +0,0 @@ -/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2018 IBM.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.data;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.Map;
-/**
- *
- * SourceDb
- * @author Brinda Santh
- */
-@Deprecated
-public class SourceDb implements ResourceSource{
- @JsonProperty(value = "base", required = true)
- private String base;
- @JsonProperty(value = "type", required = true)
- private String type; // SQL | PLSQL
- @JsonProperty(value = "query", required = true)
- private String query;
-
- @JsonProperty("input-key-mapping")
- private Map<String, String> inputKeyMapping;
-
- @JsonProperty("output-key-mapping")
- private Map<String, String> outputKeyMapping;
-
- public String getBase() {
- return base;
- }
-
- public void setBase(String base) {
- this.base = base;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getQuery() {
- return query;
- }
-
- public void setQuery(String query) {
- this.query = query;
- }
-
- public Map<String, String> getInputKeyMapping() {
- return inputKeyMapping;
- }
-
- public void setInputKeyMapping(Map<String, String> inputKeyMapping) {
- this.inputKeyMapping = inputKeyMapping;
- }
-
- public Map<String, String> getOutputKeyMapping() {
- return outputKeyMapping;
- }
-
- public void setOutputKeyMapping(Map<String, String> outputKeyMapping) {
- this.outputKeyMapping = outputKeyMapping;
- }
-
-
-
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/SourceDefault.java b/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/SourceDefault.java deleted file mode 100644 index e0f83bb8..00000000 --- a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/SourceDefault.java +++ /dev/null @@ -1,38 +0,0 @@ -/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2018 IBM.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.data;
-/**
- *
- * SourceDefault
- * @author Brinda Santh
- */
-@Deprecated
-public class SourceDefault implements ResourceSource {
-
- private String key;
-
- public String getKey() {
- return key;
- }
-
- public void setKey(String key) {
- this.key = key;
- }
-
-
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/SourceDeserializer.java b/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/SourceDeserializer.java deleted file mode 100644 index a097c56d..00000000 --- a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/SourceDeserializer.java +++ /dev/null @@ -1,68 +0,0 @@ -/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2018 IBM.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.data;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.google.common.base.Preconditions;
-import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-@Deprecated
-public class SourceDeserializer extends JsonDeserializer<Map<String, ResourceSource>> {
-
- private static final Logger log = LoggerFactory.getLogger(SourceDeserializer.class);
-
- private Class<?> keyAs;
-
- private Class<?> contentAs;
-
- private static Map<String, Class<? extends ResourceSource>> registry = new HashMap<String, Class<? extends ResourceSource>>();
-
- public static void registerSource(String uniqueAttribute, Class<? extends ResourceSource> sourceClass) {
- registry.put(uniqueAttribute, sourceClass);
- }
-
- @Override
- public Map<String, ResourceSource> deserialize(JsonParser p, DeserializationContext ctxt)
- throws IOException, JsonProcessingException {
-
- ObjectMapper mapper = (ObjectMapper) p.getCodec();
- ObjectNode root = (ObjectNode) mapper.readTree(p);
- Map<String, ResourceSource> sources = new HashMap();
- root.fields().forEachRemaining((node) -> {
- String key = node.getKey();
- JsonNode valueNode = node.getValue();
- Preconditions.checkArgument(StringUtils.isNotBlank(key), "missing source key");
- Preconditions.checkArgument(registry.containsKey(key), key +" source not registered");
- if (StringUtils.isNotBlank(key) && registry.containsKey(key)) {
- Class<? extends ResourceSource> sourceClass = registry.get(key);
- ResourceSource resourceSource = JacksonUtils.readValue(valueNode.toString(), sourceClass);
- sources.put(key, resourceSource);
- }
- });
- return sources;
- }
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/SourceInput.java b/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/SourceInput.java deleted file mode 100644 index 8ab16ecb..00000000 --- a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/SourceInput.java +++ /dev/null @@ -1,38 +0,0 @@ -/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2018 IBM.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.data;
-/**
- *
- * SourceInput
- * @author Brinda Santh
- */
-@Deprecated
-public class SourceInput implements ResourceSource {
-
- private String key;
-
- public String getKey() {
- return key;
- }
-
- public void setKey(String key) {
- this.key = key;
- }
-
-
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/SourceMdsal.java b/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/SourceMdsal.java deleted file mode 100644 index 379f6e91..00000000 --- a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/SourceMdsal.java +++ /dev/null @@ -1,97 +0,0 @@ -/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- * Modifications Copyright © 2018 IBM.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.data;
-/**
- *
- * SourceMdsal
- * @author Brinda Santh
- */
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.Map;
-@Deprecated
-public class SourceMdsal implements ResourceSource {
-
- @JsonProperty(value = "base", required = true)
- private String base;
-
- @JsonProperty(value = "type", required = true)
- private String type; // XML | JSON
-
- @JsonProperty(value = "url-path", required = true)
- private String urlPath;
-
- @JsonProperty(value = "path", required = true)
- private String path;
-
- @JsonProperty("input-key-mapping")
- private Map<String, String> inputKeyMapping;
-
- @JsonProperty("output-key-mapping")
- private Map<String, String> outputKeyMapping;
-
- public String getBase() {
- return base;
- }
-
- public void setBase(String base) {
- this.base = base;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getUrlPath() {
- return urlPath;
- }
-
- public void setUrlPath(String urlPath) {
- this.urlPath = urlPath;
- }
-
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- public Map<String, String> getInputKeyMapping() {
- return inputKeyMapping;
- }
-
- public void setInputKeyMapping(Map<String, String> inputKeyMapping) {
- this.inputKeyMapping = inputKeyMapping;
- }
-
- public Map<String, String> getOutputKeyMapping() {
- return outputKeyMapping;
- }
-
- public void setOutputKeyMapping(Map<String, String> outputKeyMapping) {
- this.outputKeyMapping = outputKeyMapping;
- }
-
-
-}
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ApplicationRegistrationService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ApplicationRegistrationService.java index 074f18d0..6d0ec889 100644 --- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ApplicationRegistrationService.java +++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/ApplicationRegistrationService.java @@ -1,5 +1,6 @@ /*
* Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,8 +17,6 @@ package org.onap.ccsdk.apps.controllerblueprints.service;
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.ResourceDictionaryConstants;
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.data.*;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
@@ -31,9 +30,6 @@ public class ApplicationRegistrationService { }
public void registerDictionarySources(){
- SourceDeserializer.registerSource(ResourceDictionaryConstants.SOURCE_DB, SourceDb.class);
- SourceDeserializer.registerSource(ResourceDictionaryConstants.SOURCE_INPUT, SourceInput.class);
- SourceDeserializer.registerSource(ResourceDictionaryConstants.SOURCE_MDSAL, SourceMdsal.class);
- SourceDeserializer.registerSource(ResourceDictionaryConstants.SOURCE_DEFAULT,SourceDefault.class);
+
}
}
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ResourceDictionaryValidator.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ResourceDictionaryValidator.java index eb2448e7..ff0b4ac5 100644 --- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ResourceDictionaryValidator.java +++ b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/apps/controllerblueprints/service/validator/ResourceDictionaryValidator.java @@ -1,5 +1,6 @@ /*
* Copyright © 2017-2018 AT&T Intellectual Property.
+ * Modifications Copyright © 2018 IBM.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,9 +19,6 @@ package org.onap.ccsdk.apps.controllerblueprints.service.validator; import com.google.common.base.Preconditions;
import org.apache.commons.lang3.StringUtils;
-import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintException;
-import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils;
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.data.DictionaryDefinition;
import org.onap.ccsdk.apps.controllerblueprints.service.domain.ResourceDictionary;
/**
@@ -35,28 +33,6 @@ public class ResourceDictionaryValidator { private ResourceDictionaryValidator() {}
/**
- * This is a validateResourceDictionaryDefinition
- *
- * @param definitionContent
- * @return boolean
- * @throws BluePrintException
- */
- public static boolean validateResourceDictionaryDefinition(String definitionContent)
- throws BluePrintException {
- boolean valid = true;
- if (StringUtils.isNotBlank(definitionContent)) {
- DictionaryDefinition dictionaryDefinition =
- JacksonUtils.readValue(definitionContent, DictionaryDefinition.class);
- if (dictionaryDefinition == null) {
- throw new BluePrintException(
- "Resource dictionary definition is not valid content " + definitionContent);
- }
-
- }
- return valid;
- }
-
- /**
* This is a validateResourceDictionary method
*
* @param resourceDictionary
|