Added Async toJSONObject method and one test case.

rajihul · rajihul · commit 99dea4113d5d · 2021-03-09T11:42:15.000-08:00
diff --git a/src/main/java/org/json/XML.java b/src/main/java/org/json/XML.java
@@ -42,7 +42,7 @@ of this software and associated documentation files (the "Software"), to deal
  * @version 2016-08-10
  */
 @SuppressWarnings("boxing")
-public class XML {
+public class XML{
 
     /** The Character '&amp;'. */
     public static final Character AMP = '&';
@@ -78,6 +78,11 @@ public class XML {
 
     public static final String TYPE_ATTR = "xsi:type";
 
+    /** [Milestone 5]
+     * Need to define some global function variables that can be accessed by run function.
+     */
+    //public static Function command, errorHandle;
+
     /**
      * Creates an iterator for navigating Code Points in a string instead of
      * characters. Once Java7 support is dropped, this can be replaced with
@@ -1072,6 +1077,45 @@ public static Stream<String> toStream(JSONObject obj)
         return (listOfTags).stream();
     }
 
+    public static void toJSONObject(Reader r, Function<JSONObject, Object> command, boolean diff)
+    {
+        //Reader r, Function commander, Function errorHandler
+        //Take the inputs and store them in global variables for later use in run function
+        //command = commander;
+        //errorHandle = errorHandler;
+        String outstr = "outside the thread rj";
+        JSONObject myJSON = toJSONObject(r);
+
+        Runnable runnable = () -> {
+            System.out.println("Inside : " + outstr);
+            System.out.println(myJSON.toString());
+            command.apply(myJSON);
+        };
+
+        System.out.println("Creating Thread...");
+        Thread thread = new Thread(runnable);
+
+        System.out.println("Starting Thread...");
+        thread.start();
+
+
+        //(new Thread(new XML())).start();
+    }
+
+    /*public void run() {
+        System.out.println("Hello from a thread!");
+        try
+        {
+            //Convert reader to JSON Object and send off.i
+            command.apply();
+
+        } catch (Exception e)
+        {
+            System.out.println();
+        }
+    }*/
+
+
     /**
      * Convert a JSONObject into a well-formed, element-normal XML string.
      *
diff --git a/src/test/java/org/json/junit/XMLTest_SWE262.java b/src/test/java/org/json/junit/XMLTest_SWE262.java
@@ -378,4 +378,49 @@ public void testStream2()
         }
     }
 
+    @Test
+    public void async()
+    {
+        String expectedStr = "";
+        //Generate output.txt
+        try
+        {
+            FileReader filereader = new FileReader("src/test/resources/Catalog.xml");
+            FileWriter filewriter = new FileWriter("output.json");
+            XML.toJSONObject(filereader,  (JSONObject joo) -> joo.write(filewriter), true);
+            //XML.toJSONObject();
+            expectedStr = XML.toJSONObject(filereader).toString();
+
+
+            //Give thread adequate time to finish
+            try{
+                Thread.sleep(1000);
+
+            }catch(InterruptedException e)
+            {
+                e.printStackTrace();
+            }
+
+            //filewriter.flush();
+            filewriter.close();
+        }catch(IOException e)
+        {
+            e.printStackTrace();
+        }
+
+        //Compare the output.txt to the Catalog.xml JSON
+        try
+        {
+            FileReader filereader = new FileReader("output.json");
+            JSONObject actualJSON = XML.toJSONObject(filereader);
+            assertEquals(expectedStr, actualJSON.toString());
+
+        }catch(IOException e)
+        {
+            e.printStackTrace();
+        }
+
+
+    }
+
 }
