Index: WSimpl/PM/Maatwerk/MaatwerkService/DotNet/GeefMaatwerkDetails.cls.xml
===================================================================
diff -u -r62962 -r63041
--- WSimpl/PM/Maatwerk/MaatwerkService/DotNet/GeefMaatwerkDetails.cls.xml	(.../GeefMaatwerkDetails.cls.xml)	(revision 62962)
+++ WSimpl/PM/Maatwerk/MaatwerkService/DotNet/GeefMaatwerkDetails.cls.xml	(.../GeefMaatwerkDetails.cls.xml)	(revision 63041)
@@ -11,35 +11,23 @@
 	Set Logger = ##class(vhLib.Logger).%New("BOMBOL DotNet")
 	
 	Try {
-		#dim KenmerkenString As %String
-		#dim input As WSimpl.PM.Maatwerk.MaatwerkService.DotNet.GeefMaatwerkDetails.ProductRestRequest = ##class(WSimpl.PM.Maatwerk.MaatwerkService.DotNet.GeefMaatwerkDetails.ProductRestRequest).%New()
-		Set IngegevenKenmerken.VersieNr = 0
-		
-		Set input.Aantal = Aantal
-		Set input.IngegevenKenmerken = IngegevenKenmerken
-		Set input.KlantID = $P(KlantID,"||",2)
-		Set input.ProductData = ProductData
-
-		Set KenmerkenString = ..ObjectToJson(input)
+		#dim ProductRestRequest As WSimpl.PM.Maatwerk.MaatwerkService.DotNet.GeefMaatwerkDetails.ProductRestRequest = ..GeefProductRestRequest(IngegevenKenmerken, KlantID, Aantal, ProductData)
+		#dim KenmerkenString As %String = ..ObjectToJson(ProductRestRequest)
 		#dim JSONStream = ##class(%Stream.GlobalBinary).%New()
+		
 		Do JSONStream.Write(KenmerkenString)
+		
 		Do Logger.Info("BOMBOL DotNet request", JSONStream)
 		
-	 	Set HttpRequest = ##class(%Net.HttpRequest).%New()
-	 	Set HttpRequest.Server = ..GeefDotNetServerNaam()
-	 	Set HttpRequest.ContentType = "application/json"
-	 	Set HttpRequest.ContentEncoding = "UTF-8"
-	 	Set HttpRequest.Port = 443
-	 	Set HttpRequest.SSLConfiguration = "DotNet_MaatwerkCalculator"
-    	Set HttpRequest.Https = 1
+	 	#dim HttpRequest As %Net.HttpRequest = ..GeefHttpsRequest()
     	Do HttpRequest.EntityBody.CopyFrom(JSONStream)
     	
 	    #dim StatusCode As %Status = HttpRequest.Get("/api/Maatwerk",0)	    
 	    #dim bombol As %Stream.GlobalBinary = HttpRequest.HttpResponse.Data
+	    
 	    Do Logger.Info("BOMBOL DotNet response", bombol)
 	    
-		;Set MaatwerkDetails = ..Parse(bombol)
-		Set MaatwerkDetails = ..ParseNEW(bombol)
+		Set MaatwerkDetails = ..Parse(bombol)
 	} Catch {
 		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Do Logger.ErrorMail("BOMBOL via DotNet niet gelukt. HttpResponse Statuscode: "_HttpRequest.HttpResponse.StatusCode)
@@ -50,7 +38,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ParseNEW">
+<Method name="Parse">
 <FormalSpec>JSONStream:%Stream</FormalSpec>
 <Private>1</Private>
 <ReturnType>APPS.PM.Maatwerk.dto.DotNet.MaatwerkDetailsParsedFromJson</ReturnType>
@@ -60,23 +48,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Parse">
-<Description>
-DEPRECATED : want Return type "APPS.PM.Maatwerk.dto.MaatwerkDetails" is niet compatibel met de verdere verwerking van de HalffabItemsBoom en KostItems. </Description>
-<FormalSpec>JSONStream:%Stream</FormalSpec>
-<Private>1</Private>
-<ReturnType>APPS.PM.Maatwerk.dto.MaatwerkDetails</ReturnType>
-<Implementation><![CDATA[
-	#dim ObjectClassName As %String = ##class(APPS.PM.Maatwerk.dto.MaatwerkDetails).%ClassName(1)
-	#dim Object As APPS.PM.Maatwerk.dto.MaatwerkDetails
-	
-	Do JSONStream.Rewind()
-	Do ##class(TECH.JSON.Parser).ParseJSON(JSONStream,ObjectClassName,.Object)
-	
-	Quit Object
-]]></Implementation>
-</Method>
-
 <Method name="ObjectToJson">
 <FormalSpec>GeefProductRestRequest:WSimpl.PM.Maatwerk.MaatwerkService.DotNet.GeefMaatwerkDetails.ProductRestRequest</FormalSpec>
 <ReturnType>%String</ReturnType>
@@ -88,6 +59,39 @@
 	Quit OutputJsonString
 ]]></Implementation>
 </Method>
+
+<Method name="GeefHttpsRequest">
+<Private>1</Private>
+<ReturnType>%Net.HttpRequest</ReturnType>
+<Implementation><![CDATA[
+	Set HttpRequest = ##class(%Net.HttpRequest).%New()
+ 	Set HttpRequest.Server = ..GeefDotNetServerNaam()
+ 	Set HttpRequest.ContentType = "application/json"
+ 	Set HttpRequest.ContentEncoding = "UTF-8"
+ 	Set HttpRequest.Port = 443
+ 	Set HttpRequest.SSLConfiguration = "DotNet_MaatwerkCalculator"
+	Set HttpRequest.Https = 1
+    	
+	Quit HttpRequest
+]]></Implementation>
+</Method>
+
+<Method name="GeefProductRestRequest">
+<FormalSpec>IngegevenKenmerken:DOM.PM.Maatwerk.Calc.Common.IngegevenKenmerken,KlantID:DOM.VKP.VanHoeckeKlantID,Aantal:%Integer,ProductData:DOM.PM.dto.ProductData=""</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Net.HttpRequest</ReturnType>
+<Implementation><![CDATA[
+	#dim Request As WSimpl.PM.Maatwerk.MaatwerkService.DotNet.GeefMaatwerkDetails.ProductRestRequest = ##class(WSimpl.PM.Maatwerk.MaatwerkService.DotNet.GeefMaatwerkDetails.ProductRestRequest).%New()
+	Set IngegevenKenmerken.VersieNr = 0
+	
+	Set Request.Aantal = Aantal
+	Set Request.IngegevenKenmerken = IngegevenKenmerken
+	Set Request.KlantID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantNummerVoorPartijID(KlantID)
+	Set Request.ProductData = ProductData
+    	
+	Quit Request
+]]></Implementation>
+</Method>
 </Class>