Merge pull request #2 from Hippo/development

Numerous improvements
Hippo · Nov 22, 2020 · 4a9911a · 4a9911a
2 parents 200fddf + 7cfc101
commit 4a9911a
Show file tree

Hide file tree

Showing 58 changed files with 449 additions and 420 deletions.
diff --git a/build.gradle b/build.gradle
@@ -16,12 +16,11 @@
  */
 plugins {
     id 'java'
-    id 'maven'
     id 'maven-publish'
 }
 
-group 'com.github.Hippah'
-version '5.1.0'
+group 'rip.hippo'
+version '5.1.1'
 
 sourceCompatibility = 1.8
 
@@ -30,8 +29,9 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.ow2.asm', name: 'asm', version: '7.1'
-    compile group: 'org.ow2.asm', name: 'asm-tree', version: '7.1'
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    compile group: 'org.ow2.asm', name: 'asm', version: '9.0'
+    compile group: 'org.ow2.asm', name: 'asm-tree', version: '9.0'
 }
 
 publishing {

diff --git a/gradlew b/gradlew
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

diff --git a/gradlew.bat b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

diff --git a/...me/hippo/api/lwjeb/annotation/Filter.java → ...va/rip/hippo/lwjeb/annotation/Filter.java b/...me/hippo/api/lwjeb/annotation/Filter.java → ...va/rip/hippo/lwjeb/annotation/Filter.java
@@ -15,17 +15,15 @@
  *
  */
 
-package me.hippo.api.lwjeb.annotation;
+package rip.hippo.lwjeb.annotation;
 
 
-import me.hippo.api.lwjeb.filter.MessageFilter;
-import me.hippo.api.lwjeb.message.handler.MessageHandler;
+import rip.hippo.lwjeb.filter.MessageFilter;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.util.function.Predicate;
 
 /**
  * @author Hippo

diff --git a/...e/hippo/api/lwjeb/annotation/Handler.java → ...a/rip/hippo/lwjeb/annotation/Handler.java b/...e/hippo/api/lwjeb/annotation/Handler.java → ...a/rip/hippo/lwjeb/annotation/Handler.java
@@ -15,7 +15,7 @@
  *
  */
 
-package me.hippo.api.lwjeb.annotation;
+package rip.hippo.lwjeb.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...e/hippo/api/lwjeb/annotation/Wrapped.java → ...a/rip/hippo/lwjeb/annotation/Wrapped.java b/...e/hippo/api/lwjeb/annotation/Wrapped.java → ...a/rip/hippo/lwjeb/annotation/Wrapped.java
@@ -15,7 +15,7 @@
  *
  */
 
-package me.hippo.api.lwjeb.annotation;
+package rip.hippo.lwjeb.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...AbstractAsynchronousPubSubMessageBus.java → ...AbstractAsynchronousPubSubMessageBus.java b/...AbstractAsynchronousPubSubMessageBus.java → ...AbstractAsynchronousPubSubMessageBus.java
@@ -15,15 +15,15 @@
  *
  */
 
-package me.hippo.api.lwjeb.bus;
+package rip.hippo.lwjeb.bus;
 
-import me.hippo.api.lwjeb.bus.publish.AsynchronousPublishMessageBus;
-import me.hippo.api.lwjeb.bus.subscribe.SubscribeMessageBus;
-import me.hippo.api.lwjeb.configuration.BusConfigurations;
-import me.hippo.api.lwjeb.configuration.config.impl.AsynchronousPublicationConfiguration;
-import me.hippo.api.lwjeb.configuration.config.impl.BusConfiguration;
-import me.hippo.api.lwjeb.configuration.config.impl.ExceptionHandlingConfiguration;
-import me.hippo.api.lwjeb.message.result.MessagePublicationResult;
+import rip.hippo.lwjeb.bus.publish.AsynchronousPublishMessageBus;
+import rip.hippo.lwjeb.bus.subscribe.SubscribeMessageBus;
+import rip.hippo.lwjeb.configuration.BusConfigurations;
+import rip.hippo.lwjeb.configuration.config.impl.AsynchronousPublicationConfiguration;
+import rip.hippo.lwjeb.configuration.config.impl.BusConfiguration;
+import rip.hippo.lwjeb.configuration.config.impl.ExceptionHandlingConfiguration;
+import rip.hippo.lwjeb.message.result.MessagePublicationResult;
 
 import java.util.*;
 import java.util.concurrent.*;
@@ -108,7 +108,8 @@ public void setupDispatchers() {
                     }
                 }
             });
