refactor: update Item and CoCo classes to support multiple types for items

Author: riccardodebenedictis

gui/mobile/app/src/main/java/it/cnr/coco/MainActivity.java

@@ -121,7 +121,7 @@ public void new_type(Type type) {
 
     @Override
     public void new_item(Item item) {
-        if (item.getType().getName().equals("Robot")) {
+        if (item.getTypes().stream().anyMatch(type -> type.getName().equals("Robot"))) {
             Log.d(TAG, "New robot item received: " + item.getId());
             runOnUiThread(() -> {
                 // Initialize the Language class to handle speech and text-to-speech

gui/mobile/coco/src/main/java/it/cnr/coco/api/CoCo.java

@@ -12,6 +12,7 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 
 import it.cnr.coco.utils.Connection;
 import it.cnr.coco.utils.ConnectionListener;
@@ -81,13 +82,16 @@ public void setItems(@NonNull JsonArray itemArray) {
         items.clear();
         for (JsonElement itemElement : itemArray) {
             JsonObject itemObject = itemElement.getAsJsonObject();
-            Type type = Objects.requireNonNull(types.get(itemObject.get("type").getAsString()));
+            Set<Type> itemTypes = new HashSet<>();
+            for (JsonElement typeElement : itemObject.getAsJsonArray("types")) {
+                Type type = Objects.requireNonNull(types.get(typeElement.getAsString()));
+                itemTypes.add(type);
+            }
             Value value = itemObject.has("value") ? new Value(itemObject.get("value").getAsJsonObject().get("data"),
                     Instant.ofEpochMilli(itemObject.get("value").getAsJsonObject().get("timestamp").getAsLong()))
                     : null;
-            Item item = new Item(itemObject.get("id").getAsString(), type, itemObject.get("data"), value);
+            Item item = new Item(itemObject.get("id").getAsString(), itemTypes, itemObject.get("data"), value);
             items.put(itemObject.get("id").getAsString(), item);
-            type.instances.add(item);
             for (CoCoListener listener : listeners)
                 listener.new_item(item);
         }
@@ -105,33 +109,11 @@ public void onReceivedMessage(@NonNull JsonObject message) {
             case "coco":
                 if (message.has("types")) {
                     types.clear();
-                    for (Map.Entry<String, JsonElement> entry : message.getAsJsonObject("types").entrySet())
-                        types.put(entry.getKey(),
-                                new Type(entry.getKey(), entry.getValue().getAsJsonObject().get("data"), null,
-                                        null));
-                    for (Map.Entry<String, JsonElement> entry : message.getAsJsonObject("types").entrySet())
-                        refineType(Objects.requireNonNull(types.get(entry.getKey())),
-                                entry.getValue().getAsJsonObject());
-                    for (Type type : types.values())
-                        for (CoCoListener listener : listeners)
-                            listener.new_type(type);
+                    setTypes(message.getAsJsonObject("types").getAsJsonArray("array"));
                 }
                 if (message.has("items")) {
                     items.clear();
-                    for (Map.Entry<String, JsonElement> entry : message.getAsJsonObject("items").entrySet()) {
-                        JsonObject itemObject = entry.getValue().getAsJsonObject();
-                        Type type = Objects.requireNonNull(types.get(itemObject.get("type").getAsString()));
-                        Value value = itemObject.has("value")
-                                ? new Value(itemObject.get("value").getAsJsonObject().get("data"),
-                                        Instant.ofEpochMilli(
-                                                itemObject.get("value").getAsJsonObject().get("timestamp").getAsLong()))
-                                : null;
-                        Item item = new Item(entry.getKey(), type, itemObject.get("data"), value);
-                        items.put(entry.getKey(), item);
-                        type.instances.add(item);
-                        for (CoCoListener listener : listeners)
-                            listener.new_item(item);
-                    }
+                    setItems(message.getAsJsonObject("items").getAsJsonArray("array"));
                 }
                 break;
             case "new_type":
@@ -142,15 +124,18 @@ public void onReceivedMessage(@NonNull JsonObject message) {
                     listener.new_type(type);
                 break;
             case "new_item":
-                Type itemType = Objects.requireNonNull(types.get(message.get("type").getAsString()));
+                Set<Type> itemTypes = new HashSet<>();
+                for (JsonElement typeElement : message.getAsJsonArray("types")) {
+                    Type t = Objects.requireNonNull(types.get(typeElement.getAsString()));
+                    itemTypes.add(t);
+                }
                 Value itemValue = message.has("value")
                         ? new Value(message.get("value").getAsJsonObject().get("data"),
                                 Instant.ofEpochMilli(
                                         message.get("value").getAsJsonObject().get("timestamp").getAsLong()))
                         : null;
-                Item item = new Item(message.get("id").getAsString(), itemType, message.get("data"), itemValue);
+                Item item = new Item(message.get("id").getAsString(), itemTypes, message.get("data"), itemValue);
                 items.put(message.get("id").getAsString(), item);
-                itemType.instances.add(item);
                 for (CoCoListener listener : listeners)
                     listener.new_item(item);
                 break;

gui/mobile/coco/src/main/java/it/cnr/coco/api/Item.java

@@ -6,29 +6,35 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 public class Item {
 
     private final String id;
-    private final Type type;
+    private final Set<Type> types;
     JsonElement properties;
     private Value value;
     private final List<Value> data = new ArrayList<>();
 
-    public Item(@NonNull String id, @NonNull Type type, JsonElement properties, Value value) {
+    public Item(@NonNull String id, @NonNull Set<Type> types, JsonElement properties, Value value) {
         this.id = id;
-        this.type = type;
+        this.types = types;
         this.properties = properties;
         this.value = value;
+        if (value != null)
+            this.data.add(value);
+        for (Type type : types)
+            type.instances.add(this);
     }
 
     public String getId() {
         return id;
     }
 
-    public Type getType() {
-        return type;
+    public Set<Type> getTypes() {
+        return Collections.unmodifiableSet(types);
     }
 
     public JsonElement getProperties() {