X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fservice%2FMetricService.java;h=d239dfa1bd0ff9ad69c0dd8ae5fb7c33ab83ca0e;hb=76dc816cecf02b26b56b6fc40118fd8b9f44fd39;hp=416af44139ef0716bcaf8ac5e47178c17bccb067;hpb=6fdf2fd8d754e59977bf107d60725b8394771f69;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/MetricService.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/MetricService.java
index 416af4413..d239dfa1b 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/MetricService.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/service/MetricService.java
@@ -36,8 +36,14 @@ import org.onap.policy.xacml.api.pap.OnapPDPGroup;
 import com.att.research.xacml.api.pap.PDPPolicy;
 
 public class MetricService {
-
-	public static void doGetPolicyMetrics(HttpServletRequest request, HttpServletResponse response) {
+	private static String errorMsg	= "error";
+	/*
+	 * This is a private constructor
+	 * */
+	public MetricService(){
+		
+	}
+	public static void doGetPolicyMetrics(HttpServletResponse response) {
 		Set<OnapPDPGroup> groups = new HashSet<>();
 		try {
 			//get the count of policies on the PDP
@@ -52,12 +58,12 @@ public class MetricService {
 			//get the count of policies on the PAP
 			EntityManager em = null;
 			if(XACMLPapServlet.getEmf()!=null){
-				em = (EntityManager) XACMLPapServlet.getEmf().createEntityManager();
+				em = XACMLPapServlet.getEmf().createEntityManager();
 			}
 			if (em==null){
 				PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE + " Error creating entity manager with persistence unit: " + XACMLPapServlet.getPersistenceUnit());
 				response.setStatus(HttpServletResponse.SC_BAD_REQUEST);								
-				response.addHeader("error", "Error creating entity manager with persistence unit");
+				response.addHeader(errorMsg, "Error creating entity manager with persistence unit");
 				return;
 			}
 			int papCount = ((Number) em.createNamedQuery("PolicyVersion.findAllCount").getSingleResult()).intValue();
@@ -78,14 +84,14 @@ public class MetricService {
 			}else{
 				String message = "The policy count on the PAP and PDP is 0.  Please check the database and file system to correct this error.";
 				response.setStatus(HttpServletResponse.SC_BAD_REQUEST);								
-				response.addHeader("error", message);
+				response.addHeader(errorMsg, message);
 				return;
 			}
 		} catch (Exception e) {
 			String message = XACMLErrorConstants.ERROR_DATA_ISSUE + " Error Querying the Database: " + e.getMessage();
 			PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE, e, "XACMLPapServlet", " Error Querying the Database.");
 			response.setStatus(HttpServletResponse.SC_BAD_REQUEST);								
-			response.addHeader("error", message);
+			response.addHeader(errorMsg, message);
 			return;			
 		}
 	}