Index: WS/PM/ProductService.cls.xml
===================================================================
diff -u -r2156 -r2202
--- WS/PM/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 2156)
+++ WS/PM/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 2202)
@@ -22,16 +22,8 @@
 <ReturnType>APPS.PM.dto.ProductIDsControleResult</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	$$$TECHErrorTrapOn
-	$$$chkRequiredParameter(Criteria)
-	$$$chkIsObject(Criteria)
-	
-	Do ##class(TECH.ClassUtils).ValueIsValid(Criteria,"APPS.PM.dto.ZoekCriteria")
-
-	Set Result = ##class(APPS.PM.ProductService).%New().ZoekProducten(Criteria)
-
-	$$$TECHErrorTrapOff
-	Quit Result
+	Do ..ControleerParameters()	
+	Quit ##class(APPS.PM.ProductService).%New().ZoekProducten(Criteria)
 ]]></Implementation>
 </Method>
 
@@ -41,10 +33,8 @@
 <ReturnType>APPS.PM.dto.Classificatie</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	$$$TECHErrorTrapOn
-	Set Result = ##class(APPS.PM.ProductService).%New().GeefClassificatieStructuur()
-	$$$TECHErrorTrapOff
-	Quit Result
+	Do ..ControleerParameters()	
+	Quit ##class(APPS.PM.ProductService).%New().GeefClassificatieStructuur()
 ]]></Implementation>
 </Method>
 
@@ -53,12 +43,8 @@
 <ReturnType>APPS.PM.dto.ProductIDsControleResult</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	$$$TECHErrorTrapOn
-	$$$chkRequiredParameter(PRNrs)
-	$$$chkIsObject(PRNrs)
-	Set Result = ##class(APPS.PM.ProductService).%New().ControleerPRNrs(PRNrs)
-	$$$TECHErrorTrapOff
-	Quit Result
+	Do ..ControleerParameters()	
+	Quit ##class(APPS.PM.ProductService).%New().ControleerPRNrs(PRNrs)
 ]]></Implementation>
 </Method>
 
@@ -67,12 +53,8 @@
 <ReturnType>APPS.PM.dto.ProductIDsControleResult</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	$$$TECHErrorTrapOn
-	$$$chkRequiredParameter(Kortteksten)
-	$$$chkIsObject(Kortteksten)
-	Set Result = ##class(APPS.PM.ProductService).%New().ControleerKortteksten(Kortteksten)
-	$$$TECHErrorTrapOff
-	Quit Result
+	Do ..ControleerParameters()	
+	Quit ##class(APPS.PM.ProductService).%New().ControleerKortteksten(Kortteksten)
 ]]></Implementation>
 </Method>
 
@@ -81,12 +63,8 @@
 <ReturnType>APPS.PM.dto.ProductIDsControleResult</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	$$$TECHErrorTrapOn
-	$$$chkRequiredParameter(Dossiernrs)
-	$$$chkIsObject(Dossiernrs)
-	Set Result = ##class(APPS.PM.ProductService).%New().ControleerDossierNrs(Dossiernrs)
-	$$$TECHErrorTrapOff
-	Quit Result
+	Do ..ControleerParameters()	
+	Quit ##class(APPS.PM.ProductService).%New().ControleerDossierNrs(Dossiernrs)
 ]]></Implementation>
 </Method>
 
@@ -95,12 +73,8 @@
 <ReturnType>APPS.PM.dto.ProductIDsControleResult</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	$$$TECHErrorTrapOn
-	$$$chkRequiredParameter(Identnrs)
-	$$$chkIsObject(Identnrs)
-	Set Result = ##class(APPS.PM.ProductService).%New().ControleerIdentNrs(Identnrs)
-	$$$TECHErrorTrapOff
-	Quit Result
+	Do ..ControleerParameters()	
+	Quit ##class(APPS.PM.ProductService).%New().ControleerIdentNrs(Identnrs)
 ]]></Implementation>
 </Method>
 </Class>
Index: WS/Info/Agenda.cls.xml
===================================================================
diff -u -r1417 -r2202
--- WS/Info/Agenda.cls.xml	(.../Agenda.cls.xml)	(revision 1417)
+++ WS/Info/Agenda.cls.xml	(.../Agenda.cls.xml)	(revision 2202)
@@ -23,15 +23,13 @@
 <Method name="IsArbeidsdag">
 <Description>
 Nagaan of de opgegeven dat een arbeidsdag is
-s o=##class(WS.Info.Agenda).IsArbeidsdag($h)</Description>
-<ClassMethod>1</ClassMethod>
+s o=##class(WS.Info.Agenda).%New().IsArbeidsdag($h)</Description>
 <FormalSpec>Date:%Date</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	$$$TECHErrorTrapOn
