1 files changed, 39 insertions, 42 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 a30c9c7ec..1acec1bd9 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
@@ -46,7 +46,7 @@ import java.util.Scanner;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CopyOnWriteArrayList;
-import javax.json.JsonException;
+
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 import javax.persistence.PersistenceException;
@@ -1018,24 +1018,26 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 			im.startTransaction();
 			loggingContext.metricEnded();
 			PolicyLogger.metrics("XACMLPapServlet doPut im startTransaction");
-		} catch(AdministrativeStateException e) {
-		    String message = "PUT interface called for PAP " + papResourceName + 
-		            " but it has an Administrative state of " + im.getStateManager().getAdminState() +
-		            "\n Exception Message: " + e.getMessage();
-		    logMessage(e, message, loggingContext, response);
-		    return;
-		} catch(StandbyStatusException e) {
-		    String message = "PUT interface called for PAP " + papResourceName + 
-		            " but it has a Standby Status of " + im.getStateManager().getStandbyStatus() +
-		            "\n Exception Message: " + e.getMessage();
-		    logMessage(e, message, loggingContext, response);
-		    return;
 		} catch (IntegrityMonitorException e) {
-		    String message = "PUT interface called for PAP " + papResourceName +
-		            " but an exception occurred" +
-		            "\n Exception Message: " + e.getMessage();
-		    logMessage(e, message, loggingContext, response);
-		    return;
+			String message = "PUT interface called for PAP " + papResourceName;
+			if (e instanceof AdministrativeStateException) {
+				message += " but it has an Administrative state of "
+					+ im.getStateManager().getAdminState();
+			} 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();
+
+			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();
@@ -2840,21 +2842,24 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 			PolicyLogger.audit("Transaction Failed - See Error.log");
 			response.setStatus(HttpServletResponse.SC_OK);
 			return;
-		}catch (ForwardProgressException e){
-		    String message = "GET:/pap/test called and PAP " + papResourceName + " is not making forward progress."
-		            + " Exception Message: " + e.getMessage();
-		    logMessage(e, message, loggingContext, response);
-		    return;
-		}catch (AdministrativeStateException e){
-		    String message = "GET:/pap/test called and PAP " + papResourceName + " Administrative State is LOCKED."
-		            + " Exception Message: " + e.getMessage();
-		    logMessage(e, message, loggingContext, response);
-		    return;
-		}catch (StandbyStatusException e){
-		    String message = "GET:/pap/test called and PAP " + papResourceName + " Standby Status is NOT PROVIDING SERVICE."
-		            + " Exception Message: " + e.getMessage();
-		    logMessage(e, message, loggingContext, response);
-		    return;
+		}catch (ForwardProgressException | AdministrativeStateException | StandbyStatusException e){
+			String submsg;
+			if (e instanceof ForwardProgressException) {
+				submsg = " is not making forward progress.";
+			} else if (e instanceof AdministrativeStateException) {
+				submsg = " Administrative State is LOCKED.";
+			} else {
+				submsg = " Standby Status is NOT PROVIDING SERVICE.";
+			}
+
+			String message = "GET:/pap/test called and PAP " + papResourceName + submsg
+					+ " 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;
 		}catch (Exception e) {
 			//A subsystem is not making progress, is locked, standby or is not responding
 			String eMsg = e.getMessage();
@@ -3029,12 +3034,4 @@ public class XACMLPapServlet extends HttpServlet implements StdItemSetChangeList
 	public static void setMsPolicyName(String msPolicyName) {
 		XACMLPapServlet.msPolicyName = msPolicyName;
 	}
-	
-	private void logMessage(Exception e, String message, ONAPLoggingContext loggingContext, HttpServletResponse response) {
-	    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);
-	}
-}
+}
\ No newline at end of file