Merge "Refactor resource dictionary entity and repositories."

7 files changed, 0 insertions, 592 deletions

diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/ApplicationRegistrationService.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/ApplicationRegistrationService.java
deleted file mode 100644
index 51484ff6c..000000000
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/ApplicationRegistrationService.java
+++ /dev/null
@@ -1,56 +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.cds.controllerblueprints.service;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.onap.ccsdk.cds.controllerblueprints.resource.dict.factory.ResourceSourceMappingFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import java.util.List;
-
-@Component
-@SuppressWarnings("unused")
-public class ApplicationRegistrationService {
-    private static Logger log = LoggerFactory.getLogger(ApplicationRegistrationService.class);
-
-    @Value("#{'${resourceSourceMappings}'.split(',')}")
-    private List<String> resourceSourceMappings;
-
-    @PostConstruct
-    public void register() {
-        registerDictionarySources();
-    }
-
-    public void registerDictionarySources() {
-        log.info("Registering Dictionary Sources : {}", resourceSourceMappings);
-        if (CollectionUtils.isNotEmpty(resourceSourceMappings)) {
-            resourceSourceMappings.forEach(resourceSourceMapping -> {
-                String[] mappingKeyValue = resourceSourceMapping.split("=");
-                if (mappingKeyValue != null && mappingKeyValue.length == 2) {
-                    ResourceSourceMappingFactory.INSTANCE.registerSourceMapping(mappingKeyValue[0].trim(), mappingKeyValue[1].trim());
-                } else {
-                    log.warn("failed to get resource source mapping {}", resourceSourceMapping);
-                }
-            });
-        }
-    }
-}
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/common/ErrorMessage.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/common/ErrorMessage.java
deleted file mode 100644
index 155a162b6..000000000
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/common/ErrorMessage.java
+++ /dev/null
@@ -1,75 +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.cds.controllerblueprints.service.common;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@JsonInclude(Include.NON_NULL)
-@JsonTypeName("errorMessage")
-@JsonTypeInfo(include= JsonTypeInfo.As.WRAPPER_OBJECT, use=JsonTypeInfo.Id.NAME)
-public class ErrorMessage implements Serializable {
-    private String message;
-    private Integer code;
-    private String debugMessage;
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
-    private Date timestamp = new Date();
-
-    public ErrorMessage(String message, Integer code, String debugMessage){
-        this.message = message;
-        this.code = code;
-        this.debugMessage = debugMessage;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public void setCode(Integer code) {
-        this.code = code;
-    }
-
-    public String getDebugMessage() {
-        return debugMessage;
-    }
-
-    public void setDebugMessage(String developerMessage) {
-        this.debugMessage = developerMessage;
-    }
-
-    public Date getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(Date timestamp) {
-        this.timestamp = timestamp;
-    }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/domain/JpaJsonNodeConverter.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/domain/JpaJsonNodeConverter.java
deleted file mode 100644
index f45c30fc6..000000000
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/domain/JpaJsonNodeConverter.java
+++ /dev/null
@@ -1,40 +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.cds.controllerblueprints.service.domain;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils;
-
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
-/**
- * @author Brinda Santh
- */
-@Converter
-public class JpaJsonNodeConverter implements
-        AttributeConverter<JsonNode, String> {
-
-    @Override
-    public String convertToDatabaseColumn(JsonNode node) {
-        return JacksonUtils.Companion.getJson(node, true);
-    }
-
-    @Override
-    public JsonNode convertToEntityAttribute(String dbData) {
-        return JacksonUtils.Companion.jsonNode(dbData);
-    }
-}
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/domain/JpaResourceDefinitionConverter.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/domain/JpaResourceDefinitionConverter.java
deleted file mode 100644
index 60c069428..000000000
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/domain/JpaResourceDefinitionConverter.java
+++ /dev/null
@@ -1,39 +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.cds.controllerblueprints.service.domain;
-
-import org.onap.ccsdk.cds.controllerblueprints.core.utils.JacksonUtils;
-import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceDefinition;
-
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
-/**
- * @author Brinda Santh
- */
-@Converter
-public class JpaResourceDefinitionConverter implements
-        AttributeConverter<ResourceDefinition, String> {
-    @Override
-    public String convertToDatabaseColumn(ResourceDefinition resourceDefinition) {
-        return JacksonUtils.Companion.getJson(resourceDefinition);
-    }
-
-    @Override
-    public ResourceDefinition convertToEntityAttribute(String content) {
-        return JacksonUtils.Companion.readValue(content, ResourceDefinition.class);
-    }
-}
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/domain/ModelType.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/domain/ModelType.java
deleted file mode 100644
index 31b792407..000000000
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/domain/ModelType.java
+++ /dev/null
@@ -1,171 +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.cds.controllerblueprints.service.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModelProperty;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-
-
-/**
- * AsdcReference.java Purpose: Provide Configuration Generator AsdcReference Entity
- *
- * @author Brinda Santh
- * @version 1.0
- */
-@EntityListeners({AuditingEntityListener.class})
-@Entity
-@Table(name = "MODEL_TYPE")
-public class ModelType implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @Column(name = "model_name", nullable = false)
-    @ApiModelProperty(required=true)
-    private String modelName;
-
-    @Column(name = "derived_from", nullable = false)
-    @ApiModelProperty(required=true)
-    private String derivedFrom;
-
-    @Column(name = "definition_type", nullable = false)
-    @ApiModelProperty(required=true)
-    private String definitionType;
-
-    @Lob
-    @Convert(converter  = JpaJsonNodeConverter.class)
-    @Column(name = "definition", nullable = false)
-    @ApiModelProperty(required=true)
-    private JsonNode definition;
-
-    @Lob
-    @Column(name = "description", nullable = false)
-    @ApiModelProperty(required=true)
-    private String description;
-
-    @Column(name = "version", nullable = false)
-    @ApiModelProperty(required=true)
-    private String version;
-
-    @Lob
-    @Column(name = "tags", nullable = false)
-    @ApiModelProperty(required=true)
-    private String tags;
-
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
-    @LastModifiedDate
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name = "creation_date")
-    private Date creationDate;
-
-    @Column(name = "updated_by", nullable = false)
-    @ApiModelProperty(required=true)
-    private String updatedBy;
-
-    @Override
-    public String toString() {
-        return "[" + "modelName = " + modelName +
-                ", derivedFrom = " + derivedFrom +
-                ", definitionType = " + definitionType +
-                ", description = " + description +
-                ", creationDate = " + creationDate +
-                ", version = " + version +
-                ", updatedBy = " + updatedBy +
-                ", tags = " + tags +
-                "]";
-    }
-
-    public String getModelName() {
-        return modelName;
-    }
-
-    public void setModelName(String modelName) {
-        this.modelName = modelName;
-    }
-
-    public String getDerivedFrom() {
-        return derivedFrom;
-    }
-
-    public void setDerivedFrom(String derivedFrom) {
-        this.derivedFrom = derivedFrom;
-    }
-
-    public String getDefinitionType() {
-        return definitionType;
-    }
-
-    public void setDefinitionType(String definitionType) {
-        this.definitionType = definitionType;
-    }
-
-    public JsonNode getDefinition() {
-        return definition;
-    }
-
-    public void setDefinition(JsonNode definition) {
-        this.definition = definition;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public String getTags() {
-        return tags;
-    }
-
-    public void setTags(String tags) {
-        this.tags = tags;
-    }
-
-    public Date getCreationDate() {
-        return creationDate;
-    }
-
-    public void setCreationDate(Date creationDate) {
-        this.creationDate = creationDate;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-
-}
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/domain/ResourceDictionary.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/domain/ResourceDictionary.java
deleted file mode 100644
index 2a6ab459b..000000000
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/domain/ResourceDictionary.java
+++ /dev/null
@@ -1,158 +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.cds.controllerblueprints.service.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceDefinition;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * DataDictionary.java Purpose: Provide Configuration Generator DataDictionary Entity
- *
- * @author Brinda Santh
- * @version 1.0
- */
-@EntityListeners({AuditingEntityListener.class})
-@Entity
-@Table(name = "RESOURCE_DICTIONARY")
-public class ResourceDictionary implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @Column(name = "name", nullable = false)
-    @ApiModelProperty(required=true)
-    private String name;
-
-    @Column(name = "data_type", nullable = false)
-    @ApiModelProperty(required=true)
-    private String dataType;
-
-    @Column(name = "entry_schema")
-    private String entrySchema;
-
-    @Lob
-    @Convert(converter  = JpaResourceDefinitionConverter.class)
-    @Column(name = "definition", nullable = false)
-    @ApiModelProperty(required=true)
-    private ResourceDefinition definition;
-
-    @Lob
-    @Column(name = "description", nullable = false)
-    @ApiModelProperty(required=true)
-    private String description;
-
-    @Lob
-    @Column(name = "tags", nullable = false)
-    @ApiModelProperty(required=true)
-    private String tags;
-
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")
-    @LastModifiedDate
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name = "creation_date")
-    private Date creationDate;
-
-    @Column(name = "updated_by", nullable = false)
-    @ApiModelProperty(required=true)
-    private String updatedBy;
-
-    @Override
-    public String toString() {
-        return "[" + ", name = " + name +
-                ", dataType = " + dataType +
-                ", entrySchema = " + entrySchema +
-                ", definition =" + definition +
-                ", description = " + description +
-                ", updatedBy = " + updatedBy +
-                ", tags = " + tags +
-                ", creationDate = " + creationDate +
-                "]";
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    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 ResourceDefinition getDefinition() {
-        return definition;
-    }
-
-    public void setDefinition(ResourceDefinition definition) {
-        this.definition = definition;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getTags() {
-        return tags;
-    }
-
-    public void setTags(String tags) {
-        this.tags = tags;
-    }
-
-    public Date getCreationDate() {
-        return creationDate;
-    }
-
-    public void setCreationDate(Date creationDate) {
-        this.creationDate = creationDate;
-    }
-
-    public String getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedBy(String updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-
-
-
-}
diff --git a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/model/AutoMapResponse.java b/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/model/AutoMapResponse.java
deleted file mode 100644
index 0fa337762..000000000
--- a/ms/controllerblueprints/modules/service/src/main/java/org/onap/ccsdk/cds/controllerblueprints/service/model/AutoMapResponse.java
+++ /dev/null
@@ -1,53 +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.cds.controllerblueprints.service.model;
-
-import org.onap.ccsdk.cds.controllerblueprints.resource.dict.ResourceAssignment;
-import org.onap.ccsdk.cds.controllerblueprints.service.domain.ResourceDictionary;
-
-import java.util.List;
-
-/**
- * ArtifactRequest.java Purpose: Provide Configuration Generator ArtifactRequest Model
- *
- * @author Brinda Santh
- * @version 1.0
- */
-public class AutoMapResponse {
-
-    private List<ResourceAssignment> resourceAssignments;
-    private List<ResourceDictionary> dataDictionaries;
-
-    public List<ResourceAssignment> getResourceAssignments() {
-        return resourceAssignments;
-    }
-
-    public void setResourceAssignments(List<ResourceAssignment> resourceAssignments) {
-        this.resourceAssignments = resourceAssignments;
-    }
-
-    public List<ResourceDictionary> getDataDictionaries() {
-        return dataDictionaries;
-    }
-
-    public void setDataDictionaries(List<ResourceDictionary> dataDictionaries) {
-        this.dataDictionaries = dataDictionaries;
-    }
-
-
-
-}