Merge remote-tracking branch 'origin/master'

src/main/java/Event.java

-import jdk.security.jarsigner.JarSigner;
-
-import javax.json.JsonArray;
-import javax.json.JsonObject;
+import javax.json.Json;
+import javax.json.JsonReader;
 import javax.json.JsonValue;
+import javax.json.bind.Jsonb;
+import javax.json.bind.JsonbBuilder;
+import java.io.StringReader;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 
@@ -17,19 +19,13 @@ public class Event {
     public String startDate;
     public String endDate;
     public String[] categories;
-    public GeoShape geometries;
+    public GeoShape[] geometries;
+
+    public Event(){
+
+    }
 
-    public Event(String id,
-                 HashMap<String, String> names,
-                 String description,
-                 String url,
-                 int duration,
-                 boolean isFree,
-                 String startDate,
-                 String endDate,
-                 String[] categories,
-                 GeoShape geometries
-    ) {
+    public Event(String id, HashMap<String, String> names, String description, String url, boolean isFree, String startDate, String endDate, String[] categories, GeoShape[] geometries) {
         this.id = id;
         this.names = names;
         this.description = description;
@@ -42,41 +38,28 @@ public class Event {
         this.geometries = geometries;
     }
 
-    public static Event parseJSON(JsonObject jobj) {
-        String j_id = jobj.getString("id");
-        JsonObject j_names = jobj.getJsonObject("name");
-        String j_description = jobj.getString("description");
-        JsonValue j_url = jobj.get("url");
-        boolean j_isFree = jobj.getBoolean("isFree");
-        String j_startDate = jobj.getString("start");
-        String j_endDate = jobj.getString("end");
-        JsonArray j_categories = jobj.getJsonArray("categories");
-        JsonArray j_geometries = jobj.getJsonArray("geometries");
-
-        HashMap<String, String> names = new HashMap<>();
-        for (String key : j_names.keySet()) {
-            names.put(key, j_names.getString(key));
+    public static ArrayList<Event> getEventsFromJSON(String json){
+        ArrayList<Event> events = new ArrayList<>();
+        JsonReader jsonReader = Json.createReader(new StringReader(json));
+        Jsonb jsonb = JsonbBuilder.create();
+        for (JsonValue jsonValue : jsonReader.readArray()) {
+            events.add(jsonb.fromJson(jsonValue.toString(), Event.class));
         }
-
-        String[] categories = j_categories.stream().map(JsonValue::toString).toArray(String[]::new);
-
-        JsonArray arr = j_geometries.getJsonObject(0).getJsonArray("coordinates");
-        double[] coordinates1 = arr.getJsonArray(0).stream().mapToDouble(value -> Double.parseDouble(value.toString())).toArray();
-        double[] coordinates2 = arr.getJsonArray(0).stream().mapToDouble(value -> Double.parseDouble(value.toString())).toArray();
-
-        return new Event(j_id,names,j_description,j_url.toString(),0,j_isFree,j_startDate,j_endDate,categories,new GeoShape("",coordinates1,coordinates2));
+        return events;
     }
 
     @Override
     public String toString() {
-        return "Event with the id: " + id +
+        return "Event{" +
+                "id='" + id + '\'' +
                 ", names=" + names +
-                ", description=" + description +
-                ", url=" + url +
+                ", description='" + description + '\'' +
+                ", url='" + url + '\'' +
                 ", isFree=" + isFree +
-                ", startDate=" + startDate +
-                ", endDate='" + endDate +
+                ", startDate='" + startDate + '\'' +
+                ", endDate='" + endDate + '\'' +
                 ", categories=" + Arrays.toString(categories) +
-                ", geoshape=" + geometries.toString();
+                ", geometries=" + Arrays.toString(geometries) +
+                '}';
     }
 }
\ No newline at end of file

src/main/java/GeoShape.java

@@ -12,6 +12,11 @@ public class GeoShape {
         this.coordinates[1] = coordinates2;
     }
 
+
+    public GeoShape() {
+
+    }
+
     @Override
     public String toString() {
         return "GeoShape{" +
@@ -19,5 +24,9 @@ public class GeoShape {
                 ", coordinates=" + Arrays.toString(coordinates) +
                 '}';
     }
+
+
+
+
 }
 

src/main/java/Main.java

 
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
-import javax.json.JsonValue;
+import javax.json.*;
 import javax.json.bind.Jsonb;
 import javax.json.bind.JsonbBuilder;
 import java.io.FileNotFoundException;
@@ -12,8 +9,8 @@ public class Main {
     public static void main(String[] args) throws FileNotFoundException {
 
         //Task 2
-        JsonReader reader = Json.createReader(new FileReader("src/main/resources/test.json"));
-        JsonObject jobj = reader.readObject();
+        JsonReader reader = Json.createReader(new FileReader("src/main/resources/testarray.json"));
+        JsonArray jobj = reader.readArray();
         System.out.println(jobj);
 
         //Task 3
@@ -55,10 +52,19 @@ public class Main {
                 .build();
         System.out.println(writing);
 
+
+        //JSONB
+        Jsonb jsonb = JsonbBuilder.create();
+
         //Task 4
         GeoShape geoShape = new GeoShape("geoShapes", new double[]{1000d,223d,121d},new double[]{1000d,223d,121d} );
-        Jsonb jsonb = JsonbBuilder.create();
         System.out.println(jsonb.toJson(geoShape));
+
+        //Task 6
+        System.out.println(Event.getEventsFromJSON(jobj.toString()));
+
+
+
     }
 
 }

src/main/resources/testarray.json

+[{
+  "type":"events",
+  "id":"ACE69C22C9DD41E6B74123BF64725F12",
+  "name":{
+
+    "deu":"Braunsbergbühne Lana: The Orchestra",
+    "ita":"Comedia: The orchestra"
+
+  },
+  "description":{
+
+  },
+  "url":null,
+  "duration":120,
+  "isFree":false,
+  "startDate":"2077-11-17T00: 00: 00.000Z",
+  "endDate":"2077-11-17T00: 00: 00.000Z",
+  "categories":[
+    "odh:theatre-cinema-and-performances",
+    "schema:TheaterEvent"
+  ],
+  "geometries":[
+    {
+      "type":"geoShapes",
+      "coordinates":[
+        [
+          11.309652,
+          46.863848,
+          1298
+        ],
+        [
+          11.309296,
+          46.861944,
+          1342
+        ]
+      ]
+    }
+  ]
+},
+  {
+  "type":"events",
+  "id":"ACE69C22C9DD41E6B74123BF64725412",
+  "name":{
+
+    "deu":"Braunsbergbühne Lana: The Orchestra",
+    "ita":"Comedia: The orchestra"
+
+  },
+  "description":{
+
+  },
+  "url":null,
+  "duration":120,
+  "isFree":false,
+  "startDate":"2077-11-17T00: 00: 00.000Z",
+  "endDate":"2077-11-17T00: 00: 00.000Z",
+  "categories":[
+    "odh:theatre-cinema-and-performances",
+    "schema:TheaterEvent"
+  ],
+  "geometries":[
+    {
+      "type":"geoShapes",
+      "coordinates":[
+        [
+          11.309652,
+          46.863848,
+          1298
+        ],
+        [
+          11.309296,
+          46.861944,
+          1342
+        ]
+      ]
+    }
+  ]
+}
+]
\ No newline at end of file

src/test/resources/test.json

 {
   "type":"events",
   "id":"ACE69C22C9DD41E6B74123BF64725F12",
-
   "name":{
 
     "deu":"Braunsbergbühne Lana: The Orchestra",