X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2FXACMLPapServlet.java;h=bedc212a20eacbbd31b4a2d796d8df39b22e04a4;hb=e5c628fee6a6e6bb57a34d5b73e092d89ee26a5c;hp=cf1e6fc6eaf447684938e38ef0cfab3393487cb3;hpb=2f0f31787cd35520b65fb3577d3dac21c1e50062;p=policy%2Fengine.git

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 cf1e6fc6e..bedc212a2 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
@@ -40,7 +40,6 @@ import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 import java.util.Scanner;
@@ -65,6 +64,7 @@ import org.onap.policy.common.ia.IntegrityAudit;
 import org.onap.policy.common.im.AdministrativeStateException;
 import org.onap.policy.common.im.ForwardProgressException;
 import org.onap.policy.common.im.IntegrityMonitor;
+import org.onap.policy.common.im.IntegrityMonitorException;
 import org.onap.policy.common.im.IntegrityMonitorProperties;
 import org.onap.policy.common.im.StandbyStatusException;
 import org.onap.policy.common.logging.ONAPLoggingContext;
@@ -89,7 +89,6 @@ import org.onap.policy.xacml.api.pap.ONAPPapEngineFactory;
 import org.onap.policy.xacml.api.pap.OnapPDP;
 import org.onap.policy.xacml.api.pap.OnapPDPGroup;
 import org.onap.policy.xacml.api.pap.PAPPolicyEngine;
-import org.onap.policy.xacml.std.pap.StdPAPPolicy;
 import org.onap.policy.xacml.std.pap.StdPDP;
 import org.onap.policy.xacml.std.pap.StdPDPGroup;
 import org.onap.policy.xacml.std.pap.StdPDPItemSetChangeNotifier.StdItemSetChangeListener;
@@ -559,6 +558,16 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 			PolicyLogger.audit("Transaction Failed - See Error.log");
 			setResponseError(response,HttpServletResponse.SC_INTERNAL_SERVER_ERROR, message);
 			return;
+		} catch (IntegrityMonitorException e) {
+			String message = "POST interface called for PAP " + papResourceName + " but an exception occurred"
+					+ "\n Exception Message: " + e.getMessage();
+			LOGGER.error(MessageCodes.ERROR_SYSTEM_ERROR + " " + message, e);
+			loggingContext.metricEnded();
+			PolicyLogger.metrics("XACMLPapServlet doPost im startTransaction");
+			loggingContext.transactionEnded();
+			PolicyLogger.audit("Transaction Failed - See Error.log");
+			setResponseError(response,HttpServletResponse.SC_INTERNAL_SERVER_ERROR, message);
+			return;
 		}
 		try {
 			loggingContext.metricStarted();
@@ -827,6 +836,15 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 				PolicyLogger.audit("Transaction Failed - See Error.log");
 				setResponseError(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, message);
 				return;
+			} catch (IntegrityMonitorException e) {
+				String message = "GET interface called for PAP " + papResourceName + " but an exception occurred"
+						+ "\n Exception Message: " + e.getMessage();
+				LOGGER.info(message, e);
+				PolicyLogger.error(MessageCodes.ERROR_SYSTEM_ERROR + " " + message);
+				loggingContext.transactionEnded();
+				PolicyLogger.audit("Transaction Failed - See Error.log");
+				setResponseError(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, message);
+				return;
 			}
 			// Request from the API to get the gitPath
 			String apiflag = request.getParameter("apiflag");
@@ -999,7 +1017,7 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 			im.startTransaction();
 			loggingContext.metricEnded();
 			PolicyLogger.metrics("XACMLPapServlet doPut im startTransaction");
-		} catch (AdministrativeStateException | StandbyStatusException e) {
+		} catch (IntegrityMonitorException e) {
 			String message = "PUT interface called for PAP " + papResourceName;
 			if (e instanceof AdministrativeStateException) {
 				message += " but it has an Administrative state of "
@@ -1007,6 +1025,8 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 			} else if (e instanceof StandbyStatusException) {
 				message += " but it has a Standby Status of "
 					+ im.getStateManager().getStandbyStatus();
+			} else {
+				message += " but an exception occurred";
 
 			}
 			message += "\n Exception Message: " + e.getMessage();
@@ -1281,6 +1301,15 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 			PolicyLogger.audit("Transaction Failed - See Error.log");
 			setResponseError(response,HttpServletResponse.SC_INTERNAL_SERVER_ERROR, message);
 			return;
+		} catch (IntegrityMonitorException e) {
+			String message = "PUT interface called for PAP " + papResourceName + " but an exception occurred"
+					+ "\n Exception Message: " + e.getMessage();
+			LOGGER.info(message, e);
+			PolicyLogger.error(MessageCodes.ERROR_SYSTEM_ERROR + " " + message);
+			loggingContext.transactionEnded();
+			PolicyLogger.audit("Transaction Failed - See Error.log");
+			setResponseError(response,HttpServletResponse.SC_INTERNAL_SERVER_ERROR, message);
+			return;
 		}
 		loggingContext.metricStarted();
 		XACMLRest.dumpRequest(request);