Index: vhUnitTest/zTryout/LLA/ParseJsonMaatwerkFrameworkRestApi/Test.cls.xml
===================================================================
diff -u -r62002 -r62222
--- vhUnitTest/zTryout/LLA/ParseJsonMaatwerkFrameworkRestApi/Test.cls.xml	(.../Test.cls.xml)	(revision 62002)
+++ vhUnitTest/zTryout/LLA/ParseJsonMaatwerkFrameworkRestApi/Test.cls.xml	(.../Test.cls.xml)	(revision 62222)
@@ -6,8 +6,10 @@
 <Method name="Test JSON GeefProductRestRequest zonder ingegeven kenmerken en productdata">
 <Implementation><![CDATA[
 	#dim JSONString As %String = "{ ""KlantID"":""FieldDOMVKPVanHoeckeKlantIDValue"", ""Aantal"":""FieldIntValue"" }"
+	#dim JSONStream = ##class(%Stream.GlobalBinary).%New()
+	Do JSONStream.Write(JSONString)
 
-	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..Parse(JSONString)
+	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..Parse(JSONStream)
 	do $$$AssertEquals(Object.KlantID,"FieldDOMVKPVanHoeckeKlantIDValue")
 	do $$$AssertEquals(Object.Aantal,"FieldIntValue")
 ]]></Implementation>
@@ -16,8 +18,10 @@
 <Method name="Test JSON GeefProductRestRequest zonder ingegeven kenmerken, met productdata">
 <Implementation><![CDATA[
 	#dim JSONString As %String = "{ ""KlantID"":""FieldDOMVKPVanHoeckeKlantIDValue"", ""Aantal"":""FieldIntValue"", ""ProductData"" : { ""PRNr"":""ProductDataFieldPRNrIntValue1"", ""DossierNummer"":""ProductDataFieldDossierNummerStringValue1"" } }"
+	#dim JSONStream = ##class(%Stream.GlobalBinary).%New()
+	Do JSONStream.Write(JSONString)
 
-	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..Parse(JSONString)
+	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..Parse(JSONStream)
 	do $$$AssertEquals(Object.KlantID,"FieldDOMVKPVanHoeckeKlantIDValue")
 	do $$$AssertEquals(Object.Aantal,"FieldIntValue")
 	do $$$AssertEquals(Object.ProductData.DossierNummer,"ProductDataFieldDossierNummerStringValue1")
@@ -28,8 +32,10 @@
 <Method name="Test JSON GeefProductRestRequest met ingegeven kenmerken zonder ingevulde properties van list type">
 <Implementation><![CDATA[
 	#dim JSONString As %String = "{ ""KlantID"":""FieldDOMVKPVanHoeckeKlantIDValue"", ""Aantal"":""FieldIntValue"", ""ProductData"" : { ""PRNr"":""ProductDataFieldPRNrIntValue1"", ""DossierNummer"":""ProductDataFieldDossierNummerStringValue1"" }, ""IngegevenKenmerken"": { ""ProductieWijze"":""IngegevenKenmerkenFieldVersieNrStringValue"", ""VersieNr"":""IngegevenKenmerkenFieldVersieNrIntValue"" }   }"
+	#dim JSONStream = ##class(%Stream.GlobalBinary).%New()
+	Do JSONStream.Write(JSONString)
 
-	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..Parse(JSONString)
+	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..Parse(JSONStream)
 	do $$$AssertEquals(Object.KlantID,"FieldDOMVKPVanHoeckeKlantIDValue")
 	do $$$AssertEquals(Object.Aantal,"FieldIntValue")
 	do $$$AssertEquals(Object.ProductData.DossierNummer,"ProductDataFieldDossierNummerStringValue1")
@@ -42,8 +48,10 @@
 <Method name="Test JSON GeefProductRestRequest met ingegeven kenmerken zonder ingevulde properties van list type behalve onderdelen (list of string)">
 <Implementation><![CDATA[
 	#dim JSONString As %String = "{ ""KlantID"":""FieldDOMVKPVanHoeckeKlantIDValue"", ""Aantal"":""FieldIntValue"", ""ProductData"" : { ""PRNr"":""ProductDataFieldPRNrIntValue1"", ""DossierNummer"":""ProductDataFieldDossierNummerStringValue1"" }, ""IngegevenKenmerken"": { ""ProductieWijze"":""IngegevenKenmerkenFieldVersieNrStringValue"", ""VersieNr"":""IngegevenKenmerkenFieldVersieNrIntValue"", ""Onderdelen"": [ ""OnderdelenString1"", ""OnderdelenString2"" ] }   }"
+	#dim JSONStream = ##class(%Stream.GlobalBinary).%New()
+	Do JSONStream.Write(JSONString)
 
-	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..Parse(JSONString)
+	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..Parse(JSONStream)
 	do $$$AssertEquals(Object.KlantID,"FieldDOMVKPVanHoeckeKlantIDValue")
 	do $$$AssertEquals(Object.Aantal,"FieldIntValue")
 	do $$$AssertEquals(Object.ProductData.DossierNummer,"ProductDataFieldDossierNummerStringValue1")
@@ -61,8 +69,10 @@
 <Method name="Test JSON GeefProductRestRequest met ingegeven kenmerken met ingevulde properties van list type">
 <Implementation><![CDATA[
 	#dim JSONString As %String = "{ ""KlantID"":""FieldDOMVKPVanHoeckeKlantIDValue"", ""Aantal"":""FieldIntValue"", ""ProductData"" : { ""PRNr"":""ProductDataFieldPRNrIntValue1"", ""DossierNummer"":""ProductDataFieldDossierNummerStringValue1"" }, ""IngegevenKenmerken"": { ""ProductieWijze"":""IngegevenKenmerkenFieldVersieNrStringValue"", ""VersieNr"":""IngegevenKenmerkenFieldVersieNrIntValue"", ""Onderdelen"": [ ""OnderdelenString1"", ""OnderdelenString2"" ] }   }"
+	#dim JSONStream = ##class(%Stream.GlobalBinary).%New()
+	Do JSONStream.Write(JSONString)
 
-	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..Parse(JSONString)
+	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest = ..Parse(JSONStream)
 	do $$$AssertEquals(Object.KlantID,"FieldDOMVKPVanHoeckeKlantIDValue")
 	do $$$AssertEquals(Object.Aantal,"FieldIntValue")
 	do $$$AssertEquals(Object.ProductData.DossierNummer,"ProductDataFieldDossierNummerStringValue1")
@@ -78,12 +88,13 @@
 </Method>
 
 <Method name="Parse">
-<FormalSpec>JSONString:%String</FormalSpec>
+<FormalSpec>JSONStream:%Stream</FormalSpec>
 <ReturnType>vhUnitTest.TECH.JSON.Parser.ParseJSON.Main</ReturnType>
 <Implementation><![CDATA[
 	#dim ObjectClassName As %String = ##class(zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest).%ClassName(1)
 	#dim Object As zTryout.LLA.RestAPI.ParseJsonObject.GeefProductRestRequest
-	do ##class(TECH.JSON.Parser).ParseJSON(JSONString,ObjectClassName,.Object)
+	Do JSONStream.Rewind()
+	Do ##class(TECH.JSON.Parser).ParseJSON(JSONStream,ObjectClassName,.Object)
 	quit Object
 ]]></Implementation>
 </Method>