Index: vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml
===================================================================
diff -u -r48463 -r48773
--- vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 48463)
+++ vhUnitTest/AXimpl/Generator/Generate/Test.cls.xml	(.../Test.cls.xml)	(revision 48773)
@@ -31,15 +31,16 @@
 	set MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
 	do MessageManager.IndienMethodCall("GenerateID").DanReturn("{12345678-ABCD-EFGH-1234-1234567890AB}")
 	
-	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager)
+	set StubValidator = ##class(vhTest.Mock.AXimpl.ObjectValidator).%New()
+	do StubValidator.IndienMethodCall("Validate",$$$ElkeWaarde).DanDoeNiks()
 	
+	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager,StubValidator)
+	
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 
 	set Generator = ##class(AXimpl.Generator).%New(RequestComposer,,FakeEventRaiser)
 	do Generator.Generate(##class(AXimpl.Request).%New("Customer/Create",KlantId))
 	
-	w !,..GeefBestandLocatie()
-	
 	Do $$$AssertCorrectGemaakteBestanden(..GeefBestandLocatie()_"AIF")
 ]]></Implementation>
 </Method>
@@ -54,7 +55,10 @@
 	set MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
 	do MessageManager.IndienMethodCall("GenerateID").DanReturn("{12345678-ABCD-EFGH-1234-1234567890AB}")
 	
-	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager)
+	set StubValidator = ##class(vhTest.Mock.AXimpl.ObjectValidator).%New()
+	do StubValidator.IndienMethodCall("Validate",$$$ElkeWaarde).DanDoeNiks()
+	
+	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager,StubValidator)
 
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 
@@ -91,7 +95,10 @@
 	set MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
 	do MessageManager.IndienMethodCall("GenerateID").DanReturn("{12345678-ABCD-EFGH-1234-1234567890AB}")
 	
-	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager)
+	set StubValidator = ##class(vhTest.Mock.AXimpl.ObjectValidator).%New()
+	do StubValidator.IndienMethodCall("Validate",$$$ElkeWaarde).DanDoeNiks()
+	
+	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager,StubValidator)
 
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 	
@@ -117,7 +124,10 @@
 	set MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
 	do MessageManager.IndienMethodCall("GenerateID").DanReturn("{12345678-ABCD-EFGH-1234-1234567890AB}")
 
-	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager)
+	set StubValidator = ##class(vhTest.Mock.AXimpl.ObjectValidator).%New()
+	do StubValidator.IndienMethodCall("Validate",$$$ElkeWaarde).DanDoeNiks()
+	
+	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager,StubValidator)
 
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 
@@ -139,7 +149,10 @@
 	set MessageManager = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
 	do MessageManager.IndienMethodCall("GenerateID").DanReturn("{12345678-ABCD-EFGH-1234-1234567890AB}")
 
-	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager)
+	set StubValidator = ##class(vhTest.Mock.AXimpl.ObjectValidator).%New()
+	do StubValidator.IndienMethodCall("Validate",$$$ElkeWaarde).DanDoeNiks()
+	
+	set RequestComposer = ##class(AXimpl.RequestComposer).%New(MessageManager,StubValidator)
 
 	set FakeEventRaiser = ##class(vhTest.Fake.AXimpl.EventRaiser).%New()
 
