tueem/Marinara
1
1
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

improve wrapper and general structure #16

Merged
tueem merged 23 commits from improve/structure into dev 2025-03-17 08:26:44 +00:00
Conversation 1 Commits 23 Files Changed 36 +23 -7
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7287d44645 - Show all commits

3
lib/src/main/java/net/tomatentum/marinara/registry/InteractionRegistry.java
View File

@ -1,6 +1,7 @@
package net.tomatentum.marinara.registry; package net.tomatentum.marinara.registry;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@ -57,7 +58,7 @@ public class InteractionRegistry {
.toList(); .toList();
SlashCommandDefinition[] defs = new ObjectAggregator<InteractionIdentifier, RootCommandIdentifier, SlashCommandDefinition>( SlashCommandDefinition[] defs = new ObjectAggregator<InteractionIdentifier, RootCommandIdentifier, SlashCommandDefinition>(
i -> (RootCommandIdentifier)i.rootNode(), i -> Arrays.asList((RootCommandIdentifier)i.rootNode()),
SlashCommandDefinition::addIdentifier, SlashCommandDefinition::addIdentifier,
SlashCommandDefinition::new) SlashCommandDefinition::new)
.aggregate(slashIdentifiers) .aggregate(slashIdentifiers)

21
lib/src/main/java/net/tomatentum/marinara/util/ObjectAggregator.java
View File

@ -5,26 +5,41 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier;
public class ObjectAggregator<O, K, V> { public class ObjectAggregator<O, K, V> {
private Function<O, K> keySupplier; private Function<O, Iterable<K>> keySupplier;
private BiConsumer<V, O> valueConsumer; private BiConsumer<V, O> valueConsumer;
private Function<K, V> defaultGenerator; private Function<K, V> defaultGenerator;
public ObjectAggregator(Function<O, K> keySupplier, BiConsumer<V, O> valueConsumer, Function<K, V> defaultGenerator) { public ObjectAggregator(
Function<O, Iterable<K>> keySupplier,
BiConsumer<V, O> valueConsumer,
Function<K, V> defaultGenerator) {
this.keySupplier = keySupplier; this.keySupplier = keySupplier;
this.valueConsumer = valueConsumer; this.valueConsumer = valueConsumer;
this.defaultGenerator = defaultGenerator; this.defaultGenerator = defaultGenerator;
} }
public ObjectAggregator(
Function<O, Iterable<K>> keySupplier,
BiConsumer<V, O> valueConsumer,
Supplier<V> defaultGenerator) {
this.keySupplier = keySupplier;
this.valueConsumer = valueConsumer;
this.defaultGenerator = _ -> defaultGenerator.get();
}
public Collection<V> aggregate(Iterable<O> iterator) { public Collection<V> aggregate(Iterable<O> iterator) {
Map<K, V> map = new HashMap<>(); Map<K, V> map = new HashMap<>();
for (O element : iterator) { for (O element : iterator) {
K key = this.keySupplier.apply(element); Iterable<K> keys = this.keySupplier.apply(element);
for (K key : keys) {
V value = map.getOrDefault(key, this.defaultGenerator.apply(key)); V value = map.getOrDefault(key, this.defaultGenerator.apply(key));
this.valueConsumer.accept(value, element); this.valueConsumer.accept(value, element);
map.putIfAbsent(key, value); map.putIfAbsent(key, value);
} }
}
return map.values(); return map.values();
} }