1 files changed, 25 insertions, 18 deletions

diff --git a/src/main/java/at/gv/util/client/mis/usp_v2/USPClient.java b/src/main/java/at/gv/util/client/mis/usp_v2/USPClient.java
index 334df87..4d23a1e 100644
--- a/src/main/java/at/gv/util/client/mis/usp_v2/USPClient.java
+++ b/src/main/java/at/gv/util/client/mis/usp_v2/USPClient.java
@@ -2,14 +2,11 @@ package at.gv.util.client.mis.usp_v2;
 
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import javax.annotation.Resource;
 import javax.net.ssl.SSLContext;
-import javax.xml.datatype.DatatypeConfigurationException;
-import javax.xml.namespace.QName;
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.WebServiceContext;
 import javax.xml.ws.handler.Handler;
@@ -26,20 +23,15 @@ import org.slf4j.LoggerFactory;
 import at.gv.util.LaxHostNameVerifier;
 import at.gv.util.LoggingHandler;
 import at.gv.util.MiscUtil;
-import at.gv.util.client.szr.SZRSOAPHandler;
+import at.gv.util.client.szr.SZRHTTPHeaderHandler;
 import at.gv.util.config.EgovUtilConfiguration;
 import at.gv.util.ex.EgovUtilException;
-import at.gv.util.wsdl.mis.usp.GetMandatesPortType;
-import at.gv.util.wsdl.mis.usp.GetMandatesService;
 import at.gv.util.wsdl.mis.usp_v2.ISyncService;
 import at.gv.util.wsdl.mis.usp_v2.ListMandatesFault;
 import at.gv.util.wsdl.mis.usp_v2.SynchronisationServiceServiceagent;
-import at.gv.util.xsd.mis.usp.GetMandatesRequest;
-import at.gv.util.xsd.mis.usp.GetMandatesRequest.MandateFilters;
-import at.gv.util.xsd.mis.usp.GetMandatesResponse;
-import at.gv.util.xsd.mis.usp.IdentificationType;
 import at.gv.util.xsd.mis.usp_v2.eai.syncmsgs.ListMandatesRequest;
 import at.gv.util.xsd.mis.usp_v2.eai.syncmsgs.ListMandatesResponseType;
+import at.gv.util.xsd.mis.usp_v2.eai.syncmsgs.MandateAttributesSearchFilterType;
 import at.gv.util.xsd.szr.pvp.PvpTokenType;
 
 public class USPClient {
@@ -98,10 +90,21 @@ public class USPClient {
 	public void getMandates(String bpkType, String bpkValue, List<String> mandateFilters) {
 		ListMandatesRequest parameters = new ListMandatesRequest();
 		
+		MandateAttributesSearchFilterType searchFilterType = new MandateAttributesSearchFilterType();
+	
+		Object searchFilter = null;
+		searchFilterType.setFilter(searchFilter );
+		
+		
+		
 		//request USP
 		try {
+			log.trace("Request pre-processing finished. Requesting USP ... ");
+
 			ListMandatesResponseType results = this.uspSuche.listMandates(parameters );
 			
+			log.trace("Receive response from USP. Starting response post-processing ... ");
+			
 		} catch (ListMandatesFault e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -134,17 +137,20 @@ public class USPClient {
 		if (handlerList == null) {
 			handlerList = new ArrayList();
 		}
-		LoggingHandler loggingHandler = new LoggingHandler();
-		if (this.logEnabled) {
-			handlerList.add(loggingHandler);
-		}
-
+		
 		// PV authentication
 		log.trace("Adding WS-Security Header handler.");
-		PvpTokenType pvpToken = config.getURPVPToken();
-		SZRSOAPHandler szrSOAPHandler = new SZRSOAPHandler();
+		PvpTokenType pvpToken = config.getUSPPVPToken();
+		SZRHTTPHeaderHandler szrSOAPHandler = new SZRHTTPHeaderHandler();
 		szrSOAPHandler.configure(pvpToken);
     	handlerList.add(szrSOAPHandler);
+		
+		LoggingHandler loggingHandler = new LoggingHandler();
+		if (this.logEnabled) {
+			handlerList.add(loggingHandler);
+		}
+    	
+		// set handler
     	bindingProvider.getBinding().setHandlerChain(handlerList);
 
     	Client client = ClientProxy.getClient(uspSuche);
@@ -156,7 +162,8 @@ public class USPClient {
     	httpClientPolicy.setAllowChunking(false);
     	httpClientPolicy.setReceiveTimeout(32000);	 
     	http.setClient(httpClientPolicy);
-	        
+
+    	
     	// check for ssl
     	if (uspURL.toLowerCase().startsWith("https")) {
     		log.trace("Using ssl for SZR client request.");