From b687a23edb87b2357403ff50b8e83452b7497356 Mon Sep 17 00:00:00 2001 From: rama-huawei Date: Wed, 20 Sep 2017 11:37:00 +0530 Subject: Fix for Sonar major issues Moved the string literal on the left side of the actual string comparison. Added the "@Override" annotation for method signature Removed the useless assignment to local variables Issue-ID: POLICY-239 Change-Id: I5fb84bb6109c03c8c0850100b69df095d865b404 Signed-off-by: rama-huawei --- .../main/java/org/onap/policy/admin/CheckPDP.java | 17 ++++++------ .../java/org/onap/policy/admin/PolicyAdapter.java | 2 +- .../org/onap/policy/admin/RESTfulPAPEngine.java | 32 +++++++++++----------- 3 files changed, 25 insertions(+), 26 deletions(-) (limited to 'POLICY-SDK-APP/src') diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/CheckPDP.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/CheckPDP.java index 87ed1fec9..3febbed44 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/CheckPDP.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/CheckPDP.java @@ -66,7 +66,6 @@ public class CheckPDP { private static void readFile(){ String pdpFile = null; - Long newModified = null; try{ pdpFile = XACMLProperties.getProperty(XACMLRestProperties.PROP_PDP_IDFILE); }catch (Exception e){ @@ -90,7 +89,7 @@ public class CheckPDP { } // Check if File is updated recently else { - newModified = pdpPath.toFile().lastModified(); + Long newModified = pdpPath.toFile().lastModified(); if (!newModified.equals(oldModified)) { // File has been updated. readProps(); @@ -100,7 +99,7 @@ public class CheckPDP { @SuppressWarnings({ "unchecked", "rawtypes" }) private static void readProps() { - Properties pdpProp = null; + Properties pdpProp; pdpProp = new Properties(); try { InputStream in = new FileInputStream(pdpPath.toFile()); @@ -126,15 +125,15 @@ public class CheckPDP { private static void loadPDPProperties(String propKey, Properties pdpProp){ if (propKey.startsWith("PDP_URL")) { - String check_val = pdpProp.getProperty(propKey); - if (check_val == null) { + String checkVal = pdpProp.getProperty(propKey); + if (checkVal == null) { LOGGER.error("Properties file doesn't have the PDP_URL parameter"); } - if (check_val != null && check_val.contains(";")) { - List pdp_default = new ArrayList<>(Arrays.asList(check_val.split("\\s*;\\s*"))); + if (checkVal != null && checkVal.contains(";")) { + List pdpDefault = new ArrayList<>(Arrays.asList(checkVal.split("\\s*;\\s*"))); int pdpCount = 0; - while (pdpCount < pdp_default.size()) { - String pdpVal = pdp_default.get(pdpCount); + while (pdpCount < pdpDefault.size()) { + String pdpVal = pdpDefault.get(pdpCount); readPDPParam(pdpVal); pdpCount++; } diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyAdapter.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyAdapter.java index fdfb99d3e..a15eb5882 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyAdapter.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyAdapter.java @@ -41,7 +41,7 @@ public class PolicyAdapter { private static final Logger LOGGER = FlexLogger.getLogger(PolicyAdapter.class); public void configure(PolicyRestAdapter policyAdapter, PolicyEntity entity) { - String policyNameValue = null ; + String policyNameValue; String configPolicyName = null ; if(extendedOptions(policyAdapter, entity)){ return; diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/RESTfulPAPEngine.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/RESTfulPAPEngine.java index 1f9372a7d..e48b0cb19 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/RESTfulPAPEngine.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/RESTfulPAPEngine.java @@ -160,6 +160,7 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP * @return * @throws PAPException */ + @Override public void updateGroup(OnapPDPGroup group) throws PAPException { try { @@ -242,12 +243,10 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP //Validate the Policy Data public boolean validatePolicyRequest(PolicyRestAdapter policyAdapter, String policyType) throws PAPException { - Boolean isValidData = false; StdPAPPolicy newPAPPolicy = new StdPAPPolicy(policyAdapter.getPolicyName(), policyAdapter.getConfigBodyData(), policyAdapter.getConfigType(), "Base"); //send JSON object to PAP - isValidData = (Boolean) sendToPAP("PUT", newPAPPolicy, null, null, "operation=validate", "apiflag=admin", "policyType=" + policyType); - return isValidData; + return (Boolean) sendToPAP("PUT", newPAPPolicy, null, null, "operation=validate", "apiflag=admin", "policyType=" + policyType); } @@ -321,7 +320,7 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP * @return * @throws PAPException */ - + @Override public PDPStatus getStatus(OnapPDP pdp) throws PAPException { return (StdPDPStatus)sendToPAP("GET", pdp, null, StdPDPStatus.class); } @@ -355,6 +354,7 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP String papPass = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_PASS); Base64.Encoder encoder = Base64.getEncoder(); String encoding = encoder.encodeToString((papID+":"+papPass).getBytes(StandardCharsets.UTF_8)); + Object contentObj = content; LOGGER.info("Encoding for the PAP is: " + encoding); try { String fullURL = papServletURLString; @@ -367,11 +367,11 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP } // special case - Status (actually the detailed status) comes from the PDP directly, not the PAP - if (method.equals("GET") && (content instanceof OnapPDP) && responseContentClass == StdPDPStatus.class) { + if ("GET".equals(method) && (contentObj instanceof OnapPDP) && responseContentClass == StdPDPStatus.class) { // Adjust the url and properties appropriately - String pdpID =((OnapPDP)content).getId(); + String pdpID =((OnapPDP)contentObj).getId(); fullURL = pdpID + "?type=Status"; - content = null; + contentObj = null; if(CheckPDP.validateID(pdpID)){ encoding = CheckPDP.getEncoding(pdpID); } @@ -401,14 +401,14 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP connection.setDoOutput(true); connection.setDoInput(true); - if (content != null) { - if (content instanceof InputStream) { + if (contentObj != null) { + if (contentObj instanceof InputStream) { try { // // Send our current policy configuration // try (OutputStream os = connection.getOutputStream()) { - int count = IOUtils.copy((InputStream)content, os); + int count = IOUtils.copy((InputStream)contentObj, os); if (LOGGER.isDebugEnabled()) { LOGGER.debug("copied to output, bytes="+count); } @@ -417,9 +417,9 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Failed to write content in '" + method + "'", e); } } else { - // The content is an object to be encoded in JSON + // The contentObj is an object to be encoded in JSON ObjectMapper mapper = new ObjectMapper(); - mapper.writeValue(connection.getOutputStream(), content); + mapper.writeValue(connection.getOutputStream(), contentObj); } } // @@ -434,18 +434,18 @@ public class RESTfulPAPEngine extends StdPDPItemSetChangeNotifier implements PAP String isValidData = connection.getHeaderField("isValidData"); String isSuccess = connection.getHeaderField("successMapKey"); Map successMap = new HashMap<>(); - if (isValidData != null && isValidData.equalsIgnoreCase("true")){ + if (isValidData != null && "true".equalsIgnoreCase(isValidData)){ LOGGER.info("Policy Data is valid."); return true; - } else if (isValidData != null && isValidData.equalsIgnoreCase("false")) { + } else if (isValidData != null && "false".equalsIgnoreCase(isValidData)) { LOGGER.info("Policy Data is invalid."); return false; - } else if (isSuccess != null && isSuccess.equalsIgnoreCase("success")) { + } else if (isSuccess != null && "success".equalsIgnoreCase(isSuccess)) { LOGGER.info("Policy Created Successfully!" ); String finalPolicyPath = connection.getHeaderField("finalPolicyPath"); successMap.put("success", finalPolicyPath); return successMap; - } else if (isSuccess != null && isSuccess.equalsIgnoreCase("error")) { + } else if (isSuccess != null && "error".equalsIgnoreCase(isSuccess)) { LOGGER.info("There was an error while creating the policy!"); successMap.put("error", "error"); return successMap; -- cgit 1.2.3-korg