CHeckstyle and JUnit for base package in ONAP-REST

[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / onap / policy / admin / CheckPdpProperties.java

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/CheckPdpProperties.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/CheckPdpProperties.java
index 81d3fb5..9253441 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/CheckPdpProperties.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/CheckPdpProperties.java
@@ -42,7 +42,7 @@ import java.util.Properties;
 
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
-import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.XacmlRestProperties;
 import org.onap.policy.utils.PeCryptoUtils;
 import org.onap.policy.xacml.api.XACMLErrorConstants;
 
@@ -53,7 +53,7 @@ import org.onap.policy.xacml.api.XACMLErrorConstants;
  *
  * <p>The reset() method has been added to assist with the above problem in order to acquire >80% JUnit code coverage.
  *
- * <p>This static class doesn't really check a PDP, it simply loads a properties file and tried to ensure 
+ * <p>This static class doesn't really check a PDP, it simply loads a properties file and tried to ensure
  * that a valid URL exists for a PDP along with user/password.
  */
 public class CheckPdpProperties {
@@ -101,7 +101,7 @@ public class CheckPdpProperties {
     private static void readFile() {
         String pdpFile;
         try {
-            pdpFile = XACMLProperties.getProperty(XACMLRestProperties.PROP_PDP_IDFILE);
+            pdpFile = XACMLProperties.getProperty(XacmlRestProperties.PROP_PDP_IDFILE);
         } catch (Exception e) {
             LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "Cannot read the PDP ID File" + e);
             return;
@@ -209,8 +209,7 @@ public class CheckPdpProperties {
                 LOGGER.error(XACMLErrorConstants.ERROR_SYSTEM_ERROR + e);
             }
             return encoding;
-        } else {
-            return null;
         }
+        return null;
     }
 }