1 files changed, 17 insertions, 14 deletions

diff --git a/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/auth/servlet/MonitoringServlet.java b/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/auth/servlet/MonitoringServlet.java
index a7d7b9759..70448ef09 100644
--- a/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/auth/servlet/MonitoringServlet.java
+++ b/id/server/modules/module-monitoring/src/main/java/at/gv/egovernment/moa/id/auth/servlet/MonitoringServlet.java
@@ -28,35 +28,38 @@ import java.util.Arrays;
 import java.util.List;
 
 import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.auth.AuthConfiguration;
-import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProviderFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import at.gv.egovernment.moa.id.commons.api.AuthConfiguration;
+import at.gv.egovernment.moa.id.commons.api.exceptions.ConfigurationException;
 import at.gv.egovernment.moa.id.monitoring.TestManager;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
 
-@WebServlet(name = "MonitoringServlet", value = "/MonitoringServlet")
-public class MonitoringServlet extends AuthServlet {
+@Controller
+public class MonitoringServlet {
 
-	private static final long serialVersionUID = 1L;
 	private static final String REQUEST_ATTR_MODULE = "module";
 	
+	@Autowired private AuthConfiguration authConfig;
+	
 	  public MonitoringServlet() {
 		super();
 		Logger.debug("Registering servlet " + getClass().getName() + " with mapping '/MonitoringServlet'.");
 	}
 
-	protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+	@RequestMapping(value = "/MonitoringServlet", method = RequestMethod.GET)
+	public void getStatusInformation(HttpServletRequest req, HttpServletResponse resp)
 			    throws ServletException, IOException {
 		  
-		  try {
-			AuthConfiguration config = AuthConfigurationProviderFactory.getInstance();
-			
-			if (config.isMonitoringActive()) {
+		  try {			
+			if (authConfig.isMonitoringActive()) {
 				Logger.debug("Monitoring Servlet received request");
 
 				TestManager tests = TestManager.getInstance();
@@ -71,7 +74,7 @@ public class MonitoringServlet extends AuthServlet {
 					} else {
 						resp.setStatus(HttpServletResponse.SC_OK);
 						resp.setContentType("text/html;charset=UTF-8");
-						resp.getWriter().write(getHtml(config.getMonitoringMessageSuccess()));
+						resp.getWriter().write(getHtml(authConfig.getMonitoringMessageSuccess()));
 						Logger.info("Monitoring Servlet finished without errors");
 					}
 					
@@ -84,7 +87,7 @@ public class MonitoringServlet extends AuthServlet {
 						} else {
 							resp.setStatus(HttpServletResponse.SC_OK);
 							resp.setContentType("text/html;charset=UTF-8");
-							resp.getWriter().write(getHtml(config.getMonitoringMessageSuccess()));
+							resp.getWriter().write(getHtml(authConfig.getMonitoringMessageSuccess()));
 							Logger.info("Monitoring Servlet finished without errors");
 						}