summaryrefslogtreecommitdiffstats
path: root/ONAP-PAP-REST/src/main
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2017-08-15 12:38:27 +0000
committerGerrit Code Review <gerrit@onap.org>2017-08-15 12:38:27 +0000
commit6065432f5eb35d70466e1eead8c78124ec3cf62e (patch)
tree7ed8b90c20c81dffd417c1318090e21a7550062a /ONAP-PAP-REST/src/main
parent3c519a0d908c34e22d724d663ad3512f6cdd8d8f (diff)
parentc96dd91383b465c372f61664ebd584eeebe68f77 (diff)
Merge "Fixes for eclipse warnings unused variables"
Diffstat (limited to 'ONAP-PAP-REST/src/main')
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java22
-rw-r--r--ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/AutoPushPolicy.java100
2 files changed, 0 insertions, 122 deletions
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java
index 45f803f5a..53d801b5b 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/XACMLPapServlet.java
@@ -72,7 +72,6 @@ import org.onap.policy.common.logging.eelf.MessageCodes;
import org.onap.policy.common.logging.eelf.PolicyLogger;
import org.onap.policy.common.logging.flexlogger.FlexLogger;
import org.onap.policy.common.logging.flexlogger.Logger;
-import org.onap.policy.pap.xacml.rest.components.AutoPushPolicy;
import org.onap.policy.pap.xacml.rest.components.PolicyDBDao;
import org.onap.policy.pap.xacml.rest.components.PolicyDBDaoTransaction;
import org.onap.policy.pap.xacml.rest.handler.APIRequestHandler;
@@ -161,7 +160,6 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
private static Integer papAuditTimeout = null;
private static Boolean papAuditFlag = null;
private static Boolean papFileSystemAudit = null;
- private static Boolean autoPushFlag = false;
private static String papResourceName = null;
private static Integer fpMonitorInterval = null;
private static Integer failedCounterThreshold = null;
@@ -187,7 +185,6 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
*/
private Thread initiateThread = null;
private ONAPLoggingContext baseLoggingContext = null;
- private AutoPushPolicy autoPushPolicy;
/**
* @see HttpServlet#HttpServlet()
@@ -266,24 +263,6 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
//Boolean will default to false if anything is missing or unrecognized
papAuditFlag = Boolean.parseBoolean(XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_RUN_AUDIT_FLAG));
papFileSystemAudit = Boolean.parseBoolean(XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_AUDIT_FLAG));
- //PAP Auto Push
- autoPushFlag = Boolean.parseBoolean(XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_PUSH_FLAG));
- // if Auto push then Load with properties.
- if(autoPushFlag){
- String file;
- try{
- file = XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_PUSH_FILE);
- if(file.endsWith(".properties")){
- autoPushPolicy = new AutoPushPolicy(file);
- }else{
- throw new PAPException();
- }
- }catch(Exception e){
- PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE + " Missing property or not a proper property file check for: " + XACMLRestProperties.PROP_PAP_PUSH_FILE );
- LOGGER.info("Overriding the autoPushFlag to False...");
- autoPushFlag = false;
- }
- }
papDependencyGroups = XACMLProperties.getProperty(XACMLRestProperties.PAP_DEPENDENCY_GROUPS);
if(papDependencyGroups == null){
throw new PAPException("papDependencyGroups is null");
@@ -326,7 +305,6 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
+ "\n papAuditTimeout = " + papAuditTimeout
+ "\n papAuditFlag = " + papAuditFlag
+ "\n papFileSystemAudit = " + papFileSystemAudit
- + "\n autoPushFlag = " + autoPushFlag
+ "\n papResourceName = " + papResourceName
+ "\n fpMonitorInterval = " + fpMonitorInterval
+ "\n failedCounterThreshold = " + failedCounterThreshold
diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/AutoPushPolicy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/AutoPushPolicy.java
deleted file mode 100644
index f9dbc287b..000000000
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/AutoPushPolicy.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP-PAP-REST
- * ================================================================================
- * Copyright (C) 2017 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.pap.xacml.rest.components;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.nio.file.Paths;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Set;
-
-import org.onap.policy.common.logging.eelf.MessageCodes;
-import org.onap.policy.common.logging.eelf.PolicyLogger;
-import org.onap.policy.common.logging.flexlogger.FlexLogger;
-import org.onap.policy.common.logging.flexlogger.Logger;
-import org.onap.policy.xacml.std.pap.StdPDPGroup;
-import org.onap.policy.xacml.std.pap.StdPDPPolicy;
-
-import com.att.research.xacml.api.pap.PDPPolicy;
-/**
- * Auto Push Policy based on the property file properties.
- *
- * @version 0.1
- */
-public class AutoPushPolicy {
-
- private static final Logger LOGGER = FlexLogger.getLogger(AutoPushPolicy.class);
-
- private String filePath = null;
- private Properties properties;
- private Long newModified;
- private Long oldModified;
- private File propFile;
-
-
- /**
- * Constructor Pass in the property file path.
- */
- public AutoPushPolicy(String file){
- filePath = file;
- properties = new Properties();
- propFile = Paths.get(filePath).toFile();
- readFile();
- }
-
- private void readFile(){
- try {
- properties.load(new FileInputStream(propFile));
- oldModified = propFile.lastModified();
- } catch (Exception e) {
- PolicyLogger.error(MessageCodes.ERROR_PROCESS_FLOW, e, "AutoPushPolicy", "Error while loading in the auto push properties file.");
- }
- }
-
- private StdPDPGroup addToGroup(String policyId, String policyName, String policyToCreateUpdate, StdPDPGroup pdpGroup) throws Exception{
- // Add to group. Send Notification.
- StdPDPPolicy policy = new StdPDPPolicy(policyId, true, policyName, null);
- //Get the current policies from the Group and Add the new one
- Set<PDPPolicy> currentPoliciesInGroup = pdpGroup.getPolicies();
- Set<PDPPolicy> policies = new HashSet<>();
- policies.add(policy);
- pdpGroup.copyPolicyToFile(policyId, new FileInputStream(Paths.get(policyToCreateUpdate).toFile()));
- //If the selected policy is in the group we must remove it because the name is default
- Iterator<PDPPolicy> policyIterator = policies.iterator();
- while (policyIterator.hasNext()) {
- PDPPolicy selPolicy = policyIterator.next();
- for (PDPPolicy existingPolicy : currentPoliciesInGroup) {
- if (existingPolicy.getId().equals(selPolicy.getId())) {
- pdpGroup.removePolicyFromGroup(existingPolicy);
- LOGGER.debug("Removing policy: " + existingPolicy);
- break;
- }
- }
- }
- if(currentPoliciesInGroup!=null){
- policies.addAll(currentPoliciesInGroup);
- }
- pdpGroup.setPolicies(policies);
- return pdpGroup;
- }
-}