adding replacement of missing org.json methods to OrgJsonUtil

Also
 * replaced usages of JSONObject#toMap() and JSONArray#toList() to OrgJsonUtil#toMap() and #toList() respectively
 * changing the test-supporting jetty to be able to work both from jar file resources & filesystem resources (the former is
 needed when running the tests in android mode, the latter is for vanilla tests)
 * porting JSONWriter and JSONString classes from org.json

Author: erosb

core/src/main/java/org/everit/json/schema/EnumSchema.java

@@ -1,14 +1,17 @@
 package org.everit.json.schema;
 
 import static java.util.stream.Collectors.toList;
+import static org.everit.json.schema.loader.OrgJsonUtil.toMap;
 
-import java.util.Collections;
 import java.util.ArrayList;
-import java.util.Objects;
+import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
+
 import org.everit.json.schema.internal.JSONPrinter;
+import org.everit.json.schema.loader.OrgJsonUtil;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -19,9 +22,9 @@ public class EnumSchema extends Schema {
 
     static Object toJavaValue(Object orig) {
         if (orig instanceof JSONArray) {
-            return ((JSONArray) orig).toList();
+            return OrgJsonUtil.toList((JSONArray) orig);
         } else if (orig instanceof JSONObject) {
-            return ((JSONObject) orig).toMap();
+            return toMap((JSONObject) orig);
         } else if (orig == JSONObject.NULL) {
             return null;
         } else {

core/src/main/java/org/everit/json/schema/ObjectComparator.java

@@ -1,5 +1,7 @@
 package org.everit.json.schema;
 
+import static org.everit.json.schema.loader.OrgJsonUtil.getNames;
+
 import java.util.Arrays;
 import java.util.Objects;
 
@@ -48,7 +50,7 @@ private static boolean deepEqualArrays(JSONArray arr1, JSONArray arr2) {
     }
 
     private static String[] sortedNamesOf(JSONObject obj) {
-        String[] raw = JSONObject.getNames(obj);
+        String[] raw = getNames(obj);
         if (raw == null) {
             return null;
         }

core/src/main/java/org/everit/json/schema/ObjectSchemaValidatingVisitor.java

@@ -2,6 +2,7 @@
 
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
+import static org.everit.json.schema.loader.OrgJsonUtil.getNames;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,7 +45,7 @@ public ObjectSchemaValidatingVisitor(Object subject, ValidatingVisitor owner) {
 
     @Override void visitPropertyNameSchema(Schema propertyNameSchema) {
         if (propertyNameSchema != null) {
-            String[] names = JSONObject.getNames(objSubject);
+            String[] names = getNames(objSubject);
             if (names == null || names.length == 0) {
                 return;
             }
@@ -105,7 +106,7 @@ public ObjectSchemaValidatingVisitor(Object subject, ValidatingVisitor owner) {
     }
 
     private List<String> getAdditionalProperties() {
-        String[] names = JSONObject.getNames(objSubject);
+        String[] names = getNames(objSubject);
         if (names == null) {
             return new ArrayList<>();
         } else {
@@ -129,7 +130,7 @@ private boolean matchesAnyPattern(String key) {
     }
 
     @Override void visitPatternPropertySchema(Regexp propertyNamePattern, Schema schema) {
-        String[] propNames = JSONObject.getNames(objSubject);
+        String[] propNames = getNames(objSubject);
         if (propNames == null || propNames.length == 0) {
             return;
         }

core/src/main/java/org/everit/json/schema/internal/JSONPrinter.java

@@ -1,22 +1,25 @@
 package org.everit.json.schema.internal;
 
-import org.everit.json.schema.Schema;
-import org.json.JSONWriter;
+import static java.util.Objects.requireNonNull;
 
 import java.io.Writer;
 import java.util.Map;
 
-import static java.util.Objects.requireNonNull;
+import org.everit.json.schema.Schema;
 
 public class JSONPrinter {
 
     private final JSONWriter writer;
 
-    public JSONPrinter(final Writer writer) {
+    public JSONPrinter(Writer writer) {
         this(new JSONWriter(writer));
     }
 
-    public JSONPrinter(final JSONWriter writer) {
+    public JSONPrinter(org.json.JSONWriter writer) {
+        throw new RuntimeException();
+    }
+
+    public JSONPrinter(JSONWriter writer) {
         this.writer = requireNonNull(writer, "writer cannot be null");
     }