From a520d00e005db1b232b9dae0c70d4dc5d73b33e1 Mon Sep 17 00:00:00 2001 From: Ravi Mantena Date: Mon, 21 Dec 2020 11:31:55 -0500 Subject: BpGen refactor Code Quality Issue-ID: DCAEGEN2-2502 Issue-ID: DCAEGEN2-2502 Change-Id: If6e08f0bb88c9039fb27898d50d2645f79175ba4 Signed-off-by: Ravi Mantena --- .../blueprintgenerator/model/policy/Policies.java | 22 +++++++++------------- .../model/policy/PoliciesNode.java | 10 +++------- .../model/policy/PoliciesProperties.java | 10 +++------- .../blueprintgenerator/model/policy/Policy.java | 11 +++-------- .../model/policy/PolicyFilter.java | 18 +++++++----------- .../model/policy/PolicyInput.java | 12 ++++-------- .../model/policy/PolicyNode.java | 10 +++------- .../model/policy/PolicyProperties.java | 10 +++------- 8 files changed, 35 insertions(+), 68 deletions(-) (limited to 'mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy') diff --git a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/Policies.java b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/Policies.java index 35d210c..4f9221c 100644 --- a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/Policies.java +++ b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/Policies.java @@ -29,24 +29,20 @@ import lombok.Data; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: DCAE/ONAP - Blueprint Generator - * Common Module: Used by both ONAp and DCAE Blueprint Applications - * Policy Model: To Get Policies + * @date 10/16/2020 Application: DCAE/ONAP - Blueprint Generator Common Module: Used by both ONAp + * and DCAE Blueprint Applications Policy Model: A model class which represents Policies */ - @Data @JsonInclude(value = JsonInclude.Include.NON_NULL) public class Policies { - private String configAttributes; + private String configAttributes; + + private String configName; + + private String onapName = Constants.ONAP_NAME_DCAE; - private String configName; - - private String onapName = Constants.ONAP_NAME_DCAE; - - private String policyName = Constants.POLICIES_POLICYNAME_DCAECONFIG; - - private boolean unique = false; + private String policyName = Constants.POLICIES_POLICYNAME_DCAECONFIG; + private boolean unique = false; } diff --git a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PoliciesNode.java b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PoliciesNode.java index 7b951cc..986a12e 100644 --- a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PoliciesNode.java +++ b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PoliciesNode.java @@ -29,16 +29,12 @@ import lombok.Data; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: DCAE/ONAP - Blueprint Generator - * Common Module: Used by both ONAp and DCAE Blueprint Applications - * Policy Model: To Get Policies Node + * @date 10/16/2020 Application: DCAE/ONAP - Blueprint Generator Common Module: Used by both ONAp + * and DCAE Blueprint Applications Policy Model: A model class which represents Policies Node */ - @Data @JsonInclude(value = JsonInclude.Include.NON_NULL) public class PoliciesNode extends Node { - private PoliciesProperties properties; - + private PoliciesProperties properties; } diff --git a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PoliciesProperties.java b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PoliciesProperties.java index 11844bf..a4db4ad 100644 --- a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PoliciesProperties.java +++ b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PoliciesProperties.java @@ -28,16 +28,12 @@ import lombok.Data; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: DCAE/ONAP - Blueprint Generator - * Common Module: Used by both ONAp and DCAE Blueprint Applications - * Policy Model: To Get Policies Properties + * @date 10/16/2020 Application: DCAE/ONAP - Blueprint Generator Common Module: Used by both ONAp + * and DCAE Blueprint Applications Policy Model: A model class which represents Policies Properties */ - @Data @JsonInclude(value = JsonInclude.Include.NON_NULL) public class PoliciesProperties { - private PolicyFilter policy_filter; - + private PolicyFilter policy_filter; } diff --git a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/Policy.java b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/Policy.java index b5f098c..cf2a9ff 100644 --- a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/Policy.java +++ b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/Policy.java @@ -23,22 +23,17 @@ package org.onap.blueprintgenerator.model.policy; - import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: DCAE/ONAP - Blueprint Generator - * Common Module: Used by both ONAp and DCAE Blueprint Applications - * Policy Model: To Get Policy + * @date 10/16/2020 Application: DCAE/ONAP - Blueprint Generator Common Module: Used by both ONAp + * and DCAE Blueprint Applications Policy Model: A model class which represents Policy */ - @Data @JsonInclude(value = JsonInclude.Include.NON_NULL) public class Policy { - private String policy_id; - + private String policy_id; } diff --git a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PolicyFilter.java b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PolicyFilter.java index e49e6c3..96cdfc6 100644 --- a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PolicyFilter.java +++ b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PolicyFilter.java @@ -29,24 +29,20 @@ import lombok.Data; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: DCAE/ONAP - Blueprint Generator - * Common Module: Used by both ONAp and DCAE Blueprint Applications - * Policy Model: To Get Policy Filters + * @date 10/16/2020 Application: DCAE/ONAP - Blueprint Generator Common Module: Used by both ONAp + * and DCAE Blueprint Applications Policy Model: A model class which represents Policy Filters */ - @Data @JsonInclude(value = JsonInclude.Include.NON_NULL) public class PolicyFilter { - private String configAttributes = Constants.EMPTY; + private String configAttributes = Constants.EMPTY; - private String configName = Constants.EMPTY; - - private String onapName = Constants.ONAP_NAME_DCAE; + private String configName = Constants.EMPTY; - private Object policyName; + private String onapName = Constants.ONAP_NAME_DCAE; - private boolean unique = false; + private Object policyName; + private boolean unique = false; } diff --git a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PolicyInput.java b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PolicyInput.java index ca13cd7..24da65c 100644 --- a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PolicyInput.java +++ b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PolicyInput.java @@ -28,18 +28,14 @@ import lombok.Data; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: DCAE/ONAP - Blueprint Generator - * Common Module: Used by both ONAp and DCAE Blueprint Applications - * Policy Model: To Get Policy Input + * @date 10/16/2020 Application: DCAE/ONAP - Blueprint Generator Common Module: Used by both ONAp + * and DCAE Blueprint Applications Policy Model: A model class which represents Policy Input */ - @Data @JsonInclude(value = JsonInclude.Include.NON_NULL) public class PolicyInput { - private Policies[] policies; - - private Policy[] policy; + private Policies[] policies; + private Policy[] policy; } diff --git a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PolicyNode.java b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PolicyNode.java index f5ebf05..c3256a1 100644 --- a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PolicyNode.java +++ b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PolicyNode.java @@ -29,16 +29,12 @@ import lombok.Data; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: DCAE/ONAP - Blueprint Generator - * Common Module: Used by both ONAp and DCAE Blueprint Applications - * Policy Model: To Get Policy Node + * @date 10/16/2020 Application: DCAE/ONAP - Blueprint Generator Common Module: Used by both ONAp + * and DCAE Blueprint Applications Policy Model: A model class which represents Policy Node */ - @Data @JsonInclude(value = JsonInclude.Include.NON_NULL) public class PolicyNode extends Node { - private PolicyProperties properties; - + private PolicyProperties properties; } diff --git a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PolicyProperties.java b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PolicyProperties.java index 8ec4a32..40d66e3 100644 --- a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PolicyProperties.java +++ b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/model/policy/PolicyProperties.java @@ -29,16 +29,12 @@ import lombok.Data; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: DCAE/ONAP - Blueprint Generator - * Common Module: Used by both ONAp and DCAE Blueprint Applications - * Policy Model: To Get Policy Properties + * @date 10/16/2020 Application: DCAE/ONAP - Blueprint Generator Common Module: Used by both ONAp + * and DCAE Blueprint Applications Policy Model: A model class which represents Policy Properties */ - @Data @JsonInclude(value = JsonInclude.Include.NON_NULL) public class PolicyProperties { - private GetInput policy_id; - + private GetInput policy_id; } -- cgit 1.2.3-korg