Index: vhTest/Fake/DOM/VKP/impl/KlantDataFactory.cls.xml
===================================================================
diff -u -r35972 -r35990
--- vhTest/Fake/DOM/VKP/impl/KlantDataFactory.cls.xml	(.../APPS/VKP/impl/KlantDataFactory.cls.xml)	(revision 35972)
+++ vhTest/Fake/DOM/VKP/impl/KlantDataFactory.cls.xml	(.../DOM/VKP/impl/KlantDataFactory.cls.xml)	(revision 35990)
@@ -1,66 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
-<Class name="vhTest.Fake.APPS.VKP.impl.KlantDataFactory">
+<Class name="vhTest.Fake.DOM.VKP.impl.KlantDataFactory">
 <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>APPS.VKP.impl.KlantDataFactory</Super>
+<Super>DOM.VKP.impl.KlantDataFactory</Super>
 
-<Method name="MaakKlantData">
-<FormalSpec>Personality:DOM.common.Personality</FormalSpec>
+<Method name="Maak">
+<FormalSpec>PersonalityEnum:DOM.common.enu.Personality</FormalSpec>
 <ReturnType>DOM.VKP.impl.KlantData</ReturnType>
 <Implementation><![CDATA[	Quit ""
 ]]></Implementation>
 </Method>
-
-<Method name="VerwerkDaro">
-<FormalSpec>DaroPersonality:DOM.common.DaroPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkDestil">
-<FormalSpec>DestilPersonality:DOM.common.DestilPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkDupont">
-<FormalSpec>DupontPersonality:DOM.common.DupontPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkHaefeleBE">
-<FormalSpec>HaefeleBEPersonality:DOM.common.HaefeleBEPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkHein">
-<FormalSpec>HeinPersonality:DOM.common.HeinPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkKisch">
-<FormalSpec>KischPersonality:DOM.common.KischPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkSFS">
-<FormalSpec>SFSPersonality:DOM.common.SFSPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
-</Method>
-
-<Method name="VerwerkVanRaemdonck">
-<FormalSpec>VanRaemdonckPersonality:DOM.common.VanRaemdonckPersonality</FormalSpec>
-<Implementation><![CDATA[
-]]></Implementation>
-</Method>
 </Class>
 
 
FishEye: Tag 35990 refers to a dead (removed) revision in file `vhTest/Mock/APPS/VKP/impl/KlantDataFactory.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: APPS/VKP/impl/KlantDataBewaarder.cls.xml
===================================================================
diff -u -r35977 -r35990
--- APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 35977)
+++ APPS/VKP/impl/KlantDataBewaarder.cls.xml	(.../KlantDataBewaarder.cls.xml)	(revision 35990)
@@ -24,20 +24,20 @@
 </Property>
 
 <Property name="KlantDataFactory">
-<Type>APPS.VKP.impl.KlantDataFactory</Type>
+<Type>DOM.VKP.impl.KlantDataFactory</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>KlantIdValidator:APPS.CRM.impl.KlantIDValidator="",KlantDataRepository:DOM.VKP.impl.KlantDataRepository="",KlantDataFactory:APPS.VKP.impl.KlantDataFactory=""</FormalSpec>
+<FormalSpec>KlantIdValidator:APPS.CRM.impl.KlantIDValidator="",KlantDataRepository:DOM.VKP.impl.KlantDataRepository="",KlantDataFactory:DOM.VKP.impl.KlantDataFactory=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..KlantIdValidator = $$$Inject(KlantIdValidator, ##class(APPS.CRM.impl.KlantIDValidator).%New())
 	Set ..KlantDataRepository = $$$Inject(KlantDataRepository, ##class(DOM.VKP.impl.KlantDataRepository).%New())
-	Set ..KlantDataFactory = $$$Inject(KlantDataFactory, ##class(APPS.VKP.impl.KlantDataFactory).%New())
+	Set ..KlantDataFactory = $$$Inject(KlantDataFactory, ##class(DOM.VKP.impl.KlantDataFactory).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -154,9 +154,9 @@
 	#dim KlantData As DOM.VKP.impl.KlantData
 	
 	If (..KlantDataRepository.BestaatViaID(KlantId)) {
-		Set KlantData = ..KlantDataRepository.GeefViaID(KlantId)	
+		Set KlantData = ..KlantDataRepository.GeefViaID(KlantId)
 	} Else {
-		Set KlantData = ..KlantDataFactory.MaakKlantData(Personality)
+		Set KlantData = ..KlantDataFactory.Maak(Personality.GeefID())
 	}
 	
 	Quit KlantData
FishEye: Tag 35990 refers to a dead (removed) revision in file `vhTest/Fake/APPS/VKP/impl/KlantDataFactory.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: vhUnitTest/APPS/VKP/impl/KlantDataBewaarder/Test.cls.xml
===================================================================
diff -u -r35977 -r35990
--- vhUnitTest/APPS/VKP/impl/KlantDataBewaarder/Test.cls.xml	(.../Test.cls.xml)	(revision 35977)
+++ vhUnitTest/APPS/VKP/impl/KlantDataBewaarder/Test.cls.xml	(.../Test.cls.xml)	(revision 35990)
@@ -4,42 +4,42 @@
 <Super>vhUnitTest.TestCase</Super>
 
 <Property name="DummyKlantDataFactory">
