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 --- .../policycreate/exception/PolicyCreateException.java | 15 +++++++++------ .../java/org/onap/policycreate/model/PolicyModel.java | 11 +++-------- .../org/onap/policycreate/model/PolicyModelNode.java | 15 ++++++--------- .../org/onap/policycreate/model/PolicyProperties.java | 17 +++++++---------- 4 files changed, 25 insertions(+), 33 deletions(-) (limited to 'mod/bpgenerator/common/src/main/java/org/onap/policycreate') diff --git a/mod/bpgenerator/common/src/main/java/org/onap/policycreate/exception/PolicyCreateException.java b/mod/bpgenerator/common/src/main/java/org/onap/policycreate/exception/PolicyCreateException.java index e848437..d18b414 100644 --- a/mod/bpgenerator/common/src/main/java/org/onap/policycreate/exception/PolicyCreateException.java +++ b/mod/bpgenerator/common/src/main/java/org/onap/policycreate/exception/PolicyCreateException.java @@ -25,18 +25,21 @@ package org.onap.policycreate.exception; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: DCAE/ONAP - Blueprint Generator - * Common Module: Used by both ONAp and DCAE Blueprint Applications - * Exception: For Policy Create + * @date 10/16/2020 Application: DCAE/ONAP - Blueprint Generator Common Module: Used by both ONAp + * and DCAE Blueprint Applications Exception: To handle error messages for Policy Create exceptions */ +public class PolicyCreateException extends RuntimeException { -public class PolicyCreateException extends RuntimeException{ - + /** + * Handles Policy Create Exception for Error Message + */ public PolicyCreateException(String errorMessage) { super(errorMessage); } + /** + * Handles Policy Create Exception for Error Message and Error + */ public PolicyCreateException(String errorMessage, Throwable err) { super(errorMessage, err); } diff --git a/mod/bpgenerator/common/src/main/java/org/onap/policycreate/model/PolicyModel.java b/mod/bpgenerator/common/src/main/java/org/onap/policycreate/model/PolicyModel.java index 3d8c1a7..009ca1e 100644 --- a/mod/bpgenerator/common/src/main/java/org/onap/policycreate/model/PolicyModel.java +++ b/mod/bpgenerator/common/src/main/java/org/onap/policycreate/model/PolicyModel.java @@ -31,19 +31,14 @@ import java.util.Map; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: DCAE/ONAP - Blueprint Generator - * Common Module: Used by both ONAp and DCAE Blueprint Applications - * Policy Create Model: For Policy Model + * @date 10/16/2020 Application: DCAE/ONAP - Blueprint Generator Common Module: Used by both ONAp + * and DCAE Blueprint Applications Policy Create Model: A model class which represents Policy Model */ - @Data -@JsonInclude(value=Include.NON_NULL) +@JsonInclude(value = Include.NON_NULL) public class PolicyModel { private String tosca_definition_version; private Map node_types; private Map data_types; - } - diff --git a/mod/bpgenerator/common/src/main/java/org/onap/policycreate/model/PolicyModelNode.java b/mod/bpgenerator/common/src/main/java/org/onap/policycreate/model/PolicyModelNode.java index eac29b6..7b2f759 100644 --- a/mod/bpgenerator/common/src/main/java/org/onap/policycreate/model/PolicyModelNode.java +++ b/mod/bpgenerator/common/src/main/java/org/onap/policycreate/model/PolicyModelNode.java @@ -31,17 +31,14 @@ import java.util.Map; /** * @author : Ravi Mantena - * @date 10/16/2020 - * Application: DCAE/ONAP - Blueprint Generator - * Common Module: Used by both ONAp and DCAE Blueprint Applications - * Policy Create Model: For Policy Model Node + * @date 10/16/2020 Application: DCAE/ONAP - Blueprint Generator Common Module: Used by both ONAp + * and DCAE Blueprint Applications Policy Create Model: A model class which represents Policy Model + * Node */ - @Data -@JsonInclude(value=Include.NON_NULL) +@JsonInclude(value = Include.NON_NULL) public class PolicyModelNode { - private String derived_from; - private Map properties; - + private String derived_from; + private Map properties; } diff --git a/mod/bpgenerator/common/src/main/java/org/onap/policycreate/model/PolicyProperties.java b/mod/bpgenerator/common/src/main/java/org/onap/policycreate/model/PolicyProperties.java index f12e76d..3812e73 100644 --- a/mod/bpgenerator/common/src/main/java/org/onap/policycreate/model/PolicyProperties.java +++ b/mod/bpgenerator/common/src/main/java/org/onap/policycreate/model/PolicyProperties.java @@ -29,17 +29,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 Create Model: For Policy Properties + * @date 10/16/2020 Application: DCAE/ONAP - Blueprint Generator Common Module: Used by both ONAp + * and DCAE Blueprint Applications Policy Create Model: A model class which represents Policy + * Properties */ - @Data -@JsonInclude(value=Include.NON_NULL) +@JsonInclude(value = Include.NON_NULL) public class PolicyProperties { - private String type; - private Object entry_schema; - -} \ No newline at end of file + private String type; + private Object entry_schema; +} -- cgit 1.2.3-korg