Index: WSimpl/AX/Transport/GLS/v01/RegistrationService/RegistreerBerichtVerzender.cls.xml
===================================================================
diff -u -r40688 -r40697
--- WSimpl/AX/Transport/GLS/v01/RegistrationService/RegistreerBerichtVerzender.cls.xml	(.../RegistreerBerichtVerzender.cls.xml)	(revision 40688)
+++ WSimpl/AX/Transport/GLS/v01/RegistrationService/RegistreerBerichtVerzender.cls.xml	(.../RegistreerBerichtVerzender.cls.xml)	(revision 40697)
@@ -12,12 +12,13 @@
 
 <Method name="VoerUit">
 <FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
-<ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response</ReturnType>
+<ReturnType>APPS.TRANSP.GLS.data.VerzendData</ReturnType>
 <Implementation><![CDATA[
 	#Dim Verzendwijze as APPS.TRANSP.GLS.GLSv1.Bericht.enu.VerzendWijze = ..CommunicatieServiceLocator.GeefVerzendWijzeBepaler().GeefVerzendWijze(LeveringInfo)
 	#Dim Dienst as APPS.TRANSP.GLS.GLSv1.enu.Dienst = ..CommunicatieServiceLocator.GeefDienstBepaler().GeefDienst(Verzendwijze)
 	#dim Requests As List Of APPS.TRANSP.GLS.GLSv1.Bericht.dto.Request = ..RequestBouwer.MaakRequests(LeveringInfo,Verzendwijze)
-	Quit Requests.GetAt(1)
+	
+	Quit ..VerwerkRequest(Requests.GetAt(1))
 ]]></Implementation>
 </Method>
 
