fixed usage of getValueOr, improved MapComponentSerializer

Author: Pesekjak

scriptive-core/src/main/java/org/machinemc/scriptive/components/BaseComponent.java

@@ -260,7 +260,7 @@ public ComponentProperties getProperties() {
     @SuppressWarnings("unchecked")
     public void loadProperties(ComponentProperties properties, ComponentSerializer<?> serializer) {
         textFormat = new TextFormat(properties);
-        setInsertion(properties.getValueOr("insertion", null));
+        setInsertion(properties.getValue("insertion", String.class).orElse(null));
         setClickEvent(properties.getValue("clickEvent", ComponentProperties.class)
                 .flatMap(ClickEvent::fromProperties)
                 .orElse(null));

scriptive-core/src/main/java/org/machinemc/scriptive/components/TranslationComponent.java

@@ -324,7 +324,7 @@ public Class<TranslationComponent> getType() {
     public void loadProperties(ComponentProperties properties, ComponentSerializer<?> serializer) {
         super.loadProperties(properties, serializer);
         translation = properties.getValue("translate", String.class).orElseThrow();
-        fallback = properties.getValueOr("translate", null);
+        fallback = properties.getValue("translate", String.class).orElse(null);
         arguments = properties.get("with", ComponentProperty.Array.class)
                 .map(ComponentProperty.Array::value)
                 .map(array -> {

scriptive-core/src/main/java/org/machinemc/scriptive/events/ClickEvent.java

@@ -68,7 +68,7 @@ public static Optional<ClickEvent> fromProperties(ComponentProperties properties
             return Optional.empty();
         }
 
-        String value = properties.getValueOr("value", null);
+        String value = properties.getValue("value", String.class).orElse(null);
         if (value == null) return Optional.empty();
         return Optional.of(new ClickEvent(action, value));
     }

scriptive-core/src/main/java/org/machinemc/scriptive/events/HoverEvent.java

@@ -54,23 +54,25 @@ public HoverEvent(Action<V> action, ValueHolder<V> valueHolder) {
     public static <V extends HoverEvent.Value> Optional<HoverEvent<V>> fromProperties(ComponentProperties properties,
                                                                                       ComponentSerializer<?> serializer) {
         if (!properties.contains("action")) return Optional.empty();
-        Action<V> action = (Action<V>) Action.byName(properties.getValueOr("action", null));
+        String actionName = properties.getValue("action", String.class).orElse(null);
+        if (actionName == null) return Optional.empty();
+        Action<V> action = (Action<V>) Action.byName(actionName);
         if (action == null) return Optional.empty();
 
         if (action == SHOW_TEXT) {
-            ComponentProperty<?> property = properties.getOr("contents", null);
+            ComponentProperty<?> property = properties.get("contents", ComponentProperty.class).orElse(null);
             if (property == null) return Optional.empty();
             return Optional.of(new HoverEvent<>(action, (V) new Text(ComponentProperty.convertToProperties(property).value(), serializer)));
         }
 
         if (action == SHOW_ITEM) {
-            ComponentProperties contents = properties.getValueOr("contents", null);
+            ComponentProperties contents = properties.getValue("contents", ComponentProperties.class).orElse(null);
             if (contents == null) return Optional.empty();
             return Optional.of(new HoverEvent<>(action, (V) new Item(contents)));
         }
 
         if (action == SHOW_ENTITY) {
-            ComponentProperties contents = properties.getValueOr("contents", null);
+            ComponentProperties contents = properties.getValue("contents", ComponentProperties.class).orElse(null);
             if (contents == null) return Optional.empty();
             return Optional.of(new HoverEvent<>(action, (V) new Entity(contents)));
         }

scriptive-core/src/main/java/org/machinemc/scriptive/serialization/ComponentProperties.java

@@ -100,6 +100,21 @@ public <T> T getValueOr(String key, T or) {
         return (T) value;
     }
 
+    /**
+     * Returns unwrapped component property of this map if the wrapped property
+     * matches the provided class, or empty in case there is no property with
+     * given key, or it is different property type.
+     *
+     * @param key key of the property
+     * @param propertyClass type of the property
+     * @return unwrapped property value
+     * @param <T> value type
+     * @param <P> property type
+     */
+    public <T, P extends ComponentProperty<T>> Optional<T> getAndUnwrap(String key, Class<P> propertyClass) {
+        return get(key, propertyClass).map(ComponentProperty::value);
+    }
+
     /**
      * Changes value of this property map.
      *

scriptive-core/src/main/java/org/machinemc/scriptive/serialization/MapComponentSerializer.java

@@ -8,41 +8,51 @@
 public class MapComponentSerializer extends ComponentSerializer<Map<String, ?>> {
 
     @Override
+    @SuppressWarnings("unchecked")
     public Map<String, ?> serializeFromProperties(ComponentProperties properties) {
         Objects.requireNonNull(properties, "Component properties can not be null");
-        Map<String, Object> map = new HashMap<>();
-        Set<String> keys = properties.getKeys();
-        for (String key : keys) map.put(key, unwrap(properties.get(key, ComponentProperty.class).orElseThrow()));
-        return map;
+        return (Map<String, ?>) unwrap(ComponentProperty.properties(properties));
     }
 
     @Override
     public ComponentProperties deserializeAsProperties(Map<String, ?> value) {
         Objects.requireNonNull(value, "Map can not be null");
-        ComponentProperties properties = new ComponentProperties();
-        value.forEach((k, v) -> properties.set(k, wrap(v)));
-        return properties;
+        return ComponentProperty.convertToProperties(wrap(value)).value();
     }
 
     private Object unwrap(ComponentProperty<?> property) {
         return switch (property) {
-            case ComponentProperty.Properties properties -> serializeFromProperties(properties.value());
-            case ComponentProperty.Array array -> Arrays.stream(array.value()).map(this::serializeFromProperties).toList();
+            case ComponentProperty.Properties properties -> {
+                Map<String, Object> map = new HashMap<>();
+                properties.value().forEach((k, p) -> map.put(k, unwrap(p)));
+                yield map;
+            }
+            case ComponentProperty.Array array -> {
+                List<Object> list = new ArrayList<>();
+                Arrays.stream(array.value())
+                        .map(ComponentProperty::properties)
+                        .map(this::unwrap)
+                        .forEach(list::add);
+                yield list;
+            }
             default -> property.value();
         };
     }
 
-    @SuppressWarnings("unchecked")
     private ComponentProperty<?> wrap(Object o) {
         return switch (o) {
-            case Map<?, ?> map -> ComponentProperty.properties(deserializeAsProperties((Map<String, ?>) map));
+            case Map<?, ?> map -> {
+                ComponentProperties properties = new ComponentProperties();
+                map.forEach((k, e) -> properties.set((String) k, wrap(e)));
+                yield ComponentProperty.properties(properties);
+            }
             case List<?> list -> {
-                ComponentProperties[] properties = new ComponentProperties[list.size()];
-                for (int i = 0; i < properties.length; i++) {
-                    ComponentProperty<?> next = wrap(list.get(i));
-                    properties[i] = ComponentProperty.convertToProperties(next).value();
-                }
-                yield ComponentProperty.array(properties);
+                ComponentProperties[] array = list.stream()
+                        .map(this::wrap)
+                        .map(ComponentProperty::convertToProperties)
+                        .map(ComponentProperty::value)
+                        .toArray(ComponentProperties[]::new);
+                yield ComponentProperty.array(array);
             }
             default -> ComponentProperty.of(o);
         };

scriptive-gson/src/main/java/org/machinemc/scriptive/serialization/JSONComponentSerializer.java

@@ -22,12 +22,14 @@ public JSONComponentSerializer(Gson gson) {
 
     @Override
     public String serializeFromProperties(ComponentProperties properties) {
+        Objects.requireNonNull(properties, "Component properties can not be null");
         JsonElement element = unwrap(ComponentProperty.properties(properties));
         return gson.toJson(element);
     }
 
     @Override
     public ComponentProperties deserializeAsProperties(String value) {
+        Objects.requireNonNull(value, "JSON can not be null");
         JsonElement element = JsonParser.parseString(value);
         return ComponentProperty.convertToProperties(wrap(element)).value();
     }

scriptive-nbt/src/main/java/org/machinemc/scriptive/serialization/NBTComponentSerializer.java

@@ -4,6 +4,7 @@
 import org.machinemc.scriptive.components.Component;
 
 import java.util.Arrays;
+import java.util.Objects;
 
 /**
  * Serializer for NBT format.
@@ -17,11 +18,13 @@ public NBTCompound serialize(Component component) {
 
     @Override
     public NBTCompound serializeFromProperties(ComponentProperties properties) {
+        Objects.requireNonNull(properties, "Component properties can not be null");
         return (NBTCompound) unwrap(ComponentProperty.properties(properties));
     }
 
     @Override
     public ComponentProperties deserializeAsProperties(NBT<?> value) {
+        Objects.requireNonNull(value, "NBT can not be null");
         return ComponentProperty.convertToProperties(wrap(value)).value();
     }