Index: vhTest/Fake/AXimpl/ObjectValidator.cls.xml
===================================================================
diff -u
--- vhTest/Fake/AXimpl/ObjectValidator.cls.xml	(revision 0)
+++ vhTest/Fake/AXimpl/ObjectValidator.cls.xml	(revision 48773)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.AXimpl.ObjectValidator">
+<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>AXimpl.ObjectValidator</Super>
+
+<Method name="Validate">
+<FormalSpec>Object:AXif.DataTransferObject</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+</Storage>
+</Class>
+
+
+</Export>
Index: vhTest/Mock/AXimpl/ObjectValidator.cls.xml
===================================================================
diff -u
--- vhTest/Mock/AXimpl/ObjectValidator.cls.xml	(revision 0)
+++ vhTest/Mock/AXimpl/ObjectValidator.cls.xml	(revision 48773)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.AXimpl.ObjectValidator">
+<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</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>AXimpl.ObjectValidator,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Validate">
+<FormalSpec>Object:AXif.DataTransferObject</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("Validate",Object)
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DefaultData>ObjectValidatorDefaultData1</DefaultData>
+<Data name="ObjectValidatorDefaultData1">
+<Structure>listnode</Structure>
+<Subscript>"ObjectValidator"</Subscript>
+<Value name="1">
+<Value>FormalSpecParser</Value>
+</Value>
+<Value name="2">
+<Value>MethodCallStubs</Value>
+</Value>
+<Value name="3">
+<Value>IsMethodCallVerwacht</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>
Index: AXimpl/RequestComposer.cls.xml
===================================================================
diff -u -r43016 -r48773
--- AXimpl/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 43016)
+++ AXimpl/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 48773)
@@ -13,20 +13,26 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ObjectValidator">
+<Type>AXimpl.ObjectValidator</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="ConfigOut">
 <Type>AXimpl.ConfigOut</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>MessageManager:AXimpl.MessageManager</FormalSpec>
+<FormalSpec>MessageManager:AXimpl.MessageManager,ObjectValidator:AXimpl.ObjectValidator</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..FirmaBepaler = ##class(AXimpl.InterneFirmaBepaler).%New()
 	set ..MessageManager = $$$Inject(MessageManager,##class(AXimpl.MessageManager).%New())
+	set ..ObjectValidator = $$$Inject(ObjectValidator,##class(AXimpl.ObjectValidator).%New())
 	set ..ConfigOut = ##class(AXimpl.ConfigOut).%New()
 	Quit $$$OK
 ]]></Implementation>
@@ -45,6 +51,8 @@
 	set Envelope.Header.Action = ..ConfigOut.GetAction(Request)
 	set Envelope.Body.MessageParts = ..ConfigOut.GetConverter(Request).Convert(Request,MessageId)
 	
+	do ..ObjectValidator.Validate(Envelope)
+	
 	quit Envelope
 ]]></Implementation>
 </Method>
Index: AXimpl/ObjectValidator.cls.xml
===================================================================
diff -u
--- AXimpl/ObjectValidator.cls.xml	(revision 0)
+++ AXimpl/ObjectValidator.cls.xml	(revision 48773)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.ObjectValidator">
+<ClassType>persistent</ClassType>
+<Super>TECH.Mockable,%Persistent</Super>
+
+<Property name="Object">
+<Type>%Library.SerialObject</Type>
+<Private>1</Private>
+<Parameter name="CLASSNAME" value="1"/>
+</Property>
+
+<Method name="Validate">
+<FormalSpec>Object:AXif.DataTransferObject</FormalSpec>
+<Implementation><![CDATA[
+	set TmpStorage = ..%New()
+	set TmpStorage.Object = Object
+	
+	do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(TmpStorage.%Save())
+	
+	do TmpStorage.%DeleteId(TmpStorage.%Oid())
+]]></Implementation>
+</Method>
+
+<Storage name="Default">
+<Type>%Library.CacheStorage</Type>
+<DataLocation>^AXimpl.ObjectValidatorD</DataLocation>
+<DefaultData>ObjectValidatorDefaultData</DefaultData>
+<IdLocation>^AXimpl.ObjectValidatorD</IdLocation>
+<IndexLocation>^AXimpl.ObjectValidatorI</IndexLocation>
+<StreamLocation>^AXimpl.ObjectValidatorS</StreamLocation>
+<Data name="ObjectValidatorDefaultData">
+<Value name="1">
+<Value>%%CLASSNAME</Value>
+</Value>
+<Value name="2">
+<Value>Object</Value>
+</Value>
+</Data>
+</Storage>
+</Class>
+
+
+</Export>