Index: vhTest/Utils/APPS/TRANSP/GLS/data/VerzendData.cls.xml
===================================================================
diff -u
--- vhTest/Utils/APPS/TRANSP/GLS/data/VerzendData.cls.xml	(revision 0)
+++ vhTest/Utils/APPS/TRANSP/GLS/data/VerzendData.cls.xml	(revision 40697)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Utils.APPS.TRANSP.GLS.data.VerzendData">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="GeefVerzendData">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Set VerzendData = ##class(APPS.TRANSP.GLS.data.VerzendData).%New()
+	Set VerzendData.LaatsteRequestType= "Registratie"
+	Set VerzendData.Referentie = "12345X123456P"
+	Set VerzendData.Response = ""
+	Set VerzendData.Status = "Finished"
+	Set VerzendData.TijdstipLaatsteWijziging = "2017-03-28 15:50:50.0"
+	Set VerzendData.TrackAndTraceID = "12345678901234"
+	Set VerzendData.UnitID = "123456789012"
+	Set VerzendData.VerzendWijze = "Parcel"
+	Quit VerzendData
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer/Test.cls.xml	(revision 0)
+++ vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer/Test.cls.xml	(revision 40697)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainer.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test">
+<Implementation><![CDATA[
+
+	#Dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo
+	Set LeveringInfo = ##class(vhTest.Utils.APPS.TRANSP.dto.LeveringInfo).GeefLeveringInfoColli()
+	
+	#Dim Request as WS.AX.Transport.GLS.v01.dto.RegisterContainerRequest	
+	Set Request = ##class(vhTest.Utils.WS.AX.Transport.GLS.v01.dto.RegisterContainerRequest).GeefColliRequest("ID1",1,1,0.5)
+
+	Set RegisterContainerRequestConvertorMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainerRequestConvertor).%New()
+	Do RegisterContainerRequestConvertorMock.VerwachtMethodCall("ConverteerNaarLeveringInfo", ..Matches.DataTransferObject(Request)).DanReturn(LeveringInfo)
+	
+
+	#Dim VerzendData as APPS.TRANSP.GLS.data.VerzendData
+	Set VerzendData = ##class(vhTest.Utils.APPS.TRANSP.GLS.data.VerzendData).GeefVerzendData()
+ 
+ 	Set BerichtVerzenderMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.RegistreerBerichtVerzender).%New()
+	Do BerichtVerzenderMock.VerwachtMethodCall("VoerUit",LeveringInfo).DanReturn(VerzendData)
+ 		
+	#Dim Response as WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse
+	Set Response = ##class(vhTest.Utils.WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse).GeefRegisterContainerResponse()
+	
+	Set VerzendDataConvertorMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.VerzendDataConvertor).%New()
+	Do VerzendDataConvertorMock.VerwachtMethodCall("ConverteerNaarRegisterContainerResponse",VerzendData).DanReturn(Response) 
+	 
+	Set RegisterContainer = ##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainer).%New(RegisterContainerRequestConvertorMock,BerichtVerzenderMock,VerzendDataConvertorMock)
+	Do RegisterContainer.RegisterContainer(Request)
+		
+	Do RegisterContainerRequestConvertorMock.Verifieer()
+	Do VerzendDataConvertorMock.Verifieer()
+	Do BerichtVerzenderMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Utils/WS/AX/Transport/GLS/v01/dto/RegisterContainerResponse.cls.xml
===================================================================
diff -u
--- vhTest/Utils/WS/AX/Transport/GLS/v01/dto/RegisterContainerResponse.cls.xml	(revision 0)
+++ vhTest/Utils/WS/AX/Transport/GLS/v01/dto/RegisterContainerResponse.cls.xml	(revision 40697)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Utils.WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse">
+<Super>TECH.RegisteredObject</Super>
+
+<Method name="GeefRegisterContainerResponse">
+<ClassMethod>1</ClassMethod>
+<Implementation><![CDATA[
+	Set Response = ##class(WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse).%New()	
+	Set Response.ShipmentId = "ShipmentId"
+	Set Response.VerzendWijze = "Parcel"
+	Set Response.GLSParcelNumber = ""
+	Set Response.GLSUnitNumber = "1123456788"
+	Set Response.IsGelukt= 1
+	Set Response.Melding = ""
+	Set Response.ShipmentId = ""
+	Set Response.RoutingDate = "28032017"
+	Set Response.RequestDate = "28032017"
+	Set Response.RequestTime = "16:05"
+	Set Response.TrackAndTraceUrlVoorVH="http://TrackAndTraceUrlVoorVH"
+	Set Response.TrackAndTraceUrlVoorKlant="http://TrackAndTraceUrlVoorKlant"
+	
+	
+	Quit Response
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/WSimpl/AX/Transport/GLS/v01/RegistrationService/VerzendDataConvertor.cls.xml
===================================================================
diff -u
--- vhTest/Mock/WSimpl/AX/Transport/GLS/v01/RegistrationService/VerzendDataConvertor.cls.xml	(revision 0)
+++ vhTest/Mock/WSimpl/AX/Transport/GLS/v01/RegistrationService/VerzendDataConvertor.cls.xml	(revision 40697)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.VerzendDataConvertor">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WSimpl.AX.Transport.GLS.v01.RegistrationService.VerzendDataConvertor,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="ConverteerNaarRegisterContainerResponse">
+<FormalSpec>VerzendData:APPS.TRANSP.GLS.data.VerzendData</FormalSpec>
+<ReturnType>WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("ConverteerNaarRegisterContainerResponse",VerzendData)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/AX/Transport/GLS/v01/RegistrationService/VerzendDataConvertor.cls.xml
===================================================================
diff -u
--- WSimpl/AX/Transport/GLS/v01/RegistrationService/VerzendDataConvertor.cls.xml	(revision 0)
+++ WSimpl/AX/Transport/GLS/v01/RegistrationService/VerzendDataConvertor.cls.xml	(revision 40697)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="WSimpl.AX.Transport.GLS.v01.RegistrationService.VerzendDataConvertor">
+<Super>TECH.Mockable</Super>
+
+<Method name="ConverteerNaarRegisterContainerResponse">
+<FormalSpec>VerzendData:APPS.TRANSP.GLS.data.VerzendData</FormalSpec>
+<ReturnType>WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse</ReturnType>
+<Implementation><![CDATA[	quit ##class(WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse).%New()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/WSimpl/AX/Transport/GLS/v01/RegistrationService/RegistreerBerichtVerzender.cls.xml
===================================================================
diff -u -r40687 -r40697
--- vhTest/Mock/WSimpl/AX/Transport/GLS/v01/RegistrationService/RegistreerBerichtVerzender.cls.xml	(.../RegistreerBerichtVerzender.cls.xml)	(revision 40687)
+++ vhTest/Mock/WSimpl/AX/Transport/GLS/v01/RegistrationService/RegistreerBerichtVerzender.cls.xml	(.../RegistreerBerichtVerzender.cls.xml)	(revision 40697)
@@ -17,7 +17,7 @@
 
 <Method name="VoerUit">
 <FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
-<ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response</ReturnType>
+<ReturnType>APPS.TRANSP.GLS.data.VerzendData</ReturnType>
 <Implementation><![CDATA[	quit ..VerwerkMethodCall("VoerUit",LeveringInfo)
 ]]></Implementation>
 </Method>
Index: APPS/TRANSP/GLS/GLSv1/impl/BerichtVerzenderTemplate.cls.xml
===================================================================
diff -u -r40639 -r40697
--- APPS/TRANSP/GLS/GLSv1/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 40639)
+++ APPS/TRANSP/GLS/GLSv1/impl/BerichtVerzenderTemplate.cls.xml	(.../BerichtVerzenderTemplate.cls.xml)	(revision 40697)
@@ -119,6 +119,7 @@
 	
 	set VerzendData.Status = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.enu.Status).Finished()
 	do VerzendData.Save()
+	quit VerzendData
 ]]></Implementation>
 </Method>
 