+	Do ..ControleerParameters()
 	Set IsArbeidsdag = $$ISARBDAG^vhRtn2(Date)
-	$$$TECHErrorTrapOff
 	Quit IsArbeidsdag
 ]]></Implementation>
 </Method>
Index: WS/WebService.cls.xml
===================================================================
diff -u -r2172 -r2202
--- WS/WebService.cls.xml	(.../WebService.cls.xml)	(revision 2172)
+++ WS/WebService.cls.xml	(.../WebService.cls.xml)	(revision 2202)
@@ -53,5 +53,38 @@
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="ControleerParameters">
+<Description>
+Controleer van de webmethod zijn parameters adhv een deep-validation uit te voeren.
+Oproepen via 'Do ..ControleerParameters()'
+Smijt een Exception als validatie niet gelukt is. </Description>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set CallingMethod = ##class(TECH.ClassUtils).GetCallingMethod()
+	Set ClassName = $LI(CallingMethod,1)	
+	Set MethodName = $LI(CallingMethod,2)
+	
+	/// Aflopen van parameters
+	Set Class = ##class(TECH.ClassInfo.ClassDefinition).%New(ClassName)
+	If ($IsObject(Class)){
+		Set Method = Class.GeefMethod(MethodName)
+		If ($IsObject(Method)){
+			Set ParameterIt = Method.GeefParameters()
+			While (ParameterIt.HasNext()){
+				Set Parameter = ParameterIt.Next()
+				/// Valideren van parameters
+				Set ParameterName = Parameter.GeefNaam()
+				/// Required 
+				If ('$length($get(@ParameterName))) {
+					Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Parameter '"_ParameterName_"' is required voor '"_ClassName_"."_MethodName_"(..)'"))			
+				}								
+				/// Deep validate 
+				Do ##class(TECH.ClassUtils).ValueIsValid(@ParameterName,Parameter.GeefType())						
+			}			
+		}
+	}
+]]></Implementation>
+</Method>
 </Class>
 </Export>
Index: TECH/ClassInfo/ClassDefinition.cls.xml
===================================================================
diff -u -r1520 -r2202
--- TECH/ClassInfo/ClassDefinition.cls.xml	(.../ClassDefinition.cls.xml)	(revision 1520)
+++ TECH/ClassInfo/ClassDefinition.cls.xml	(.../ClassDefinition.cls.xml)	(revision 2202)
@@ -100,6 +100,22 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefMethod">
+<FormalSpec>MethodName:%String</FormalSpec>
+<ReturnType>TECH.ClassInfo.MethodDefinition</ReturnType>
+<Implementation><![CDATA[
+	Set Method = ""	
+	Set MethodIt = ..GeefMethods()
+	While ('$IsObject(Method) & MethodIt.HasNext()){
+		Set CurrentMethod = MethodIt.Next()
+		If (CurrentMethod.GeefNaam() = MethodName){
+			Set Method = CurrentMethod	
+		}
+	}
+	Quit Method
+]]></Implementation>
+</Method>
+
 <Method name="GeefMethods">
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[
Index: APPS/PM/OL/ProductKenmerken.cls.xml
===================================================================
diff -u -r1775 -r2202
--- APPS/PM/OL/ProductKenmerken.cls.xml	(.../ProductKenmerken.cls.xml)	(revision 1775)
+++ APPS/PM/OL/ProductKenmerken.cls.xml	(.../ProductKenmerken.cls.xml)	(revision 2202)
@@ -351,7 +351,6 @@
 		
 		Set lbExcludePRNrs=$LB(..PRNr)
 		Set PotentieleVarianten=..KortTekstPatroon.ZoekMatches(..KortTekst,..VariabeleKenmerken,lbExcludePRNrs)
-		d WLIP^vhDBG(127,"PotentieleVarianten aantal : "_PotentieleVarianten.Count())
 		Quit:(PotentieleVarianten.Count()=0) Varianten   // $$$ERROR($$$GeneralError,"Geen varianten gevonden voor deze master ("_..UnID_" "_..KortTekst_"  #KT="_(0)_")")     ; Master voor 0 producten 
 		
 		Set sc=$$$OK
@@ -362,7 +361,6 @@
 			Quit:(i="")                 ; Exit FOR 
 			If PotVariant.IsVariant(..VariabeleKenmerken) {
 				// Kenmerken omzetten naar de variant  en bewaren 
-				d WLIP^vhDBG(127,"Status Bewaard voor Variant (PRNr:"_PotVariant.PRNr_") "_PotVariant.KortTekst_" = "_$S($$$ISOK(sc):"OK", 1:$$ParseStatus^vhLib(sc))_"")
 				Do Varianten.Insert(PotVariant.PRNr)
 				Set CntVarianten=CntVarianten+1
 				Quit:($$$ISERR(sc))     ; Exit FOR 
@@ -390,7 +388,6 @@
 		Set VariantObject = ##class(APPS.PM.OL.KortTekstPatroon).%New().CreatePatroonMatch(VariantPRNr,..VariabeleKenmerken)
 		
 		Set sc=..BewaarKenmerkenVanVariant(ImportLog,VariantObject)
-		d WLIP^vhDBG(127,"Status Bewaard voor Variant (PRNr:"_VariantPRNr_") "_VariantObject.KortTekst_" = "_$S($$$ISOK(sc):"OK", 1:$$ParseStatus^vhLib(sc))_"")
 	}
 	Set:(Varianten.Count()=0) sc=$$$ERROR($$$GeneralError,"Geen varianten gevonden voor deze master ("_..UnID_" "_..KortTekst_"  #KT="_Varianten.Count()_")")
 	Quit sc
Index: WS/PM/KenmerkenService.cls.xml
===================================================================
diff -u -r2197 -r2202
--- WS/PM/KenmerkenService.cls.xml	(.../KenmerkenService.cls.xml)	(revision 2197)
+++ WS/PM/KenmerkenService.cls.xml	(.../KenmerkenService.cls.xml)	(revision 2202)
@@ -27,13 +27,9 @@
 <ReturnType>APPS.PM.dto.Kenm.AutoVariantenVanMasters</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	$$$TECHErrorTrapOn
-	$$$chkRequiredParameter(KenmerkenSetIDs)
-	$$$chkRequiredParameter(KenmerkGroep)
-	Do ##class(TECH.ClassUtils).ValueIsValid(KenmerkenSetIDs,"APPS.PM.dto.Kenm.KenmerkenSetIDs")	
-	Set Result = ##class(APPS.PM.KenmerkenService).%New().GeefAutoVariantenVanMasters(KenmerkenSetIDs, KenmerkGroep)
-	$$$TECHErrorTrapOff
-	Quit Result
+	
+	Do ..ControleerParameters()
+	Quit ##class(APPS.PM.KenmerkenService).%New().GeefAutoVariantenVanMasters(KenmerkenSetIDs, KenmerkGroep)
 ]]></Implementation>
 </Method>
 