-            thread.setName(String.format("(%s) Dispatch - %d", getIdentifier(), i));
+            thread.setName(String.format("(%s) Dispatch - %d", busConfiguration.getIdentifier(), i));
+            thread.setDaemon(asynchronousPublicationConfiguration.useDaemonThreads());
             thread.start();
             dispatchers.add(thread);
         }
@@ -148,7 +149,7 @@ public void shutdown(int delay, TimeUnit timeUnit) {
                 for (Thread dispatcher : dispatchers) {
                     dispatcher.interrupt();
                 }
-            }, String.format("(%s) Shutdown", getIdentifier())).start();
+            }, String.format("(%s) Shutdown", busConfiguration.getIdentifier())).start();
         }, delay, timeUnit);
         scheduledExecutorService.shutdown();
     }

diff --git a/...va/me/hippo/api/lwjeb/bus/MessageBus.java → .../java/rip/hippo/lwjeb/bus/MessageBus.java b/...va/me/hippo/api/lwjeb/bus/MessageBus.java → .../java/rip/hippo/lwjeb/bus/MessageBus.java
@@ -15,9 +15,9 @@
  *
  */
 
-package me.hippo.api.lwjeb.bus;
+package rip.hippo.lwjeb.bus;
 
-import me.hippo.api.lwjeb.configuration.BusConfigurations;
+import rip.hippo.lwjeb.configuration.BusConfigurations;
 
 /**
  * @author Hippo
@@ -34,13 +34,4 @@ public interface MessageBus {
      * @return
      */
     BusConfigurations getConfigurations();
-
-    /**
-     * Gets the identifier, you can use this to identify multiple different busses.
-     *
-     * @return  The identifier.
-     */
-    default String getIdentifier() {
-        return "LWJEB";
-    }
 }
diff --git a/...n/java/me/hippo/api/lwjeb/bus/PubSub.java → ...main/java/rip/hippo/lwjeb/bus/PubSub.java b/...n/java/me/hippo/api/lwjeb/bus/PubSub.java → ...main/java/rip/hippo/lwjeb/bus/PubSub.java
@@ -15,13 +15,13 @@
  *
  */
 
-package me.hippo.api.lwjeb.bus;
+package rip.hippo.lwjeb.bus;
 
-import me.hippo.api.lwjeb.configuration.BusConfigurations;
-import me.hippo.api.lwjeb.configuration.config.impl.BusPubSubConfiguration;
-import me.hippo.api.lwjeb.message.publish.MessagePublisher;
-import me.hippo.api.lwjeb.message.result.MessagePublicationResult;
-import me.hippo.api.lwjeb.subscribe.ListenerSubscriber;
+import rip.hippo.lwjeb.configuration.BusConfigurations;
+import rip.hippo.lwjeb.configuration.config.impl.BusPubSubConfiguration;
+import rip.hippo.lwjeb.message.publish.MessagePublisher;
+import rip.hippo.lwjeb.message.result.MessagePublicationResult;
+import rip.hippo.lwjeb.subscribe.ListenerSubscriber;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...ublish/AsynchronousPublishMessageBus.java → ...ublish/AsynchronousPublishMessageBus.java b/...ublish/AsynchronousPublishMessageBus.java → ...ublish/AsynchronousPublishMessageBus.java
@@ -15,10 +15,10 @@
  *
  */
 
-package me.hippo.api.lwjeb.bus.publish;
+package rip.hippo.lwjeb.bus.publish;
 
 
-import me.hippo.api.lwjeb.message.result.MessagePublicationResult;
+import rip.hippo.lwjeb.message.result.MessagePublicationResult;
 
 import java.util.concurrent.TimeUnit;
 

diff --git a/.../lwjeb/bus/publish/PublishMessageBus.java → .../lwjeb/bus/publish/PublishMessageBus.java b/.../lwjeb/bus/publish/PublishMessageBus.java → .../lwjeb/bus/publish/PublishMessageBus.java
@@ -15,10 +15,10 @@
  *
  */
 
-package me.hippo.api.lwjeb.bus.publish;
+package rip.hippo.lwjeb.bus.publish;
 
