[refactor] better check for subtypes in Sync.java

Author: line-o

extensions/modules/file/src/main/java/org/exist/xquery/modules/file/Sync.java

@@ -178,8 +178,8 @@ private Map<String, Sequence> getOptions(final Sequence parameter) throws XPathE
             }
             options.put(EXCLUDES_OPT, seq);
 
-            checkOption(optionsMap, PRUNE_OPT, options, Type.BOOLEAN);
-            checkOption(optionsMap, AFTER_OPT, options, Type.DATE_TIME, Type.DATE_TIME_STAMP);
+            checkOption(optionsMap, PRUNE_OPT, Type.BOOLEAN, options);
+            checkOption(optionsMap, AFTER_OPT, Type.DATE_TIME, options);
         } else if (parameter.itemAt(0).getType() == Type.DATE_TIME) {
             options.put(AFTER_OPT, parameter);
         } else {
@@ -192,43 +192,25 @@ private Map<String, Sequence> getOptions(final Sequence parameter) throws XPathE
     private void checkOption(
             final AbstractMapType optionsMap,
             final String name,
-            final Map<String, Sequence> options,
-            final int... expectedTypes
+            final int expectedType,
+            final Map<String, Sequence> options
     ) throws XPathException {
         final Sequence p = optionsMap.get(new StringValue(this, name));
 
         if (p.isEmpty()) {
             return; // nothing to do, continue
         }
 
-        if (p.hasMany() || !isExpectedType(p.getItemType(), expectedTypes)) {
+        if (p.hasMany() || !Type.subTypeOf(p.getItemType(),expectedType)) {
             throw new XPathException(this, ErrorCodes.XPTY0004,
                     "Invalid value type for option \"" + name + "\", expected " +
-                            formatTypes(expectedTypes) + " got " +
+                            Type.getTypeName(expectedType) + " got " +
                             Type.getTypeName(p.itemAt(0).getType()));
         }
 
         options.put(name, p);
     }
 
-    private boolean isExpectedType(final int actualType, final int... expectedTypes) {
-        for(int type : expectedTypes) {
-            if(type == actualType) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private String formatTypes(final int... expectedTypes) {
-        StringBuilder buff = new StringBuilder(Type.getTypeName(expectedTypes[0]));
-        for(int i = 1; i < expectedTypes.length; i++) {
-            buff.append(", ");
-            buff.append(Type.getTypeName(expectedTypes[i]));
-        }
-        return buff.toString();
-    }
-
     private Sequence startSync(
             final String target,
             final String collectionPath,