@@ -46,31 +42,21 @@
 <ReturnType>APPS.PM.dto.Kenm.ProductenKenmerken</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	$$$TECHErrorTrapOn
-	$$$chkRequiredParameter(PRNrs)
-	$$$chkIsObject(PRNrs)
-	
-	Set Result = ##class(APPS.PM.KenmerkenService).%New().GeefProductKenmerken(PRNrs,KenmerkGroepen)
-	$$$TECHErrorTrapOff
-	quit Result
+	Do ..ControleerParameters()
+	Quit ##class(APPS.PM.KenmerkenService).%New().GeefProductKenmerken(PRNrs,KenmerkGroepen)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefMetadata">
 <Description>
  Zoek metadata aan de hand van de opgegeven kenmerkengroepen.
  KenmerkGroepen = lijst van strings</Description>
-<ClassMethod>1</ClassMethod>
 <FormalSpec>KenmerkGroepen:%ListOfDataTypes</FormalSpec>
 <ReturnType>APPS.PM.dto.Kenm.KenmerkMetadataList</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	$$$TECHErrorTrapOn
-	$$$chkRequiredParameter(KenmerkGroepen)
-	$$$chkIsObject(KenmerkGroepen)
-	Set Result = ##class(APPS.PM.KenmerkenService).%New().GeefMetadata(KenmerkGroepen)
-	$$$TECHErrorTrapOff
-	quit Result
+	Do ..ControleerParameters()
+	Quit ##class(APPS.PM.KenmerkenService).%New().GeefMetadata(KenmerkGroepen)
 ]]></Implementation>
 </Method>
 
@@ -80,75 +66,42 @@
 <FormalSpec>KenmerkGroepMetadataLijst:APPS.PM.dto.Kenm.KenmerkMetadataList</FormalSpec>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	$$$TECHErrorTrapOn
-	$$$chkRequiredParameter(KenmerkGroepMetadataLijst)
-	$$$chkIsObject(KenmerkGroepMetadataLijst)
-
-	Do ##class(TECH.ClassUtils).ValueIsValid(KenmerkGroepMetadataLijst,"APPS.PM.dto.Kenm.KenmerkMetadataList")
-	
+	Do ..ControleerParameters()	
 	Do ##class(APPS.PM.KenmerkenService).%New().BewaarKenmerkGroepMetadataLijst(KenmerkGroepMetadataLijst)
