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

feat(struct): introduce ObjectAggregator

Browse Source
This commit is contained in:
tueem 2025-03-16 01:36:23 +01:00
parent 432cf78a2e
commit 4e27e6ce56
Signed by: tueem
GPG Key ID: 65C8667EC17A88FB
2 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,6 @@
package net.tomatentum.marinara.registry;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Optional;
@ -13,9 +12,10 @@ import net.tomatentum.marinara.Marinara;
import net.tomatentum.marinara.interaction.InteractionHandler;
import net.tomatentum.marinara.interaction.InteractionType;
import net.tomatentum.marinara.interaction.commands.SlashCommandDefinition;
import net.tomatentum.marinara.interaction.ident.InteractionIdentifier;
import net.tomatentum.marinara.interaction.ident.RootCommandIdentifier;
import net.tomatentum.marinara.interaction.ident.SlashCommandIdentifier;
import net.tomatentum.marinara.util.LoggerUtil;
import net.tomatentum.marinara.util.ObjectAggregator;
import net.tomatentum.marinara.wrapper.IdentifierProvider;
import net.tomatentum.marinara.interaction.methods.InteractionMethod;
@ -51,26 +51,19 @@ public class InteractionRegistry {
}
public void registerCommands() {
List<SlashCommandDefinition> defs = new ArrayList<>();
List<SlashCommandIdentifier> slashIdentifiers = interactions.stream()
List<InteractionIdentifier> slashIdentifiers = interactions.stream()
.filter((x) -> x.type().equals(InteractionType.COMMAND))
.map((x) -> (SlashCommandIdentifier)x.identifier())
.map((x) -> x.identifier())
.toList();
slashIdentifiers.forEach((ident) -> {
Optional<SlashCommandDefinition> appDef = defs.stream()
.filter((x) -> x.rootIdentifier().equals(ident.rootNode()))
.findFirst();
SlashCommandDefinition[] defs = new ObjectAggregator<InteractionIdentifier, RootCommandIdentifier, SlashCommandDefinition>(
i -> (RootCommandIdentifier)i.rootNode(),
SlashCommandDefinition::addIdentifier,
SlashCommandDefinition::new)
.aggregate(slashIdentifiers)
.toArray(SlashCommandDefinition[]::new);
if (appDef.isPresent())
appDef.get().addIdentifier(ident);
else
defs.add(
new SlashCommandDefinition((RootCommandIdentifier) ident.rootNode())
.addIdentifier(ident));
});
marinara.getWrapper().registerSlashCommands(defs.toArray(SlashCommandDefinition[]::new));
marinara.getWrapper().registerSlashCommands(defs);
logger.info("Registered all SlashCommands");
}

31
lib/src/main/java/net/tomatentum/marinara/util/ObjectAggregator.java Normal file
View File

@ -0,0 +1,31 @@
package net.tomatentum.marinara.util;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.function.Function;
public class ObjectAggregator<O, K, V> {
private Function<O, K> keySupplier;
private BiConsumer<V, O> valueConsumer;
private Function<K, V> defaultGenerator;
public ObjectAggregator(Function<O, K> keySupplier, BiConsumer<V, O> valueConsumer, Function<K, V> defaultGenerator) {
this.keySupplier = keySupplier;
this.valueConsumer = valueConsumer;
this.defaultGenerator = defaultGenerator;
}
public Collection<V> aggregate(Iterable<O> iterator) {
Map<K, V> map = new HashMap<>();
for (O element : iterator) {
K key = this.keySupplier.apply(element);
V value = map.getOrDefault(key, this.defaultGenerator.apply(key));
this.valueConsumer.accept(value, element);
map.putIfAbsent(key, value);
}
return map.values();
}
}