Fix Fortify Scan Issue:

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

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/XACMLPolicyWriterWithPapNotify.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/XACMLPolicyWriterWithPapNotify.java
index f3e72cb..1cf2b76 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/XACMLPolicyWriterWithPapNotify.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/XACMLPolicyWriterWithPapNotify.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,6 +56,10 @@ import org.onap.policy.common.logging.flexlogger.Logger;
  */
 public class XACMLPolicyWriterWithPapNotify{
        private static final Logger LOGGER = FlexLogger.getLogger(XACMLPolicyWriterWithPapNotify.class);
+       
+       private XACMLPolicyWriterWithPapNotify() {
+               // Add private constructor to hide the implicit public one
+       }
 
        /**
         * Helper static class that does the work to write a policy set to a file on disk and notify PAP
@@ -205,8 +209,8 @@ public class XACMLPolicyWriterWithPapNotify{
                                        + "\npolicyToCreateUpdate = " + " ");
                }
                Base64.Encoder encoder = Base64.getEncoder();
-               String encoding = encoder.encodeToString((XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_USERID)+":"+XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_PASS)).getBytes(StandardCharsets.UTF_8));
-               HttpURLConnection connection = null;
+               String encoding = encoder.encodeToString((XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_USERID)+":"+CryptoUtils.decryptTxtNoExStr(XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_PASS))).getBytes(StandardCharsets.UTF_8));
+               HttpURLConnection connection;
                UUID requestID = UUID.randomUUID();
                URL url;
                try {
@@ -292,11 +296,9 @@ public class XACMLPolicyWriterWithPapNotify{
        
        public static boolean notifyPapOfDelete(String policyToDelete){
                Base64.Encoder encoder = Base64.getEncoder();
-               String encoding = encoder.encodeToString((XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_USERID)+":"+XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_PASS)).getBytes(StandardCharsets.UTF_8));
-               HttpURLConnection connection = null;
+               String encoding = encoder.encodeToString((XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_USERID)+":"+CryptoUtils.decryptTxtNoExStr(XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_PASS))).getBytes(StandardCharsets.UTF_8));
+               HttpURLConnection connection;
                UUID requestID = UUID.randomUUID();
-               //loggingContext.setRequestID(requestID.toString());
-               //loggingContext.transactionStarted();
                String papUrl = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_URL);
                if(papUrl == null){
                        LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + 
@@ -394,11 +396,9 @@ public class XACMLPolicyWriterWithPapNotify{
                                        + "\npolicyToCreateUpdate = " + policyToCreateUpdate);
                }
                Base64.Encoder encoder = Base64.getEncoder();
-               String encoding = encoder.encodeToString((XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_USERID)+":"+XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_PASS)).getBytes(StandardCharsets.UTF_8));
-               HttpURLConnection connection = null;
+               String encoding = encoder.encodeToString((XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_USERID)+":"+CryptoUtils.decryptTxtNoExStr(XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_PASS))).getBytes(StandardCharsets.UTF_8));
+               HttpURLConnection connection;
                UUID requestID = UUID.randomUUID();
-               //loggingContext.setRequestID(requestID.toString());
-               //loggingContext.transactionStarted();
                URL url;
                try {
                        url = new URL(XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_URL)+"?policyToCreateUpdate="+ URLEncoder.encode(policyToCreateUpdate, "UTF-8"));