From 0224cdf7be78cf0778f0b832a42c18c480c4b784 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Mon, 9 Dec 2019 09:22:54 +0100
Subject: switch to EAAF-Components 1.1.0-SNAPSHOT

---
 .../connector/controller/MonitoringController.java | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java')

diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java
index 0e95c1fc..14095ffc 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/controller/MonitoringController.java
@@ -43,15 +43,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
-import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
 import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
-import at.gv.egiz.eaaf.core.exceptions.EAAFException;
-import at.gv.egiz.eaaf.core.impl.utils.DOMUtils;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
 import at.gv.egiz.eaaf.core.impl.utils.Random;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPVPMetadataBuilderConfiguration;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPVPMetadataConfigurationFactory;
-import at.gv.egiz.eaaf.modules.pvp2.impl.builder.PVPMetadataBuilder;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataBuilderConfiguration;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataConfigurationFactory;
+import at.gv.egiz.eaaf.modules.pvp2.impl.builder.PvpMetadataBuilder;
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
 
 @Controller
@@ -70,8 +70,8 @@ public class MonitoringController {
 	@Autowired private ITransactionStorage storage;
 	@Autowired private IConfigurationWithSP config;
 	
-	@Autowired private PVPMetadataBuilder metadatabuilder;
-	@Autowired private IPVPMetadataConfigurationFactory configFactory;	
+	@Autowired private PvpMetadataBuilder metadatabuilder;
+	@Autowired private IPvpMetadataConfigurationFactory configFactory;	
 	private AbstractCredentialProvider pvpIDPCredentials;
 	
 	/**
@@ -86,7 +86,7 @@ public class MonitoringController {
 	@ExceptionHandler({Throwable.class})
 	public void genericExceptionHandler(HttpServletResponse resp, Exception exception) throws IOException {
 		log.error("Monitoring Servlet receives an error." , exception);
-		resp.setContentType(EAAFConstants.CONTENTTYPE_HTML_UTF8);
+		resp.setContentType(EaafConstants.CONTENTTYPE_HTML_UTF8);
 		resp.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 		resp.getWriter().write("Reason: " 
 				+ StringEscapeUtils.escapeHtml4(StringEscapeUtils.escapeEcmaScript(exception.getMessage())));
@@ -97,7 +97,7 @@ public class MonitoringController {
 	@RequestMapping(value = {MSeIDASNodeConstants.ENDPOINT_MONITORING_MONITOR}, 
 					method = {RequestMethod.GET} )
 	public void startFullTest(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-		resp.setContentType(EAAFConstants.CONTENTTYPE_HTML_UTF8);
+		resp.setContentType(EaafConstants.CONTENTTYPE_HTML_UTF8);
 		
 		try {
 			testConfig();
@@ -145,7 +145,7 @@ public class MonitoringController {
 			result += e.getMessage() + "<br>";
 		}
 		
-		resp.setContentType(EAAFConstants.CONTENTTYPE_HTML_UTF8);
+		resp.setContentType(EaafConstants.CONTENTTYPE_HTML_UTF8);
 		resp.setStatus(HttpServletResponse.SC_OK);
 		resp.getWriter().write(result);
 		
@@ -165,7 +165,7 @@ public class MonitoringController {
 			else
 				log.warn("Montioring: TestValue: " + value + " does NOT match in Storage test");
 			
-		} catch (EAAFException e) {
+		} catch (EaafException e) {
 			log.warn("Montioring: Can not read/write to storage.", e);
 			
 		}
@@ -194,11 +194,11 @@ public class MonitoringController {
 	private String testPVPMetadata() throws Exception {
 		try {
 			//build metadata
-			IPVPMetadataBuilderConfiguration metadataConfig = 
+			IPvpMetadataBuilderConfiguration metadataConfig = 
 				configFactory.generateMetadataBuilderConfiguration(
 						"http://localhost/monitoring", 
 						pvpIDPCredentials);									
-			metadatabuilder.buildPVPMetadata(metadataConfig);			
+			metadatabuilder.buildPvpMetadata(metadataConfig);			
 			return TEST_PVPMETADATA + MESSAGE_OK;
 			
 		} catch (Exception | TransformerFactoryConfigurationError e) {
@@ -237,7 +237,7 @@ public class MonitoringController {
 			}
 			
 			//parse metadata
-			DOMUtils.parseXmlNonValidating(method.getResponseBodyAsStream());
+			DomUtils.parseXmlNonValidating(method.getResponseBodyAsStream());
 						
 			return TEST_EIDASNODEMETADATA + MESSAGE_OK;
 			
-- 
cgit v1.2.3