diff options
Diffstat (limited to 'mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common')
19 files changed, 84 insertions, 164 deletions
diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/ExternalCertificateParameters.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/ExternalCertificateParameters.java index d7c76a9..5655d70 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/ExternalCertificateParameters.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/ExternalCertificateParameters.java @@ -29,12 +29,9 @@ import lombok.Data; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: External Certificate Parameters + * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Common Model: A model class which + * represents External Certificate Parameters */ - - @Data public class ExternalCertificateParameters { @@ -43,5 +40,4 @@ public class ExternalCertificateParameters { @JsonProperty(Constants.SANS_FIELD) private GetInput sans; - } diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/ExternalTlsInfo.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/ExternalTlsInfo.java index 197104d..0b1b414 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/ExternalTlsInfo.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/ExternalTlsInfo.java @@ -31,12 +31,9 @@ import lombok.Data; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: External TLS Info + * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Common Model: A model class which + * represents External TLS Info */ - - @Data @JsonInclude(value = JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) @@ -56,5 +53,4 @@ public class ExternalTlsInfo { @JsonProperty(Constants.EXTERNAL_CERTIFICATE_PARAMETERS_FIELD) private ExternalCertificateParameters externalCertificateParameters; - } diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/GetAttribute.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/GetAttribute.java index 2d5bca7..3e08cc2 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/GetAttribute.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/GetAttribute.java @@ -1,4 +1,3 @@ - /* * * * ============LICENSE_START======================================================= @@ -29,16 +28,12 @@ import lombok.Data; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: Get Attribute + * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Common Model: A model class which + * represents Get Attribute */ - - @Data public class GetAttribute { @JsonProperty("get_attribute") private Object attribute; - } diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Info.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Info.java index 3721d55..8f0b909 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Info.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Info.java @@ -29,26 +29,22 @@ import lombok.Data; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: Info + * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Common Model: A model class which + * represents Info */ - - @Data -@JsonInclude(value= Include.NON_NULL) +@JsonInclude(value = Include.NON_NULL) public class Info { - private GetInput topic_url; - - private GetInput username; + private GetInput topic_url; - private GetInput password; + private GetInput username; - private GetInput location; + private GetInput password; - private GetInput delivery_url; + private GetInput location; - private GetInput subscriber_id; + private GetInput delivery_url; + private GetInput subscriber_id; } diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Interfaces.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Interfaces.java index 04ef7e7..c0536de 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Interfaces.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Interfaces.java @@ -23,20 +23,15 @@ package org.onap.blueprintgenerator.model.common; - import lombok.Data; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: Interfaces + * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Common Model: A model class which + * represents Interfaces */ - - @Data public class Interfaces { - private Start start; - + private Start start; } diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Node.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Node.java index ea28d62..9387d42 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Node.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Node.java @@ -32,12 +32,9 @@ import java.util.Map; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: Node derived from Common Module Node Model used by both DCAE and ONAP + * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Common Model: A model class which + * represents Node derived from Common Module Node Model */ - - @Data @JsonInclude(value = JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/OnapBlueprint.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/OnapBlueprint.java index 4dd7b0f..198a43e 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/OnapBlueprint.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/OnapBlueprint.java @@ -32,17 +32,13 @@ import java.util.Map; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: Blueprint derived from Common Module Blueprint Model used by both DCAE and ONAP + * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Common Model: A model class which + * represents Blueprint derived from Common Module Blueprint Model */ - - @Data @JsonInclude(value = JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class OnapBlueprint extends Blueprint { private Map<String, Node> node_templates; - -}
\ No newline at end of file +} diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PgaasNode.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PgaasNode.java index af6fb54..daa9c74 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PgaasNode.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PgaasNode.java @@ -23,24 +23,19 @@ package org.onap.blueprintgenerator.model.common; - import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: Pgaas Node + * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Common Model: A model class which + * represents Pgaas Node */ - - @Data @NoArgsConstructor public class PgaasNode extends Node { @JsonProperty("properties") private PgaasNodeProperties pgaasNodeProperties; - } diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PgaasNodeProperties.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PgaasNodeProperties.java index 37ddb73..36ab1a8 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PgaasNodeProperties.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PgaasNodeProperties.java @@ -28,13 +28,9 @@ import lombok.Data; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: Pgaas Node Properties + * @date 10/16/2020 Application: ONAP - Blueprint Generator OONAP Common Model: A model class which + * represents Pgaas Node Properties */ - - - @Data public class PgaasNodeProperties { diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyModel.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyModel.java index 08b9096..c432ae9 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyModel.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyModel.java @@ -30,19 +30,14 @@ import java.util.Map; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: Policy Model + * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Common Model: A model class which + * represents Policy Model */ - - @Data @JsonInclude(JsonInclude.Include.NON_NULL) public class PolicyModel { - - private String tosca_definition_version; - private Map<String, PolicyModelNode> node_types; - private Map<String, PolicyModelNode> data_types; - + private String tosca_definition_version; + private Map<String, PolicyModelNode> node_types; + private Map<String, PolicyModelNode> data_types; } diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyModelNode.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyModelNode.java index c418b8e..54a5b20 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyModelNode.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyModelNode.java @@ -30,18 +30,14 @@ import java.util.Map; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: Policy Model Node + * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Common Model: A model class which + * represents Policy Model Node */ - - @Data @JsonInclude(JsonInclude.Include.NON_NULL) public class PolicyModelNode { - - private String derived_from; - private Map<String, PolicyProperties> properties; + private String derived_from; + private Map<String, PolicyProperties> properties; } diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyNode.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyNode.java index cc08814..3e518c0 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyNode.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyNode.java @@ -23,24 +23,19 @@ package org.onap.blueprintgenerator.model.common; - import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: Policy Node derived from Common Module Node Model used by both DCAE and ONAP + * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Common Model: A model class which + * represents Policy Node derived from Common Module Node Model */ - - @Data @NoArgsConstructor public class PolicyNode extends Node { @JsonProperty("properties") private PolicyNodeProperties policyNodeProperties; - } diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyNodeProperties.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyNodeProperties.java index 3f472c8..169c7d5 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyNodeProperties.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyNodeProperties.java @@ -29,12 +29,9 @@ import lombok.NoArgsConstructor; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: Policy Node Properties + * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Common Model: A model class which + * represents Policy Node Properties */ - - @Data @NoArgsConstructor public class PolicyNodeProperties { @@ -44,5 +41,4 @@ public class PolicyNodeProperties { @JsonProperty("policy_model_id") private String policyModelId; - } diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyProperties.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyProperties.java index 5a63b00..7e3060b 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyProperties.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/PolicyProperties.java @@ -28,18 +28,14 @@ import lombok.Data; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: Policy Properties + * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Common Model: A model class which + * represents Policy Properties */ - - @Data @JsonInclude(JsonInclude.Include.NON_NULL) public class PolicyProperties { - - private String type; - private Object entry_schema; - + private String type; + + private Object entry_schema; } diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Properties.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Properties.java index 11fc06e..a9675f5 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Properties.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Properties.java @@ -37,53 +37,49 @@ import java.util.Map; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: Properties + * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Common Model: A model class which + * represents Properties */ - - @Data @JsonInclude(value = Include.NON_NULL) public class Properties { - private Appconfig application_config; - - private OnapAuxilary docker_config; + private Appconfig application_config; - private Object image; + private OnapAuxilary docker_config; - private GetInput location_id; + private Object image; - private String service_component_type; + private GetInput location_id; - private Map<String, Object> log_info; + private String service_component_type; - private String dns_name; + private Map<String, Object> log_info; - private Object replicas; + private String dns_name; - private String name; + private Object replicas; - private GetInput topic_name; + private String name; - private GetInput feed_name; + private GetInput topic_name; - private List<Streams> streams_publishes; + private GetInput feed_name; - private List<Streams> streams_subscribes; + private List<Streams> streams_publishes; - private TlsInfo tls_info; + private List<Streams> streams_subscribes; - private ResourceConfig resource_config; + private TlsInfo tls_info; - private GetInput always_pull_image; + private ResourceConfig resource_config; - private Boolean useExisting; + private GetInput always_pull_image; - @JsonIgnore - private ExternalTlsInfoFactoryService externalCertFactory; + private Boolean useExisting; - private ExternalTlsInfo external_cert; + @JsonIgnore + private ExternalTlsInfoFactoryService externalCertFactory; + private ExternalTlsInfo external_cert; } diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/ResourceConfig.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/ResourceConfig.java index 8b41fd2..cda8458 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/ResourceConfig.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/ResourceConfig.java @@ -29,17 +29,13 @@ import java.util.Map; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: Resource Config + * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Common Model: A model class which + * represents Resource Config */ - - @Data public class ResourceConfig { - private Map<String, GetInput> limits; - - private Map<String, GetInput> requests; + private Map<String, GetInput> limits; -}
\ No newline at end of file + private Map<String, GetInput> requests; +} diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Services.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Services.java index 7aa1566..abf1fb5 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Services.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Services.java @@ -32,19 +32,15 @@ import lombok.Data; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: Services + * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Common Model: A model class which + * represents Services */ - - @Data -@JsonInclude(value=Include.NON_NULL) +@JsonInclude(value = Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) -public class Services { - - private Calls[] calls; +public class Services { - private Provides[] provides; + private Calls[] calls; + private Provides[] provides; } diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Start.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Start.java index 3740668..7714d94 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Start.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/Start.java @@ -31,19 +31,15 @@ import java.util.Map; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: Start + * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Common Model: A model class which + * represents Start */ - - @Data -@JsonInclude(value= JsonInclude.Include.NON_NULL) +@JsonInclude(value = JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class Start { private StartInputs inputs; private Map<String, Object> envs; - } diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/StartInputs.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/StartInputs.java index 458852e..6b35cc2 100644 --- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/StartInputs.java +++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/model/common/StartInputs.java @@ -31,19 +31,15 @@ import java.util.List; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: ONAP - Blueprint Generator - * ONAP Common Model used by both ONAP and DMAAP: Start Inputs under Start + * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Common Model: A model class which + * represents Start Inputs under Start */ - - @Data -@JsonInclude(value= JsonInclude.Include.NON_NULL) +@JsonInclude(value = JsonInclude.Include.NON_NULL) @JsonIgnoreProperties(ignoreUnknown = true) public class StartInputs { private Object envs; private List<String> ports; - } |