1
mirror of https://github.com/CarmJos/EasyConfiguration.git synced 2024-09-19 20:25:51 +00:00

style: improve code readability.

This commit is contained in:
Carm Jos 2023-02-19 19:54:08 +08:00
parent 6dc0447502
commit a66da01996
2 changed files with 45 additions and 45 deletions

View File

@ -54,6 +54,25 @@ public class ConfiguredList<V> extends CachedConfigValue<List<V>> implements Lis
else return new ArrayList<>();
}
@Override
public V get(int index) {
return get().get(index);
}
public <T> @NotNull T modifyValue(Function<List<V>, T> function) {
List<V> list = get();
T result = function.apply(list);
set(list);
return result;
}
public @NotNull List<V> modifyList(Consumer<List<V>> consumer) {
List<V> list = get();
consumer.accept(list);
set(list);
return list;
}
@Override
public void set(@Nullable List<V> value) {
updateCache(value);
@ -72,18 +91,9 @@ public class ConfiguredList<V> extends CachedConfigValue<List<V>> implements Lis
}
}
public <T> @NotNull T modifyValue(Function<List<V>, T> function) {
List<V> list = get();
T result = function.apply(list);
set(list);
return result;
}
public @NotNull List<V> modifyList(Consumer<List<V>> consumer) {
List<V> list = get();
consumer.accept(list);
set(list);
return list;
@Override
public V set(int index, V element) {
return modifyValue(list -> list.set(index, element));
}
@Override
@ -119,6 +129,11 @@ public class ConfiguredList<V> extends CachedConfigValue<List<V>> implements Lis
return get().toArray(a);
}
@Override
public boolean containsAll(@NotNull Collection<?> c) {
return new HashSet<>(get()).containsAll(c);
}
@Override
public boolean add(V v) {
modifyValue(list -> list.add(v));
@ -126,13 +141,8 @@ public class ConfiguredList<V> extends CachedConfigValue<List<V>> implements Lis
}
@Override
public boolean remove(Object o) {
return modifyValue(list -> list.remove(o));
}
@Override
public boolean containsAll(@NotNull Collection<?> c) {
return new HashSet<>(get()).containsAll(c);
public void add(int index, V element) {
modifyList(list -> list.add(index, element));
}
@Override
@ -145,6 +155,16 @@ public class ConfiguredList<V> extends CachedConfigValue<List<V>> implements Lis
return modifyValue(list -> list.addAll(index, c));
}
@Override
public boolean remove(Object o) {
return modifyValue(list -> list.remove(o));
}
@Override
public V remove(int index) {
return modifyValue(list -> list.remove(index));
}
@Override
public boolean removeAll(@NotNull Collection<?> c) {
return modifyValue(list -> list.removeAll(c));
@ -159,27 +179,7 @@ public class ConfiguredList<V> extends CachedConfigValue<List<V>> implements Lis
public void clear() {
modifyList(List::clear);
}
@Override
public V get(int index) {
return get().get(index);
}
@Override
public V set(int index, V element) {
return modifyValue(list -> list.set(index, element));
}
@Override
public void add(int index, V element) {
modifyList(list -> list.add(index, element));
}
@Override
public V remove(int index) {
return modifyValue(list -> list.remove(index));
}
@Override
public int indexOf(Object o) {
return get().indexOf(o);

View File

@ -102,6 +102,11 @@ public class ConfiguredMap<K, V> extends CachedConfigValue<Map<K, V>> implements
else return supplier.get();
}
@Override
public V get(Object key) {
return get().get(key);
}
@Override
public void set(@Nullable Map<K, V> value) {
updateCache(value);
@ -156,11 +161,6 @@ public class ConfiguredMap<K, V> extends CachedConfigValue<Map<K, V>> implements
return get().containsValue(value);
}
@Override
public V get(Object key) {
return get().get(key);
}
@Nullable
@Override
public V put(K key, V value) {