From 17b1662054dfe3247d93eecac85f2274ffb61ec9 Mon Sep 17 00:00:00 2001
From: LordMZTE <lord@mzte.de>
Date: Sat, 27 May 2023 19:09:26 +0200
Subject: [PATCH] fix: constructor invocation & empty messages

---
 build.gradle.kts                                             | 2 +-
 .../FormatStringAlecMessageGeneratorStrategy.java            | 5 ++++-
 .../implementations/PlainAlecMessageGeneratorStrategy.java   | 3 +++
 ...StandardConstructorAlecExceptionConstructionStrategy.java | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index a798fee..76b4859 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,7 +3,7 @@ import org.gradle.api.JavaVersion.VERSION_1_8
 val specTitle = "JAlec"
 val artifact = specTitle.lowercase()
 group = "net.anvilcraft"
-version = "0.1.1"
+version = "0.1.2"
 
 plugins {
     id("java")
diff --git a/src/main/java/net/anvilcraft/alec/jalec/strategies/implementations/FormatStringAlecMessageGeneratorStrategy.java b/src/main/java/net/anvilcraft/alec/jalec/strategies/implementations/FormatStringAlecMessageGeneratorStrategy.java
index 8d20349..be216a6 100644
--- a/src/main/java/net/anvilcraft/alec/jalec/strategies/implementations/FormatStringAlecMessageGeneratorStrategy.java
+++ b/src/main/java/net/anvilcraft/alec/jalec/strategies/implementations/FormatStringAlecMessageGeneratorStrategy.java
@@ -7,6 +7,9 @@ import net.anvilcraft.alec.jalec.strategies.interfaces.IAlecMessageGeneratorStra
 public class FormatStringAlecMessageGeneratorStrategy implements IAlecMessageGeneratorStrategy {
     @Override
     public String generateAlecMessage(Object... args) {
-        return String.format(args[0].toString(), Arrays.copyOfRange(args, 1, args.length));
+        String msg = String.format(args[0].toString(), Arrays.copyOfRange(args, 1, args.length));
+        if (msg.isEmpty())
+            return null;
+        return msg;
     }
 }
diff --git a/src/main/java/net/anvilcraft/alec/jalec/strategies/implementations/PlainAlecMessageGeneratorStrategy.java b/src/main/java/net/anvilcraft/alec/jalec/strategies/implementations/PlainAlecMessageGeneratorStrategy.java
index 69b5686..1789337 100644
--- a/src/main/java/net/anvilcraft/alec/jalec/strategies/implementations/PlainAlecMessageGeneratorStrategy.java
+++ b/src/main/java/net/anvilcraft/alec/jalec/strategies/implementations/PlainAlecMessageGeneratorStrategy.java
@@ -13,6 +13,9 @@ public class PlainAlecMessageGeneratorStrategy implements IAlecMessageGeneratorS
             }
         }
 
+        if (sb.length() == 0)
+            return null;
+
         return sb.toString();
     }
 }
diff --git a/src/main/java/net/anvilcraft/alec/jalec/strategies/implementations/StandardConstructorAlecExceptionConstructionStrategy.java b/src/main/java/net/anvilcraft/alec/jalec/strategies/implementations/StandardConstructorAlecExceptionConstructionStrategy.java
index acb72f3..7c63417 100644
--- a/src/main/java/net/anvilcraft/alec/jalec/strategies/implementations/StandardConstructorAlecExceptionConstructionStrategy.java
+++ b/src/main/java/net/anvilcraft/alec/jalec/strategies/implementations/StandardConstructorAlecExceptionConstructionStrategy.java
@@ -12,7 +12,7 @@ public class StandardConstructorAlecExceptionConstructionStrategy<E extends IAle
     public E constructAlecException(String message, Throwable cause, Class<E> alecExceptionClass) {
         try {
             Constructor<E> constructor
-                = alecExceptionClass.getConstructor(String.class, Throwable.class);
+                = alecExceptionClass.getDeclaredConstructor(String.class, Throwable.class);
 
             constructor.setAccessible(true);