Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r56093 -r56098
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 56093)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 56098)
@@ -13,14 +13,20 @@
 <Private>1</Private>
 </Property>
 
+<Property name="PalletCodeValidator">
+<Type>WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository</FormalSpec>
+<FormalSpec>DnaCodeRepository:DOM.Halux.AAP.DnaCodeRepository="",PalletCodeValidator:WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	Set ..DnaCodeRepository = $$$Inject(DnaCodeRepository, ##class(DOM.Halux.AAP.DnaCodeRepository).%New())
+	Set ..PalletCodeValidator = $$$Inject(PalletCodeValidator, ##class(WSimpl.Halux.AAP.DnaCodeService.PalletCodeValidator).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -32,23 +38,12 @@
 <Implementation><![CDATA[
 	Set Response = ##class(WS.Halux.AAP.ValideerPalletCodeResponse).%New()
 	Try {
-		#dim Match As %Boolean = $$$False
-		
-		#dim PalletCode = ##class(TECH.StringUtils).ToUpper(ValideerPalletCodeRequest.PalletCode)
-		
-		Set:(PalletCode ?1"TBX"5N) Match=$$$True 
-		Set:(PalletCode ?1"DIV"5N) Match=$$$True
-		Set:(PalletCode ?1"KAD"5N) Match=$$$True
-		Set:(PalletCode ?1"SFS"5N) Match=$$$True
-		Set:(PalletCode ?1"TBP"5N) Match=$$$True
-		Set:(PalletCode ?1"VHOSS"3N) Match=$$$True
-		
-		If Match {
+		If ..PalletCodeValidator.ValideerPalletCode(ValideerPalletCodeRequest.PalletCode) {
 			Set Response.Header.Status = "200"
 		} Else {
 			Set Response.Header.Status = "1005:InvalidUserInput"
 			Set Response.Header.Omschrijving = "Ongeldige code"
-			Set Response.Header.OmschrijvingVoorLogging = "Ongeldige code: '"_PalletCode_"'"
+			Set Response.Header.OmschrijvingVoorLogging = "Ongeldige code: '"_ValideerPalletCodeRequest.PalletCode_"'"
 		}
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()