-<Type>APPS.VKP.impl.KlantDataFactory</Type>
+<Type>DOM.VKP.impl.KlantDataFactory</Type>
 <Private>1</Private>
 </Property>
 
 <Method name="OnBeforeAllTests">
 <Implementation><![CDATA[
 	Do ##super()
 	
-	Set ..DummyKlantDataFactory = ##class(APPS.VKP.impl.KlantDataFactory).%New()
+	Set ..DummyKlantDataFactory = ##class(DOM.VKP.impl.KlantDataFactory).%New()
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Geldige HandelKlantData voor Personalities Destil en Dupont wordt bewaard">
 <Implementation><![CDATA[
 	#dim HandelKlantDataDto As DOM.common.dto.HandelKlantData = ##class(DOM.common.dto.HandelKlantData).%New()
 	
-	Do ..AssertBewaarOpgeroepen(##class(DOM.common.DestilPersonality).Instance(), HandelKlantDataDto)
-	Do ..AssertBewaarOpgeroepen(##class(DOM.common.DupontPersonality).Instance(), HandelKlantDataDto)
+	Do ..AssertBewaarOpgeroepen(##class(DOM.common.enu.Personality).Destil(), HandelKlantDataDto)
+	Do ..AssertBewaarOpgeroepen(##class(DOM.common.enu.Personality).Dupont(), HandelKlantDataDto)
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Geldige KlantData voor Personalities SFS, HaefeleBE en Hein wordt bewaard">
 <Implementation><![CDATA[
 	#dim KlantDataDto As DOM.common.dto.KlantData = ##class(DOM.common.dto.KlantData).%New()
 	
-	Do ..AssertBewaarOpgeroepen(##class(DOM.common.SFSPersonality).Instance(), KlantDataDto)
-	Do ..AssertBewaarOpgeroepen(##class(DOM.common.HaefeleBEPersonality).Instance(), KlantDataDto)
-	Do ..AssertBewaarOpgeroepen(##class(DOM.common.HeinPersonality).Instance(), KlantDataDto)
+	Do ..AssertBewaarOpgeroepen(##class(DOM.common.enu.Personality).SFS(), KlantDataDto)
+	Do ..AssertBewaarOpgeroepen(##class(DOM.common.enu.Personality).HaefeleBE(), KlantDataDto)
+	Do ..AssertBewaarOpgeroepen(##class(DOM.common.enu.Personality).Hein(), KlantDataDto)
 ]]></Implementation>
 </Method>
 
 <Method name="Test: Geldige KlantData met email voor Personalities VanRaemdonck, Kisch en Daro wordt bewaard">
 <Implementation><![CDATA[
-	Do ..AssertBewaarOpgeroepen(##class(DOM.common.VanRaemdonckPersonality).Instance(), ##class(DOM.common.dto.VanRaemdonckKlantData).%New())
-	Do ..AssertBewaarOpgeroepen(##class(DOM.common.KischPersonality).Instance(), ##class(DOM.common.dto.KischKlantData).%New())
-	Do ..AssertBewaarOpgeroepen(##class(DOM.common.DaroPersonality).Instance(), ##class(DOM.common.dto.DaroKlantData).%New())
+	Do ..AssertBewaarOpgeroepen(##class(DOM.common.enu.Personality).VanRaemdonck(), ##class(DOM.common.dto.VanRaemdonckKlantData).%New())
+	Do ..AssertBewaarOpgeroepen(##class(DOM.common.enu.Personality).Kisch(), ##class(DOM.common.dto.KischKlantData).%New())
+	Do ..AssertBewaarOpgeroepen(##class(DOM.common.enu.Personality).Daro(), ##class(DOM.common.dto.DaroKlantData).%New())
 ]]></Implementation>
 </Method>
 
@@ -52,31 +52,33 @@
 
 <Method name="Test: KlantDataFactory wordt opgeroepen indien onbestaande KlantData">
 <Implementation><![CDATA[
-	#dim RandomPersonality As DOM.common.Personality = ##class(DOM.common.DestilPersonality).Instance()
+	#dim RandomPersonalityEnum As DOM.common.enu.Personality = ##class(DOM.common.enu.Personality).Destil()
+	#dim Personality As DOM.common.Personality = ##class(DOM.common.impl.Personality).OpenId(RandomPersonalityEnum)
 	#dim RandomKlantData As DOM.VKP.impl.KlantData = ##class(DOM.VKP.impl.DestilKlantData).%New()
 	
 	#dim KlantIdValidatorStub As vhTest.Mock.APPS.CRM.KlantIDValidator = ##class(vhTest.Mock.APPS.CRM.KlantIDValidator).%New()
-	Do KlantIdValidatorStub.IndienMethodCall("Valideer", $$$ElkeWaarde, RandomPersonality)
+	Do KlantIdValidatorStub.IndienMethodCall("Valideer", $$$ElkeWaarde, Personality)
 
 	#dim KlantDataRepositoryStub As vhTest.Mock.DOM.VKP.impl.KlantDataRepository = ##class(vhTest.Mock.DOM.VKP.impl.KlantDataRepository).%New()
 	Do KlantDataRepositoryStub.IndienMethodCall("BestaatViaID", $$$ElkeWaarde).DanReturn($$$False)
 	Do KlantDataRepositoryStub.IndienMethodCall("Bewaar", RandomKlantData)
 	
 	#dim KlantDataFactoryMock As vhTest.Mock.APPS.VKP.impl.KlantDataFactory = ##class(vhTest.Mock.APPS.VKP.impl.KlantDataFactory).%New()
-	Do KlantDataFactoryMock.VerwachtMethodCall("MaakKlantData", RandomPersonality).DanReturn(RandomKlantData)
+	Do KlantDataFactoryMock.VerwachtMethodCall("Maak", RandomPersonalityEnum).DanReturn(RandomKlantData)
 	
 	#dim KlantDataBewaarder As APPS.VKP.impl.KlantDataBewaarder = ##class(APPS.VKP.impl.KlantDataBewaarder).%New(KlantIdValidatorStub, KlantDataRepositoryStub, KlantDataFactoryMock)
-	Do KlantDataBewaarder.Bewaar(RandomPersonality, ##class(DOM.common.dto.HandelKlantData).%New())
+	Do KlantDataBewaarder.Bewaar(Personality, ##class(DOM.common.dto.HandelKlantData).%New())
 	
 	Do KlantDataFactoryMock.Verifieer()
 ]]></Implementation>
 </Method>
 
 <Method name="AssertBewaarOpgeroepen">
-<FormalSpec>Personality:DOM.common.Personality,KlantDataDto:DOM.common.dto.KlantData</FormalSpec>
+<FormalSpec>PersonalityEnum:DOM.common.enu.Personality,KlantDataDto:DOM.common.dto.KlantData</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim DummyKlantData As DOM.VKP.impl.KlantData = ..DummyKlantDataFactory.MaakKlantData(Personality)
+	#dim DummyKlantData As DOM.VKP.impl.KlantData = ..DummyKlantDataFactory.Maak(PersonalityEnum)
+	#dim Personality As DOM.common.Personality = ##class(DOM.common.impl.Personality).OpenId(PersonalityEnum)
 	
 	#dim KlantIdValidatorMock As vhTest.Mock.APPS.CRM.KlantIDValidator = ##class(vhTest.Mock.APPS.CRM.KlantIDValidator).%New()
 	Do KlantIdValidatorMock.VerwachtMethodCall("Valideer", $$$ElkeWaarde, Personality)
Index: vhTest/Mock/DOM/VKP/impl/KlantDataFactory.cls.xml
===================================================================
diff -u
--- vhTest/Mock/DOM/VKP/impl/KlantDataFactory.cls.xml	(revision 0)
+++ vhTest/Mock/DOM/VKP/impl/KlantDataFactory.cls.xml	(revision 35990)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.DOM.VKP.impl.KlantDataFactory">
+<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
+Inheritance van meerdere TECH.Interface interfaces resulteert nog niet in een mockklasse met overeenkomstige inheritance-structuur.</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>DOM.VKP.impl.KlantDataFactory,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="Maak">
+<FormalSpec>PersonalityEnum:DOM.common.enu.Personality</FormalSpec>
+<ReturnType>DOM.VKP.impl.KlantData</ReturnType>
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("Maak",PersonalityEnum)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/DOM/VKP/impl/KlantDataFactory/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/DOM/VKP/impl/KlantDataFactory/Test.cls.xml	(revision 0)
+++ vhUnitTest/DOM/VKP/impl/KlantDataFactory/Test.cls.xml	(revision 35990)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.DOM.VKP.impl.KlantDataFactory.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="KlantDataFactory">
+<Type>DOM.VKP.impl.KlantDataFactory</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeAllTests">
+<Implementation><![CDATA[
+	Do ##super()
+	
+	Set ..KlantDataFactory = ##class(DOM.VKP.impl.KlantDataFactory).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Exceptie wordt geraised indien niet geïmplementeerde Personality">
+<Implementation><![CDATA[
+	Do ..AssertExceptie(##class(DOM.common.enu.Personality).VanHoecke(), "Niet geïmplementeerd voor Personality VanHoecke")
+	Do ..AssertExceptie(##class(DOM.common.enu.Personality).VanHoeckeVoorHalux(), "Niet geïmplementeerd voor Personality VanHoeckeVoorHalux")
+	Do ..AssertExceptie(##class(DOM.common.enu.Personality).Noteborn(), "Niet geïmplementeerd voor Personality Noteborn")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Correcte Personality-KlantData wordt geïnstantieerd op basis van Personality">
+<Implementation><![CDATA[
+	#dim Uitzonderingen As %ListOfDataTypes = ##class(%ListOfDataTypes).%New()
+	Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).VanHoecke())
+	Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).VanHoeckeVoorHalux())
+	Do Uitzonderingen.Insert(##class(DOM.common.enu.Personality).Noteborn())
+
+	#dim Filter As TECH.Filter = ##class(TECH.Filter.ValueBasedFilter).%New(Uitzonderingen)
+	#dim Iterator As TECH.Iterator = ##class(TECH.DynamicIterator).%New(##class(DOM.common.enu.Personality).ValueListIterator(),, Filter)
+
+	While (Iterator.HasNext()) {
+		#dim Personality As DOM.common.enu.Personality = Iterator.Next()
+		#dim DisplayName As TECH.String = ##class(DOM.common.enu.Personality).LogicalToDisplay(Personality)
+
+		Do ..Assert("DOM.VKP.impl." _ DisplayName _ "KlantData", Personality)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="Assert">
+<FormalSpec>KlasseNaam:TECH.String,Personality:DOM.common.enu.Personality</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim KlantData As DOM.VKP.impl.KlantData = ..KlantDataFactory.Maak(Personality)
+	
+	Do $$$AssertEquals(KlantData.%ClassName(1), KlasseNaam)
+]]></Implementation>
+</Method>
+
+<Method name="AssertExceptie">
+<FormalSpec>Personality:DOM.common.enu.Personality,Omschrijving:TECH.String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim Personalities As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes(Personality)
+	#dim Iterator As TECH.Iterator = ##class(TECH.ListIterator).%New(Personalities)
+	
+	#dim Substrings As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes(Omschrijving)
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(##class(TECH.Exceptions.UnimplementedException).%ClassName(1), Substrings))
+	
+	While (Iterator.HasNext()) {
+		#dim DisplayName As TECH.String = ##class(DOM.common.enu.Personality).LogicalToDisplay(Iterator.Next())
+
+		Do ..Assert("DOM.VKP.impl." _ DisplayName _ "KlantData", Personality)
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: DOM/VKP/impl/KlantDataFactory.cls.xml
===================================================================
diff -u
--- DOM/VKP/impl/KlantDataFactory.cls.xml	(revision 0)
+++ DOM/VKP/impl/KlantDataFactory.cls.xml	(revision 35990)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="DOM.VKP.impl.KlantDataFactory">
+<Super>TECH.Mockable</Super>
+
+<Property name="ObjectAPI">
+<Type>TECH.Object.ObjectAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ObjectAPI:TECH.Object.ObjectAPI</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..ObjectAPI = $$$Implementation(ObjectAPI, ##class(TECH.Object.impl.ObjectAPI).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="Maak">
+<FormalSpec>PersonalityEnum:DOM.common.enu.Personality</FormalSpec>
+<ReturnType>DOM.VKP.impl.KlantData</ReturnType>
+<Implementation><![CDATA[
+	#dim IsVanHoecke As %Boolean = (PersonalityEnum = ##class(DOM.common.enu.Personality).VanHoecke())
+	#dim IsVanHoeckeVoorHalux As %Boolean = (PersonalityEnum = ##class(DOM.common.enu.Personality).VanHoeckeVoorHalux())
+	#dim IsNoteborn As %Boolean = (PersonalityEnum = ##class(DOM.common.enu.Personality).Noteborn())
+	
+	If (IsVanHoecke || IsVanHoeckeVoorHalux || IsNoteborn) {
+		#dim Omschrijving As TECH.String = "Niet geïmplementeerd voor Personality " _ ##class(DOM.common.enu.Personality).LogicalToDisplay(PersonalityEnum) _ "."
+		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.Exceptions.UnimplementedException).%New(Omschrijving)
+		
+		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
+	}
+	
+	#dim Personality As DOM.common.Personality = ##class(DOM.common.impl.Personality).OpenId(PersonalityEnum)
+	
+	Quit ..ObjectAPI.New("DOM.VKP.impl." _ Personality.GeefCode() _ "KlantData")
+]]></Implementation>
+</Method>
+</Class>
+
+
+<Package name="DOM.VKP.impl" sqlname="DOM_VKP_impl"/>
+</Export>