-import me.hippo.api.lwjeb.bus.MessageBus;
-import me.hippo.api.lwjeb.message.publish.MessagePublisher;
+import rip.hippo.lwjeb.bus.MessageBus;
+import rip.hippo.lwjeb.message.publish.MessagePublisher;
 
 /**
  * @author Hippo

diff --git a/...eb/bus/subscribe/SubscribeMessageBus.java → ...eb/bus/subscribe/SubscribeMessageBus.java b/...eb/bus/subscribe/SubscribeMessageBus.java → ...eb/bus/subscribe/SubscribeMessageBus.java
@@ -15,10 +15,10 @@
  *
  */
 
-package me.hippo.api.lwjeb.bus.subscribe;
+package rip.hippo.lwjeb.bus.subscribe;
 
-import me.hippo.api.lwjeb.bus.MessageBus;
-import me.hippo.api.lwjeb.subscribe.ListenerSubscriber;
+import rip.hippo.lwjeb.bus.MessageBus;
+import rip.hippo.lwjeb.subscribe.ListenerSubscriber;
 
 /**
  * @author Hippo

diff --git a/...wjeb/configuration/BusConfigurations.java → ...wjeb/configuration/BusConfigurations.java b/...wjeb/configuration/BusConfigurations.java → ...wjeb/configuration/BusConfigurations.java
@@ -15,12 +15,15 @@
  *
  */
 
-package me.hippo.api.lwjeb.configuration;
+package rip.hippo.lwjeb.configuration;
 
 
-import me.hippo.api.lwjeb.configuration.config.Configuration;
-import me.hippo.api.lwjeb.configuration.config.impl.*;
-import me.hippo.api.lwjeb.configuration.exception.BusConfigurationException;
+import rip.hippo.lwjeb.configuration.config.Configuration;
+import rip.hippo.lwjeb.configuration.exception.BusConfigurationException;
+import rip.hippo.lwjeb.configuration.config.impl.AsynchronousPublicationConfiguration;
+import rip.hippo.lwjeb.configuration.config.impl.BusConfiguration;
+import rip.hippo.lwjeb.configuration.config.impl.BusPubSubConfiguration;
+import rip.hippo.lwjeb.configuration.config.impl.ExceptionHandlingConfiguration;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...b/configuration/config/Configuration.java → ...b/configuration/config/Configuration.java b/...b/configuration/config/Configuration.java → ...b/configuration/config/Configuration.java
@@ -15,7 +15,7 @@
  *
  */
 
-package me.hippo.api.lwjeb.configuration.config;
+package rip.hippo.lwjeb.configuration.config;
 
 /**
  * @author Hippo

diff --git a/...AsynchronousPublicationConfiguration.java → ...AsynchronousPublicationConfiguration.java b/...AsynchronousPublicationConfiguration.java → ...AsynchronousPublicationConfiguration.java
@@ -15,9 +15,9 @@
  *
  */
 
-package me.hippo.api.lwjeb.configuration.config.impl;
+package rip.hippo.lwjeb.configuration.config.impl;
 
-import me.hippo.api.lwjeb.configuration.config.Configuration;
+import rip.hippo.lwjeb.configuration.config.Configuration;
 
 /**
  * @author Hippo
@@ -38,6 +38,11 @@ public final class AsynchronousPublicationConfiguration implements Configuration
      */
     private boolean suppressDispatcherInterrupt;
 
+    /**
+     * Weather to use daemon threads.
+     */
+    private boolean daemonThreads;
+
     /**
      * Gets the default configuration.
      *
@@ -55,6 +60,7 @@ public AsynchronousPublicationConfiguration provideDefault() {
         AsynchronousPublicationConfiguration configuration = new AsynchronousPublicationConfiguration();
         configuration.setDispatcherCount(3);
         configuration.setSuppressDispatcherInterrupt(true);
+        configuration.setDaemonThreads(false);
         return configuration;
     }
 
@@ -97,4 +103,22 @@ public boolean isSuppressDispatcherInterrupt() {
     public void setSuppressDispatcherInterrupt(boolean suppressDispatcherInterrupt) {
         this.suppressDispatcherInterrupt = suppressDispatcherInterrupt;
     }
+
+    /**
+     * Gets weather to use daemon threads.
+     *
+     * @return  If the threads should be daemon.
+     */
+    public boolean useDaemonThreads() {
+        return daemonThreads;
+    }
+
+    /**
+     * Sets weather the bus should be use daemon threads.
+     *
+     * @param daemonThreads  If they should use daemon threads.
+     */
+    public void setDaemonThreads(boolean daemonThreads) {
+        this.daemonThreads = daemonThreads;
+    }
 }