Fix code style inconsistencies

Author: rchomczyk

honey-common/src/dev/shiza/honey/adventure/AdventureHoneyBuilder.java

@@ -1,15 +1,25 @@
 package dev.shiza.honey.adventure;
 
 import dev.shiza.honey.builder.HoneyBaseBuilder;
+import dev.shiza.honey.builder.HoneyBuilder;
 import dev.shiza.honey.message.MessageCompiler;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.minimessage.MiniMessage;
 
 final class AdventureHoneyBuilder extends HoneyBaseBuilder<Component, AdventureHoney> {
 
-  AdventureHoneyBuilder(final MessageCompiler<Component> messageCompiler) {
+  private AdventureHoneyBuilder(final MessageCompiler<Component> messageCompiler) {
     super(messageCompiler);
   }
 
+  public static HoneyBuilder<Component, AdventureHoney> builder() {
+    return new AdventureHoneyBuilder(AdventureMessageCompilerFactory.create());
+  }
+
+  public static HoneyBuilder<Component, AdventureHoney> builder(final MiniMessage miniMessage) {
+    return new AdventureHoneyBuilder(AdventureMessageCompilerFactory.create(miniMessage));
+  }
+
   @Override
   public AdventureHoney build() {
     return new AdventureHoneyImpl(

honey-common/src/dev/shiza/honey/adventure/AdventureHoneyFactory.java

@@ -12,7 +12,7 @@
 import java.util.function.Consumer;
 import net.kyori.adventure.text.Component;
 
-class AdventureHoneyImpl extends HoneyImpl<Component> implements AdventureHoney {
+final class AdventureHoneyImpl extends HoneyImpl<Component> implements AdventureHoney {
 
   AdventureHoneyImpl(
       final MessageCompiler<Component> messageCompiler,

honey-common/src/dev/shiza/honey/adventure/AdventureHoneyImpl.java

@@ -12,7 +12,7 @@
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.intellij.lang.annotations.Subst;
 
-class AdventureMessageCompiler implements MessageCompiler<Component> {
+final class AdventureMessageCompiler implements MessageCompiler<Component> {
 
   private final MiniMessage miniMessage;
 

honey-common/src/dev/shiza/honey/adventure/AdventureMessageCompiler.java

@@ -6,9 +6,12 @@
 import dev.shiza.honey.placeholder.evaluator.PlaceholderContext;
 import dev.shiza.honey.placeholder.evaluator.PlaceholderEvaluator;
 import dev.shiza.honey.placeholder.resolver.PlaceholderResolver;
+import dev.shiza.honey.placeholder.resolver.PlaceholderResolverFactory;
 import dev.shiza.honey.placeholder.sanitizer.PlaceholderSanitizer;
+import dev.shiza.honey.placeholder.sanitizer.PlaceholderSanitizerFactory;
 import dev.shiza.honey.processor.ProcessorRegistry;
-import dev.shiza.honey.reflection.ReflectivePlaceholderEvaluatorFactory;
+import dev.shiza.honey.processor.ProcessorRegistryFactory;
+import dev.shiza.honey.placeholder.evaluator.reflection.ReflectivePlaceholderEvaluatorFactory;
 import org.jetbrains.annotations.ApiStatus.Internal;
 
 @Internal
@@ -44,10 +47,10 @@ protected HoneyBaseBuilder(final MessageCompiler<T> messageCompiler) {
         messageCompiler,
         ImplicitConversion.create(),
         PlaceholderContext.create(),
-        PlaceholderResolver.create(),
-        PlaceholderSanitizer.create(),
+        PlaceholderResolverFactory.create(),
+        PlaceholderSanitizerFactory.create(),
         ReflectivePlaceholderEvaluatorFactory.create(),
-        ProcessorRegistry.create());
+        ProcessorRegistryFactory.create());
   }
 
   @Override

honey-common/src/dev/shiza/honey/builder/HoneyBaseBuilder.java

@@ -26,6 +26,9 @@ public static ImplicitConversion create(final ImplicitConversionUnit... units) {
 
   public <T> T convert(final Object value) {
     Object currentValue = value;
+    if (currentValue == null) {
+      return null;
+    }
 
     boolean conversionFound;
     do {

honey-common/src/dev/shiza/honey/conversion/ImplicitConversion.java

@@ -6,7 +6,7 @@
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
-public class PlaceholderContext {
+public final class PlaceholderContext {
 
   private final Map<String, Object> values;
   private final Map<String, CompletableFuture<?>> promisedValues;

honey-common/src/dev/shiza/honey/placeholder/evaluator/PlaceholderContext.java

@@ -1,6 +1,6 @@
-package dev.shiza.honey.reflection;
+package dev.shiza.honey.placeholder.evaluator.reflection;
 
-public class ReflectivePlaceholderEvaluationException extends RuntimeException {
+public final class ReflectivePlaceholderEvaluationException extends RuntimeException {
 
   public ReflectivePlaceholderEvaluationException(final String message) {
     super(message);

…ctivePlaceholderEvaluationException.java …ctivePlaceholderEvaluationException.javahoney-common/src/dev/shiza/honey/reflection/ReflectivePlaceholderEvaluationException.java renamed to honey-common/src/dev/shiza/honey/placeholder/evaluator/reflection/ReflectivePlaceholderEvaluationException.java honey-common/src/dev/shiza/honey/reflection/ReflectivePlaceholderEvaluationException.java renamed to honey-common/src/dev/shiza/honey/placeholder/evaluator/reflection/ReflectivePlaceholderEvaluationException.java

@@ -1,4 +1,4 @@
-package dev.shiza.honey.reflection;
+package dev.shiza.honey.placeholder.evaluator.reflection;
 
 import dev.shiza.honey.placeholder.evaluator.EvaluatedPlaceholder;
 import dev.shiza.honey.placeholder.evaluator.PlaceholderContext;
@@ -13,7 +13,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-class ReflectivePlaceholderEvaluator implements PlaceholderEvaluator {
+final class ReflectivePlaceholderEvaluator implements PlaceholderEvaluator {
 
   private static final Pattern PATH_PATTERN = Pattern.compile("([a-zA-Z_]\\w*)");
   private static final MethodHandles.Lookup LOOKUP = MethodHandles.lookup();

…tion/ReflectivePlaceholderEvaluator.java …tion/ReflectivePlaceholderEvaluator.javahoney-common/src/dev/shiza/honey/reflection/ReflectivePlaceholderEvaluator.java renamed to honey-common/src/dev/shiza/honey/placeholder/evaluator/reflection/ReflectivePlaceholderEvaluator.java honey-common/src/dev/shiza/honey/reflection/ReflectivePlaceholderEvaluator.java renamed to honey-common/src/dev/shiza/honey/placeholder/evaluator/reflection/ReflectivePlaceholderEvaluator.java

@@ -1,10 +1,10 @@
-package dev.shiza.honey.reflection;
+package dev.shiza.honey.placeholder.evaluator.reflection;
 
 import dev.shiza.honey.placeholder.evaluator.PlaceholderEvaluator;
 
 public final class ReflectivePlaceholderEvaluatorFactory {
 
-  ReflectivePlaceholderEvaluatorFactory() {}
+  private ReflectivePlaceholderEvaluatorFactory() {}
 
   public static PlaceholderEvaluator create() {
     return new ReflectivePlaceholderEvaluator();