renamed field

Author: iamthenoah

src/main/java/net/azalealibrary/configuration/ConfigureCommand.java

@@ -89,7 +89,7 @@ private static String getMessage(List<ConfigurableProperty<?, ?>> properties, St
     }
 
     private enum Action {
-        SET((s, a, i, c) -> c.getName().matches(i) && c.getType().test(s, a)),
+        SET((s, a, i, c) -> c.getName().matches(i) && c.getPropertyType().test(s, a)),
         RESET((s, a, i, c) -> c.getName().matches(i)),
         INFO((s, a, i, c) -> c.getName().equals(i));
 

src/main/java/net/azalealibrary/configuration/FileConfiguration.java

@@ -54,7 +54,7 @@ public void save(Configurable configurable) {
             for (ConfigurableProperty<?, ?> property : configurable.getProperties()) {
                 property.serialize(configuration);
                 List<String> comments = new ArrayList<>();
-                String type = property.getType().getExpected() + (property instanceof ListProperty<?> ? " (list)" : "");
+                String type = property.getPropertyType().getExpected() + (property instanceof ListProperty<?> ? " (list)" : "");
                 comments.add("Property: " + property.getName() + " of " + type);
                 comments.add("Default: " + property.getDefault());
                 property.getDescription().forEach(l -> comments.addAll(TextUtil.split(l, 55).stream().map(i -> "  " + i).toList()));

src/main/java/net/azalealibrary/configuration/property/ConfigurableProperty.java

@@ -14,16 +14,16 @@
 
 public abstract class ConfigurableProperty<T, P> {
 
-    protected final PropertyType<T> type;
+    protected final PropertyType<T> propertyType;
     protected final List<AssignmentPolicy<T>> policies;
     protected final String name;
     protected final Consumer<P> callback;
     private final List<String> description;
     private final Supplier<P> defaultValue;
     private @Nullable P value;
 
-    protected ConfigurableProperty(PropertyType<T> type, Supplier<P> defaultValue, String name, List<String> description, Consumer<P> callback, List<AssignmentPolicy<T>> policies) {
-        this.type = type;
+    protected ConfigurableProperty(PropertyType<T> propertyType, Supplier<P> defaultValue, String name, List<String> description, Consumer<P> callback, List<AssignmentPolicy<T>> policies) {
+        this.propertyType = propertyType;
         this.name = name;
         this.description = description;
         this.defaultValue = defaultValue;
@@ -32,8 +32,8 @@ protected ConfigurableProperty(PropertyType<T> type, Supplier<P> defaultValue, S
         this.value = defaultValue.get();
     }
 
-    public PropertyType<T> getType() {
-        return type;
+    public PropertyType<T> getPropertyType() {
+        return propertyType;
     }
 
     public String getName() {
@@ -81,7 +81,7 @@ public void onExecute(CommandSender sender, Arguments arguments) {
 
     @SuppressWarnings("unchecked")
     public List<String> onComplete(CommandSender sender, Arguments arguments) {
-        return type.complete(sender, arguments, (T) get());
+        return propertyType.complete(sender, arguments, (T) get());
     }
 
     protected abstract void set(CommandSender sender, Arguments arguments);

src/main/java/net/azalealibrary/configuration/property/ListProperty.java

@@ -28,7 +28,7 @@ protected void set(CommandSender sender, Arguments arguments) {
         String action = arguments.matchesAny(0, "list operation", ADD, REMOVE, REPLACE);
 
         if (action.equals(ADD)) {
-            get().add(verify(getType().parse(sender, arguments.subArguments(1), null)));
+            get().add(verify(propertyType.parse(sender, arguments.subArguments(1), null)));
             callback.accept(get());
         } else {
             int index = arguments.find(1, "position", input -> Integer.parseInt(input.replace("@", "")));
@@ -38,7 +38,7 @@ protected void set(CommandSender sender, Arguments arguments) {
             }
 
             if (action.equals(REPLACE)) {
-                get().set(index, verify(getType().parse(sender, arguments.subArguments(2), null)));
+                get().set(index, verify(propertyType.parse(sender, arguments.subArguments(2), null)));
                 callback.accept(get());
             } else {
                 get().remove(index);
@@ -56,15 +56,15 @@ public List<String> onComplete(CommandSender sender, Arguments arguments) {
         } else if (arguments.is(0, ADD) || arguments.is(0, REPLACE)) {
             // avoid suggesting more than necessary
             Arguments data = arguments.subArguments(arguments.is(0, ADD) ? 0 : 1);
-            List<String> suggestion = getType().complete(sender, data, null);
+            List<String> suggestion = propertyType.complete(sender, data, null);
             return arguments.size() -1 <= suggestion.size() ? suggestion : List.of();
         }
         return List.of();
     }
 
     @Override
     public void serialize(@Nonnull ConfigurationSection configuration) {
-        Optional.ofNullable(get()).ifPresent(value -> configuration.set(getName(), value.stream().map(getType()::serialize).toList()));
+        Optional.ofNullable(get()).ifPresent(value -> configuration.set(getName(), value.stream().map(propertyType::serialize).toList()));
     }
 
     @SuppressWarnings("unchecked")
@@ -73,7 +73,7 @@ public void deserialize(@Nonnull ConfigurationSection configuration) {
         List<Object> objects = (List<Object>) configuration.getList(getName());
 
         if (objects != null) {
-            set(objects.stream().map(object -> getType().deserialize(object)).collect(Collectors.toList()));
+            set(objects.stream().map(propertyType::deserialize).collect(Collectors.toList()));
         } else {
             set(new ArrayList<>(getDefault()));
         }
@@ -82,14 +82,14 @@ public void deserialize(@Nonnull ConfigurationSection configuration) {
     @Override
     public boolean equals(Object object) {
         if (object instanceof ListProperty<?> property) {
-            return property.name.equals(name) && property.type.getType().equals(type.getType());
+            return property.name.equals(name) && property.propertyType.getType().equals(propertyType.getType());
         }
         return super.equals(object);
     }
 
     @Override
     public String toString() {
-        return isSet() ? get().stream().map(getType()::print).collect(Collectors.joining(", ")) : "<empty>";
+        return isSet() ? get().stream().map(propertyType::print).collect(Collectors.joining(", ")) : "<empty>";
     }
 
     public static <T> Builder<T> create(PropertyType<T> type, String name, Supplier<List<T>> defaultValue) {

src/main/java/net/azalealibrary/configuration/property/Property.java

@@ -19,31 +19,31 @@ private Property(PropertyType<T> type, Supplier<T> defaultValue, String name, Li
 
     @Override
     protected void set(CommandSender sender, Arguments arguments) {
-        set(verify(getType().parse(sender, arguments, get())));
+        set(verify(propertyType.parse(sender, arguments, get())));
         callback.accept(get());
     }
 
     @Override
     public void serialize(@Nonnull ConfigurationSection configuration) {
-        Optional.ofNullable(get()).ifPresent(value -> configuration.set(getName(), getType().serialize(value)));
+        Optional.ofNullable(get()).ifPresent(value -> configuration.set(getName(), propertyType.serialize(value)));
     }
 
     @Override
     public void deserialize(@Nonnull ConfigurationSection configuration) {
-        Optional.ofNullable(configuration.get(getName())).ifPresent(object -> set(getType().deserialize(object)));
+        Optional.ofNullable(configuration.get(getName())).ifPresent(object -> set(propertyType.deserialize(object)));
     }
 
     @Override
     public boolean equals(Object object) {
         if (object instanceof Property<?> property) {
-            return property.name.equals(name) && property.type.getType().equals(type.getType());
+            return property.name.equals(name) && property.propertyType.getType().equals(propertyType.getType());
         }
         return super.equals(object);
     }
 
     @Override
     public String toString() {
-        return isSet() ? getType().print(get()) : "<empty>";
+        return isSet() ? propertyType.print(get()) : "<empty>";
     }
 
     public static <T> Builder<T> create(PropertyType<T> type, String name, Supplier<T> defaultValue) {