summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2019-09-13 12:12:45 -0400
committerPamela Dragosh <pdragosh@research.att.com>2019-09-13 16:07:44 -0400
commit8d54e1d7e53651432932e286f8831f0b4db1f22a (patch)
tree76d7a648930d8e2c2f09ece25953f6756cc31108 /main
parent1df1c6aeb21b50ab5c4f7c4a7e6da7bc8abed62e (diff)
Upgrade to Tosca derivedFrom fix
Upgrade to models fix for derivedFrom() append of 0.0.0 And some sonar fixes for: Exceptions should be either logged or rethrown but not both Preconditions" and logging arguments should not require evaluation Reduced cognitive complexity Issue-ID: POLICY-2079 Change-Id: Ied8630020e8a737c33b1484db953df133c89398f Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'main')
-rw-r--r--main/src/main/java/org/onap/policy/pdpx/main/parameters/XacmlPdpParameterHandler.java2
-rw-r--r--main/src/main/java/org/onap/policy/pdpx/main/rest/provider/DecisionProvider.java8
2 files changed, 2 insertions, 8 deletions
diff --git a/main/src/main/java/org/onap/policy/pdpx/main/parameters/XacmlPdpParameterHandler.java b/main/src/main/java/org/onap/policy/pdpx/main/parameters/XacmlPdpParameterHandler.java
index e8ddd1dc..9aaf3dae 100644
--- a/main/src/main/java/org/onap/policy/pdpx/main/parameters/XacmlPdpParameterHandler.java
+++ b/main/src/main/java/org/onap/policy/pdpx/main/parameters/XacmlPdpParameterHandler.java
@@ -57,7 +57,7 @@ public class XacmlPdpParameterHandler {
} catch (final Exception e) {
final String errorMessage = "error reading parameters from \"" + arguments.getConfigurationFilePath()
+ "\"\n" + "(" + e.getClass().getSimpleName() + "):" + e.getMessage();
- LOGGER.error(errorMessage, e);
+ LOGGER.error(errorMessage);
throw new PolicyXacmlPdpException(errorMessage, e);
}
diff --git a/main/src/main/java/org/onap/policy/pdpx/main/rest/provider/DecisionProvider.java b/main/src/main/java/org/onap/policy/pdpx/main/rest/provider/DecisionProvider.java
index 67e696aa..ec687957 100644
--- a/main/src/main/java/org/onap/policy/pdpx/main/rest/provider/DecisionProvider.java
+++ b/main/src/main/java/org/onap/policy/pdpx/main/rest/provider/DecisionProvider.java
@@ -52,13 +52,7 @@ public class DecisionProvider {
//
// Found application for action
//
- Pair<DecisionResponse, Response> decision;
- try {
- decision = application.makeDecision(request);
- } catch (Exception e) {
- LOGGER.error("makeDecision failed", e);
- throw e;
- }
+ Pair<DecisionResponse, Response> decision = application.makeDecision(request);
//
// Calculate statistics
//