fix: Fix bug in validation of empty composite values.

The isEmptyComposite() test needs to be first, otherwise
obj instanceof XObject will be true and the method will return the
wrong result.

Author: dmaccormack

module/jsonurl-jsonorg/src/main/java/org/jsonurl/jsonorg/JsonOrgValueFactory.java

@@ -212,6 +212,10 @@ default boolean isValid(Set<ValueType> types, Object value) {
         if (value instanceof Boolean) {
             return types.contains(ValueType.BOOLEAN);
         }
+        if (isEmptyComposite(value)) {
+            return types.contains(ValueType.OBJECT)
+                || types.contains(ValueType.ARRAY);
+        }
         if (value instanceof JSONArray) {
             return types.contains(ValueType.ARRAY);
         }
@@ -221,10 +225,6 @@ default boolean isValid(Set<ValueType> types, Object value) {
         if (isNull(value)) {
             return types.contains(ValueType.NULL);
         }
-        if (isEmptyComposite(value)) {
-            return types.contains(ValueType.OBJECT)
-                || types.contains(ValueType.ARRAY);
-        }
         return false;
     }
 }

module/jsonurl-jsr374/src/main/java/org/jsonurl/jsonp/JsonpValueFactory.java

@@ -356,6 +356,10 @@ default boolean isValid(Set<ValueType> types, JsonValue value) {
         if (value == JsonValue.FALSE || value == JsonValue.TRUE) {
             return types.contains(ValueType.BOOLEAN);
         }
+        if (isEmptyComposite(value)) {
+            return types.contains(ValueType.OBJECT)
+                || types.contains(ValueType.ARRAY);
+        }
         if (value instanceof JsonArray) {
             return types.contains(ValueType.ARRAY);
         }
@@ -365,10 +369,6 @@ default boolean isValid(Set<ValueType> types, JsonValue value) {
         if (JsonValue.NULL == value) {
             return types.contains(ValueType.NULL);
         }
-        if (isEmptyComposite(value)) {
-            return types.contains(ValueType.OBJECT)
-                || types.contains(ValueType.ARRAY);
-        }
         return false;
     }
 }