From 952d4f5aab9913f961e77fa0457da5d38f31d94f Mon Sep 17 00:00:00 2001 From: liamfallon Date: Sun, 16 Sep 2018 02:03:12 +0100 Subject: Fix Sonar issues in apex Fixing various Sonar issues in apex. Issue-ID: POLICY-1034 Change-Id: Ie693637d75bd7e38c71b7ba04886fb75636276ed Signed-off-by: liamfallon --- .../org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java | 2 +- .../onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'model') diff --git a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java index ad5b74c3a..c3617012e 100644 --- a/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java +++ b/model/model-api/src/main/java/org/onap/policy/apex/model/modelapi/impl/ContextAlbumFacade.java @@ -164,7 +164,7 @@ public class ContextAlbumFacade { contextAlbum.setScope(scope); } if (writable != null) { - if (writable.trim().equalsIgnoreCase("true") || writable.trim().equalsIgnoreCase("t")) { + if ("true".equalsIgnoreCase(writable.trim()) || "t".equalsIgnoreCase(writable.trim())) { contextAlbum.setWritable(true); } else { contextAlbum.setWritable(false); diff --git a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java index a40a8100f..f1bc4aece 100644 --- a/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java +++ b/model/policy-model/src/main/java/org/onap/policy/apex/model/policymodel/handling/PolicyLogicReader.java @@ -99,7 +99,7 @@ public class PolicyLogicReader implements AxLogicReader { @Override public String readLogic(final AxLogic axLogic) { // Java uses compiled logic, other executor types run scripts - if (axLogic.getLogicFlavour().equals("JAVA")) { + if ("JAVA".equals(axLogic.getLogicFlavour())) { // Check if we're using the default logic if (defaultLogic != null) { // Return the java class name for the default logic -- cgit 1.2.3-korg