Index: vhTest/Fake/WSimpl/AX/Transport/GLS/v01/RegistrationService/VerzendDataConvertor.cls.xml
===================================================================
diff -u
--- vhTest/Fake/WSimpl/AX/Transport/GLS/v01/RegistrationService/VerzendDataConvertor.cls.xml	(revision 0)
+++ vhTest/Fake/WSimpl/AX/Transport/GLS/v01/RegistrationService/VerzendDataConvertor.cls.xml	(revision 40697)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.WSimpl.AX.Transport.GLS.v01.RegistrationService.VerzendDataConvertor">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>WSimpl.AX.Transport.GLS.v01.RegistrationService.VerzendDataConvertor</Super>
+
+<Method name="ConverteerNaarRegisterContainerResponse">
+<FormalSpec>VerzendData:APPS.TRANSP.GLS.data.VerzendData</FormalSpec>
+<ReturnType>WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse</ReturnType>
+<Implementation><![CDATA[	Quit ""
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer.cls.xml
===================================================================
diff -u -r40682 -r40697
--- WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer.cls.xml	(.../RegisterContainer.cls.xml)	(revision 40682)
+++ WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer.cls.xml	(.../RegisterContainer.cls.xml)	(revision 40697)
@@ -1,60 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainer">
-<Super>APPS.TRANSP.GLS.GLSv1.impl.BerichtVerzenderTemplate</Super>
+<Super>TECH.RegisteredObject</Super>
 
-<Property name="RegisterContainerRequestConverter">
+<Property name="RegisterContainerRequestConvertor">
 <Type>WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainerRequestConvertor</Type>
 <Private>1</Private>
 </Property>
 
-<Property name="CurrentT400">
-<Type>%String</Type>
+<Property name="VerzendDataConvertor">
+<Type>WSimpl.AX.Transport.GLS.v01.RegistrationService.VerzendDataConvertor</Type>
 <Private>1</Private>
 </Property>
 
+<Property name="RegistreerBerichtVerzender">
+<Type>WSimpl.AX.Transport.GLS.v01.RegistrationService.RegistreerBerichtVerzender</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>CommunicatieServiceLocator:APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator,RegisterContainerRequestConverter:WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainerRequestConvertor</FormalSpec>
+<FormalSpec>RegisterContainerRequestConvertor:WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainerRequestConvertor,RegistreerBerichtVerzender:WSimpl.AX.Transport.GLS.v01.RegistrationService.RegistreerBerichtVerzender,VerzendDataConvertor:WSimpl.AX.Transport.GLS.v01.RegistrationService.VerzendDataConvertor</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Set ..RegisterContainerRequestConverter = $$$Inject(RegisterContainerRequestConverter,##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainerRequestConvertor).%New())
-	Quit ##Super(CommunicatieServiceLocator)
+	Set ..RegisterContainerRequestConvertor = $$$Inject(RegisterContainerRequestConvertor,##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainerRequestConvertor).%New())
+	Set ..RegistreerBerichtVerzender = $$$Inject(RegistreerBerichtVerzender,##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.RegistreerBerichtVerzender).%New())
+	Set ..VerzendDataConvertor = $$$Inject(VerzendDataConvertor,##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.VerzendDataConvertor).%New())
+	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="RegisterContainer">
 <FormalSpec>Request:WS.AX.Transport.GLS.v01.dto.RegisterContainerRequest</FormalSpec>
 <ReturnType>WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse</ReturnType>
 <Implementation><![CDATA[
-	#Dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo = ..RegisterContainerRequestConverter.ConverteerNaarLeveringInfo(Request)
-	#Dim Verzendwijze as APPS.TRANSP.GLS.GLSv1.Bericht.enu.VerzendWijze = ..CommunicatieServiceLocator.GeefVerzendWijzeBepaler().GeefVerzendWijze(LeveringInfo)
-	#Dim Dienst as APPS.TRANSP.GLS.GLSv1.enu.Dienst = ..CommunicatieServiceLocator.GeefDienstBepaler.GeefDienst(Verzendwijze)
 	
-	#dim Requests As List Of APPS.TRANSP.GLS.GLSv1.Bericht.dto.Request = ..RequestBouwer.MaakRequests(LeveringInfo,Verzendwijze)
-	set RequestIt = ##class(TECH.ListIterator).%New(Requests)
-	while (RequestIt.HasNext()) {
-		#Dim request = RequestIt.Next()
-		Set ..CurrentT400  = request.T400
-		do ..VerwerkRequest(request)
-	}
+	#Dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo = ..RegisterContainerRequestConvertor.ConverteerNaarLeveringInfo(Request)
+	#Dim VerzendData as WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse
+	
+	Set VerzendData = ..RegistreerBerichtVerzender.VoerUit(LeveringInfo)
+	
+	Quit ..VerzendDataConvertor.ConverteerNaarRegisterContainerResponse(VerzendData)
 ]]></Implementation>
 </Method>
-
-<Method name="VerwerkVerzendDataID">
-<FormalSpec>VerzendDataID:%String</FormalSpec>
-<Implementation><![CDATA[	//opslaan verzenddataid + plus T400
-]]></Implementation>
-</Method>
-
-<Method name="GeefRequestType">
-<Private>1</Private>
-<ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.enu.RequestType</ReturnType>
-<Implementation><![CDATA[	quit ##class(APPS.TRANSP.GLS.GLSv1.Bericht.enu.RequestType).Registratie()
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhTest/Fake/WSimpl/AX/Transport/GLS/v01/RegistrationService/RegistreerBerichtVerzender.cls.xml
===================================================================
diff -u -r40688 -r40697
--- vhTest/Fake/WSimpl/AX/Transport/GLS/v01/RegistrationService/RegistreerBerichtVerzender.cls.xml	(.../RegistreerBerichtVerzender.cls.xml)	(revision 40688)
+++ vhTest/Fake/WSimpl/AX/Transport/GLS/v01/RegistrationService/RegistreerBerichtVerzender.cls.xml	(.../RegistreerBerichtVerzender.cls.xml)	(revision 40697)
@@ -7,21 +7,15 @@
 <ProcedureBlock>1</ProcedureBlock>
 <Super>WSimpl.AX.Transport.GLS.v01.RegistrationService.RegistreerBerichtVerzender</Super>
 
-<Method name="GeefRegistreerBericht">
-<FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
-<ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.dto.Request</ReturnType>
-<Implementation><![CDATA[	Quit ""
-]]></Implementation>
-</Method>
-
 <Method name="VerwerkVerzendDataID">
 <FormalSpec>VerzendDataID:%String</FormalSpec>
-<Implementation><![CDATA[]]></Implementation>
+<Implementation><![CDATA[
+]]></Implementation>
 </Method>
 
 <Method name="VoerUit">
 <FormalSpec>LeveringInfo:APPS.TRANSP.dto.LeveringInfo</FormalSpec>
-<ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response</ReturnType>
+<ReturnType>APPS.TRANSP.GLS.data.VerzendData</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>