From d80880b097d08f9ab9dda54355216890a4b345dc Mon Sep 17 00:00:00 2001 From: rb7147 Date: Wed, 26 Jul 2017 10:11:15 -0400 Subject: [POLICY-117] Resolve the Policy Critical issues Change-Id: Ice72d7fa40151bff5db42f5dd632f04a3853b094 Signed-off-by: rb7147 --- ECOMP-REST/src/main/java/org/openecomp/policy/rest/XACMLRest.java | 2 +- .../src/main/java/org/openecomp/policy/rest/jpa/ConstraintType.java | 6 +++++- .../src/main/java/org/openecomp/policy/rest/util/MSModelUtils.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'ECOMP-REST/src/main/java') diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/XACMLRest.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/XACMLRest.java index 2a6654815..050d03bce 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/XACMLRest.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/XACMLRest.java @@ -199,7 +199,7 @@ public class XACMLRest { logger.debug("Content available: " + request.getInputStream().available()); } } catch (Exception e) { - logger.debug("Content: inputStream exception: " + e.getMessage() + "; (May not be relevant)"); + logger.debug("Content: inputStream exception: " + e.getMessage() + "; (May not be relevant)" +e); } } else { logger.debug("Parameters:"); diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ConstraintType.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ConstraintType.java index d7f5a720f..60923d5a8 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ConstraintType.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/jpa/ConstraintType.java @@ -51,7 +51,7 @@ public class ConstraintType implements Serializable { defaults.put(RANGE_TYPE, "Set a range of min and/or max integer/double values the attribute can be set to during policy creation."); defaults.put(REGEXP_TYPE, "Define a regular expression the attribute must match against during policy creation."); } - protected static final String[] RANGE_TYPES = {"minExclusive", "minInclusive", "maxExclusive", "maxInclusive"}; + private static final String[] RANGE_TYPES = {"minExclusive", "minInclusive", "maxExclusive", "maxInclusive"}; @Id @GeneratedValue(strategy = GenerationType.AUTO) @@ -114,4 +114,8 @@ public class ConstraintType implements Serializable { this.attributes = attributes; } + public static String[] getRangeTypes() { + return RANGE_TYPES; + } + } diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSModelUtils.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSModelUtils.java index 670657ae3..711abe59c 100644 --- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSModelUtils.java +++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSModelUtils.java @@ -183,7 +183,7 @@ public class MSModelUtils { try { resource.load(Collections.EMPTY_MAP); } catch (IOException e) { - logger.error("Error loading Encore Resource for new Model"); + logger.error("Error loading Encore Resource for new Model" + e); } EPackage root = (EPackage) resource.getContents().get(0); -- cgit 1.2.3-korg