use aliases for properties

comroid-git · Dec 25, 2023 · c1802f2 · c1802f2
1 parent 909f6de
commit c1802f2
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/main/java/org/comroid/api/DataStructure.java b/src/main/java/org/comroid/api/DataStructure.java
@@ -8,6 +8,7 @@
 import org.comroid.util.Constraint;
 import org.comroid.util.StandardValueType;
 import org.comroid.util.Switch;
+import org.comroid.util.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -16,7 +17,9 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Stream;
 
+import static org.comroid.annotations.Annotations.aliases;
 import static org.comroid.api.Polyfill.uncheckedCast;
+import static org.comroid.util.Streams.append;
 
 @Value
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
@@ -106,17 +109,18 @@ else if (it instanceof Method)
                 .filter(it -> !Annotations.ignore(it, DataStructure.class))
                 .filter(it -> !key.above.equals(it.getDeclaringClass()) && key.above.isAssignableFrom(it.getDeclaringClass()))
                 .filter(it -> Arrays.stream(SystemFilters).noneMatch(type -> it.getDeclaringClass().isAssignableFrom(type)))
-                .map(it -> {
+                .forEach(it -> {
                     var type = new Switch<Member, Class<?>>()
                             .option(Field.class::isInstance, () -> ((Field) it).getType())
                             .option(Method.class::isInstance, () -> ((Method) it).getReturnType())
                             .apply(it);
                     var name = it.getName();
                     if (it instanceof Method)
                         name = Character.toLowerCase(name.charAt(3)) + name.substring("getX".length());
-                    return struct.createProperty(type, name, it);
-                })
-                .forEach(prop -> struct.properties.put(prop.name, prop));
+                    final var prop = struct.createProperty(type, name, it);
+                    Stream.of(name).collect(append(aliases(it)))
+                            .forEach(alias -> struct.properties.put(alias, prop));
+                });
 
         return struct;
     }