-	
-	$$$TECHErrorTrapOff
 ]]></Implementation>
 </Method>
 
 <Method name="BewaarProductenKenmerken">
 <Description>
 De opgegeven ProductenKenmerken bewaren</Description>
-<ClassMethod>1</ClassMethod>
 <FormalSpec>ProductenKenmerken:APPS.PM.dto.Kenm.ProductenKenmerken</FormalSpec>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	$$$TECHErrorTrapOn
-	$$$chkRequiredParameter(ProductenKenmerken)
-	$$$chkIsObject(ProductenKenmerken)
-	
-	Do ##class(TECH.ClassUtils).ValueIsValid(ProductenKenmerken,"APPS.PM.dto.Kenm.ProductenKenmerken")	
-	
+	Do ..ControleerParameters()	
 	Do ##class(APPS.PM.KenmerkenService).%New().BewaarProductenKenmerken(ProductenKenmerken)
-	
-	$$$TECHErrorTrapOff
 ]]></Implementation>
 </Method>
 
 <Method name="MaakNieuweKenmerkenSets">
 <Description>
 Maak nieuwe kenmerkenset voor de opgegeven KenmerkenSets
 Returned lijst met gewijzigde PRNr's</Description>
-<ClassMethod>1</ClassMethod>
 <FormalSpec>KenmerkGroep:%String,BronKenmerkenSets:APPS.PM.dto.Kenm.KenmerkenSetIDs</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	$$$TECHErrorTrapOn
-	$$$chkRequiredParameter(KenmerkGroep)
-	$$$chkRequiredParameter(BronKenmerkenSets)
-	$$$chkIsObject(BronKenmerkenSets)
-	
-	Do ##class(TECH.ClassUtils).ValueIsValid(BronKenmerkenSets,"APPS.PM.dto.Kenm.KenmerkenSetIDs")	
-	
-	set Result = ##class(APPS.PM.KenmerkenService).%New().MaakNieuweKenmerkenSets(KenmerkGroep, BronKenmerkenSets)
-	$$$TECHErrorTrapOff
-	quit Result
+	Do ..ControleerParameters()	
+	Quit ##class(APPS.PM.KenmerkenService).%New().MaakNieuweKenmerkenSets(KenmerkGroep, BronKenmerkenSets)
 ]]></Implementation>
 </Method>
 
 <Method name="VerwijderKenmerkenSets">
-<ClassMethod>1</ClassMethod>
 <FormalSpec>KenmerkGroep:%String,KenmerkenSets:APPS.PM.dto.Kenm.KenmerkenSetIDs</FormalSpec>
 <ReturnType>%ListOfDataTypes</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	$$$TECHErrorTrapOn
-	$$$chkRequiredParameter(KenmerkGroep)
-	$$$chkRequiredParameter(KenmerkenSets)
-	$$$chkIsObject(KenmerkenSets)
-	
-	Do ##class(TECH.ClassUtils).ValueIsValid(KenmerkenSets,"APPS.PM.dto.Kenm.KenmerkenSetIDs")	
-	
-	set Result = ##class(APPS.PM.KenmerkenService).%New().VerwijderKenmerkenSets(KenmerkGroep, KenmerkenSets)
-	$$$TECHErrorTrapOff
-	quit Result
+	Do ..ControleerParameters()
+	Quit ##class(APPS.PM.KenmerkenService).%New().VerwijderKenmerkenSets(KenmerkGroep, KenmerkenSets)
 ]]></Implementation>
 </Method>
 </Class>
Index: TECH/ClassUtils.cls.xml
===================================================================
diff -u -r2194 -r2202
--- TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 2194)
+++ TECH/ClassUtils.cls.xml	(.../ClassUtils.cls.xml)	(revision 2202)
@@ -141,6 +141,8 @@
 	while itProperties.HasNext() {
 		set Property = itProperties.Next()
 		continue:Property.Calculated
+		continue:Property.Private
+		continue:Property.MultiDimensional
 		set PropertyValue = $zobjProperty(Object,Property.Name)
 		if (Property.Collection || (Property.Collection = "list") || (Property.Collection = "array")) {
 			If (Property.Collection = "array"){
@@ -159,7 +161,7 @@
 			If ('result){
 				Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Validatie van  '"_Property.%ClassName(1)_"' is niet correct. (Waarde: '"_PropertyValue_"' is niet correct, Type: '"_Property.Type_"'"))		
 			}
-		}
+		}		
 	}
 	quit
 ]]></Implementation>