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

refactor(core): restructure MethodProcessors
All checks were successful
github-mirror / push-github (push) Successful in 4s
Details
Build / Gradle-Build (push) Successful in 4m46s
Details
Test / Gradle-Test (push) Successful in 4m57s
Details

Browse Source
This commit is contained in:
tueem 2025-04-07 00:35:06 +02:00
parent 60ead419e2
commit 070319853a
Signed by: tueem
GPG Key ID: 65C8667EC17A88FB
11 changed files with 120 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/src/main/java/net/tomatentum/marinara/Marinara.java
View File

@ -5,13 +5,14 @@ import org.slf4j.Logger;
import net.tomatentum.marinara.interaction.InteractionType;
import net.tomatentum.marinara.interaction.processor.AutocompleteInteractionProcessor;
import net.tomatentum.marinara.interaction.processor.DirectInteractionProcessor;
import net.tomatentum.marinara.reflection.MethodExecutor;
import net.tomatentum.marinara.reflection.ProcessorMethodExecutor;
import net.tomatentum.marinara.reflection.ReflectedMethodFactory;
import net.tomatentum.marinara.reflection.ReflectedMethodFactoryImpl;
import net.tomatentum.marinara.registry.InteractionCheckRegistry;
import net.tomatentum.marinara.registry.InteractionExecutor;
import net.tomatentum.marinara.registry.InteractionRegistry;
import net.tomatentum.marinara.registry.ProcessorInteractionExecutor;
import net.tomatentum.marinara.util.LoggerUtil;
import net.tomatentum.marinara.wrapper.IdentifierProvider;
import net.tomatentum.marinara.wrapper.LibraryWrapper;
public class Marinara {
@ -26,16 +27,17 @@ public class Marinara {
private ReflectedMethodFactory reflectedMethodFactory;
private InteractionRegistry registry;
private InteractionCheckRegistry checkRegistry;
private InteractionExecutor interactionExecutor;
private MethodExecutor interactionExecutor;
private Marinara(LibraryWrapper wrapper) {
this.wrapper = wrapper;
this.reflectedMethodFactory = new ReflectedMethodFactoryImpl(this);
this.registry = new InteractionRegistry(this);
this.checkRegistry = new InteractionCheckRegistry();
this.interactionExecutor = new ProcessorInteractionExecutor(wrapper.createIdentifierProvider(), this)
.addProcessor(new DirectInteractionProcessor(InteractionType.COMMAND, InteractionType.BUTTON))
.addProcessor(new AutocompleteInteractionProcessor());
IdentifierProvider provider = wrapper.createIdentifierProvider();
this.interactionExecutor = (MethodExecutor) new ProcessorMethodExecutor()
.addProcessor(new DirectInteractionProcessor(getRegistry(), provider, InteractionType.COMMAND, InteractionType.BUTTON))
.addProcessor(new AutocompleteInteractionProcessor(this, provider));
wrapper.subscribeInteractions(this.interactionExecutor::handle);
logger.info("Marinara loaded successfully!");
}
@ -56,7 +58,7 @@ public class Marinara {
return this.reflectedMethodFactory;
}
public InteractionExecutor getInteractionExecutor() {
public MethodExecutor getInteractionExecutor() {
return interactionExecutor;
}

21
lib/src/main/java/net/tomatentum/marinara/interaction/processor/AutocompleteInteractionProcessor.java
View File

@ -4,24 +4,31 @@ import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import net.tomatentum.marinara.Marinara;
import net.tomatentum.marinara.interaction.InteractionType;
import net.tomatentum.marinara.interaction.ident.InteractionIdentifier;
import net.tomatentum.marinara.interaction.ident.SlashCommandIdentifier;
import net.tomatentum.marinara.registry.InteractionEntry;
import net.tomatentum.marinara.wrapper.IdentifierProvider;
public class AutocompleteInteractionProcessor implements InteractionProcessor {
public class AutocompleteInteractionProcessor extends InteractionMethodProcessor {
private Marinara marinara;
public AutocompleteInteractionProcessor(Marinara marinara, IdentifierProvider provider) {
super(provider, Set.of(InteractionType.AUTOCOMPLETE));
this.marinara = marinara;
}
@Override
public void process(Object context, InteractionIdentifier identifier, Marinara marinara) {
if (!identifier.type().equals(InteractionType.AUTOCOMPLETE))
return;
Optional<InteractionEntry> entry = marinara.getRegistry().findFor(convertToCommandIdentifier(identifier));
public void processInteraction(Object context, InteractionIdentifier identifier) {
Optional<InteractionEntry> entry = this.marinara.getRegistry().findFor(convertToCommandIdentifier(identifier));
if (entry.isPresent() && entry.get().identifier() instanceof SlashCommandIdentifier sIdent) {
List<String> autocompleteRefs = Arrays.asList(marinara.getWrapper().getContextObjectProvider()
List<String> autocompleteRefs = Arrays.asList(this.marinara.getWrapper().getContextObjectProvider()
.getAutocompleteFocusedOption(context).getAutocompleteRefs(sIdent.options()));
List<Object> results = marinara.getRegistry().interactions().stream()
List<Object> results = this.marinara.getRegistry().interactions().stream()
.filter(e -> e.type().equals(InteractionType.AUTOCOMPLETE))
.filter(e -> autocompleteRefs.contains(e.identifier().name()))
.map(e -> e.runAll(context))

23
lib/src/main/java/net/tomatentum/marinara/interaction/processor/DirectInteractionProcessor.java
View File

@ -2,28 +2,23 @@ package net.tomatentum.marinara.interaction.processor;
import java.util.Set;
import org.slf4j.Logger;
import net.tomatentum.marinara.Marinara;
import net.tomatentum.marinara.interaction.InteractionType;
import net.tomatentum.marinara.interaction.ident.InteractionIdentifier;
import net.tomatentum.marinara.util.LoggerUtil;
import net.tomatentum.marinara.registry.InteractionRegistry;
import net.tomatentum.marinara.wrapper.IdentifierProvider;
public class DirectInteractionProcessor implements InteractionProcessor {
public class DirectInteractionProcessor extends InteractionMethodProcessor {
private Logger logger = LoggerUtil.getLogger(getClass());
private Set<InteractionType> types;
private InteractionRegistry registry;
public DirectInteractionProcessor(InteractionType... types) {
this.types = Set.of(types);
public DirectInteractionProcessor(InteractionRegistry registry, IdentifierProvider provider, InteractionType... types) {
super(provider, Set.of(types));
this.registry = registry;
}
@Override
public void process(Object context, InteractionIdentifier identifier, Marinara marinara) {
if (!types.contains(identifier.type()))
return;
logger.debug("Processing {} : {} with context {}", identifier, identifier.type(), context);
marinara.getRegistry().interactions().stream()
protected void processInteraction(Object context, InteractionIdentifier identifier) {
this.registry.interactions().stream()
.filter(e -> e.identifier().equals(identifier))
.findFirst()
.ifPresent(e -> e.runAll(context));

35
lib/src/main/java/net/tomatentum/marinara/interaction/processor/InteractionMethodProcessor.java Normal file
View File

@ -0,0 +1,35 @@
package net.tomatentum.marinara.interaction.processor;
import java.util.Set;
import org.slf4j.Logger;
import net.tomatentum.marinara.interaction.InteractionType;
import net.tomatentum.marinara.interaction.ident.InteractionIdentifier;
import net.tomatentum.marinara.reflection.MethodProcessor;
import net.tomatentum.marinara.util.LoggerUtil;
import net.tomatentum.marinara.wrapper.IdentifierProvider;
public abstract class InteractionMethodProcessor implements MethodProcessor {
private Logger logger = LoggerUtil.getLogger(getClass());
private IdentifierProvider provider;
private Set<InteractionType> types;
protected InteractionMethodProcessor(IdentifierProvider provider, Set<InteractionType> types) {
this.provider = provider;
this.types = types;
}
@Override
public void process(Object context) {
InteractionIdentifier identifier = this.provider.provide(context);
if (!this.types.contains(identifier.type())) return;
logger.debug("Processing {} : {} with context {}", identifier, identifier.type(), context);
this.processInteraction(context, identifier);
}
protected abstract void processInteraction(Object context, InteractionIdentifier identifier);
}

10
lib/src/main/java/net/tomatentum/marinara/interaction/processor/InteractionProcessor.java
View File

@ -1,10 +0,0 @@
package net.tomatentum.marinara.interaction.processor;
import net.tomatentum.marinara.Marinara;
import net.tomatentum.marinara.interaction.ident.InteractionIdentifier;
public interface InteractionProcessor {
void process(Object context, InteractionIdentifier identifier, Marinara marinara);
}

7
lib/src/main/java/net/tomatentum/marinara/reflection/MethodExecutor.java Normal file
View File

@ -0,0 +1,7 @@
package net.tomatentum.marinara.reflection;
public interface MethodExecutor {
void handle(Object context);
}

7
lib/src/main/java/net/tomatentum/marinara/reflection/MethodProcessor.java Normal file
View File

@ -0,0 +1,7 @@
package net.tomatentum.marinara.reflection;
public interface MethodProcessor {
void process(Object context);
}

7
lib/src/main/java/net/tomatentum/marinara/reflection/ProcessorContainer.java Normal file
View File

@ -0,0 +1,7 @@
package net.tomatentum.marinara.reflection;
public interface ProcessorContainer {
ProcessorContainer addProcessor(MethodProcessor processor);
}

32
lib/src/main/java/net/tomatentum/marinara/reflection/ProcessorMethodExecutor.java Normal file
View File

@ -0,0 +1,32 @@
package net.tomatentum.marinara.reflection;
import java.util.HashSet;
import java.util.Set;
import org.slf4j.Logger;
import net.tomatentum.marinara.util.LoggerUtil;
public class ProcessorMethodExecutor implements MethodExecutor, ProcessorContainer {
private Logger logger = LoggerUtil.getLogger(getClass());
private Set<MethodProcessor> processors;
public ProcessorMethodExecutor() {
this.processors = new HashSet<>();
}
@Override
public ProcessorContainer addProcessor(MethodProcessor processor) {
processors.add(processor);
return this;
}
@Override
public void handle(Object context) {
logger.debug("Received {} interaction ", context);
processors.forEach(x -> x.process(context));
}
}

7
lib/src/main/java/net/tomatentum/marinara/registry/InteractionExecutor.java
View File

@ -1,7 +0,0 @@
package net.tomatentum.marinara.registry;
public interface InteractionExecutor {
void handle(Object context);
}

41
lib/src/main/java/net/tomatentum/marinara/registry/ProcessorInteractionExecutor.java
View File

@ -1,41 +0,0 @@
package net.tomatentum.marinara.registry;
import java.util.HashSet;
import java.util.Set;
import org.slf4j.Logger;
import net.tomatentum.marinara.Marinara;
import net.tomatentum.marinara.interaction.ident.InteractionIdentifier;
import net.tomatentum.marinara.interaction.processor.InteractionProcessor;
import net.tomatentum.marinara.util.LoggerUtil;
import net.tomatentum.marinara.wrapper.IdentifierProvider;
public class ProcessorInteractionExecutor implements InteractionExecutor {
private Logger logger = LoggerUtil.getLogger(getClass());
private Set<InteractionProcessor> processors;
private IdentifierProvider identifierProvider;
private Marinara marinara;
public ProcessorInteractionExecutor(IdentifierProvider identifierProvider, Marinara marinara) {
this.processors = new HashSet<>();
this.identifierProvider = identifierProvider;
this.marinara = marinara;
}
public ProcessorInteractionExecutor addProcessor(InteractionProcessor processor) {
this.processors.add(processor);
return this;
}
@Override
public void handle(Object context) {
logger.debug("Received {} interaction ", context);
InteractionIdentifier identifier = this.identifierProvider.provide(context);
logger.debug("Processing {} : {} interaction ", identifier, identifier.type());
processors.forEach(x -> x.process(context, identifier, this.marinara));
}
}