Index: AXimpl/RequestComposer.cls.xml
===================================================================
diff -u -r42334 -r48904
--- AXimpl/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 42334)
+++ AXimpl/RequestComposer.cls.xml	(.../RequestComposer.cls.xml)	(revision 48904)
@@ -13,21 +13,40 @@
 <Private>1</Private>
 </Property>
 
-<Property name="RequestGeneratorConfig">
-<Type>AXimpl.RequestGeneratorConfig</Type>
+<Property name="ObjectValidator">
+<Type>AXimpl.ObjectValidator</Type>
 <Private>1</Private>
 </Property>
 
+<Property name="ConfigOut">
+<Type>AXimpl.ConfigOut</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ObjectApi">
+<Type>TECH.Object.ObjectAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ExceptieMelder">
+<Type>AXimpl.RequestComposer.ExceptieMelder</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>MessageManager:AXimpl.MessageManager</FormalSpec>
+<FormalSpec>MessageManager:AXimpl.MessageManager="",ObjectValidator:AXimpl.ObjectValidator="",ConfigOut:AXimpl.ConfigOut="",ObjectApi:TECH.Object.ObjectAPI,ExceptieMelder:AXimpl.RequestComposer.ExceptieMelder=""</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 ..RequestGeneratorConfig = ##class(AXimpl.RequestGeneratorConfig).%New()
+	Set ..FirmaBepaler = ##class(AXimpl.InterneFirmaBepaler).%New()
+	Set ..MessageManager = $$$Inject(MessageManager, ##class(AXimpl.MessageManager).%New())
+	Set ..ObjectValidator = $$$Inject(ObjectValidator, ##class(AXimpl.ObjectValidator).%New())
+	Set ..ConfigOut = $$$Inject(ConfigOut, ##class(AXimpl.ConfigOut).%New())
+	Set ..ObjectApi = $$$Inject(ObjectApi, ##class(TECH.Object.impl.ObjectAPI).%New())
+	Set ..ExceptieMelder = $$$Inject(ExceptieMelder, ##class(AXimpl.RequestComposer.ExceptieMelder).%New())
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -36,12 +55,22 @@
 <FormalSpec>Request:%CacheString</FormalSpec>
 <ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[
-	#dim Envelope As %CacheString = ..RequestGeneratorConfig.GetEnvelope(Request)
-	set Envelope.Header.MessageId = ..MessageManager.GenerateID()
-	set Envelope.Header.Company = ..FirmaBepaler.GeefInitialen()
-	set Envelope.Header.Action = ..RequestGeneratorConfig.GetAction(Request)
-	set Envelope.Body.MessageParts = ..RequestGeneratorConfig.GetConverter(Request).Convert(Request)
-	quit Envelope
+	#dim Envelope As %CacheString = ..ObjectApi.New(..ConfigOut.GetRequestEnvelope(Request))
+	#dim MessageId As %String = ..MessageManager.GenerateID()
+	
+	Set Envelope.Header.MessageId = MessageId
+	Set Envelope.Header.Company = ..FirmaBepaler.GeefInitialen()
+	Set Envelope.Header.Action = ..ConfigOut.GetAction(Request)
+	Set Envelope.Body.MessageParts = ..ConfigOut.GetConverter(Request).Convert(Request,MessageId)
+	
+	Try {
+		Do ..ObjectValidator.Validate(Envelope, "Validatie AX request: " _ Envelope.Header.Action)
+	} Catch {
+		Do ..ExceptieMelder.VerwittigGebruiker(MessageId, Envelope.Header.Action)
+		Do ##class(TECH.ExceptionHandler).Rethrow()
+	}	
+	
+	Quit Envelope
 ]]></Implementation>
 </Method>
 </Class>