Improve unsupported API access error message

mario-schwede-hivemq · mario-schwede-hivemq · commit be308c3a38b6 · 2025-09-24T11:14:05.000+02:00
diff --git a/src/main/java/com/hivemq/extension/sdk/api/services/Services.java b/src/main/java/com/hivemq/extension/sdk/api/services/Services.java
@@ -62,9 +62,7 @@
  */
 public class Services {
 
-    private static final String NO_ACCESS_MESSAGE =
-            "Static class Services cannot be called from a thread \"%s\" which" +
-                    " does not have a HiveMQ extension classloader as its context classloader.";
+    private static final @NotNull String NO_ACCESS_MESSAGE = "Only HiveMQ Extensions can access Services.";
 
     //this map is filled by HiveMQ with implementations for all services
     @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
@@ -169,17 +167,18 @@ public class Services {
     private static <T> @NotNull T getClassObject(final @NotNull Class<T> clazz) {
 
         if (services == null) {
-            throw new RuntimeException(String.format(NO_ACCESS_MESSAGE, Thread.currentThread().getName()));
+            throw new RuntimeException(NO_ACCESS_MESSAGE);
         }
 
         final Object object = services.get(clazz.getCanonicalName());
         if (object == null) {
             //don't cache this exception to keep the stacktrace, this is not expected to happen very often
-            throw new RuntimeException(String.format(NO_ACCESS_MESSAGE, Thread.currentThread().getName()));
+            throw new RuntimeException(NO_ACCESS_MESSAGE);
         }
         if (clazz.isInstance(object)) {
+            //noinspection unchecked
             return (T) object;
         }
-        throw new RuntimeException(String.format(NO_ACCESS_MESSAGE, Thread.currentThread().getName()));
+        throw new RuntimeException(NO_ACCESS_MESSAGE);
     }
 }
diff --git a/src/main/java/com/hivemq/extension/sdk/api/services/builder/Builders.java b/src/main/java/com/hivemq/extension/sdk/api/services/builder/Builders.java
@@ -44,9 +44,7 @@
  */
 public class Builders {
 
-    private static final String NO_ACCESS_MESSAGE =
-            "Static class Builders cannot be called from a thread \"%s\" which" +
-                    " does not have a HiveMQ extension classloader as its context classloader.";
+    private static final @NotNull String NO_ACCESS_MESSAGE = "Only HiveMQ Extensions can access Builders.";
 
     //this map is filled by HiveMQ with implementations for all builders
     @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
@@ -95,13 +93,13 @@ public class Builders {
     private static <T> @NotNull Supplier<T> getClassSupplier(final @NotNull Class<T> clazz) {
 
         if (builders == null) {
-            throw new RuntimeException(String.format(NO_ACCESS_MESSAGE, Thread.currentThread().getName()));
+            throw new RuntimeException(NO_ACCESS_MESSAGE);
         }
 
         final Supplier<Object> objectSupplier = builders.get(clazz.getCanonicalName());
         if (objectSupplier == null) {
             //don't cache this exception to keep the stacktrace, this is not expected to happen very often
-            throw new RuntimeException(String.format(NO_ACCESS_MESSAGE, Thread.currentThread().getName()));
+            throw new RuntimeException(NO_ACCESS_MESSAGE);
         }
         //noinspection unchecked: HiveMQ takes care of placing the right supplier in the map
         return (Supplier<T>) objectSupplier;

Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,7 @@`
`62`	`62`	`*/`
`63`	`63`	`public class Services {`
`64`	`64`
`65`		`- private static final String NO_ACCESS_MESSAGE =`
`66`		`- "Static class Services cannot be called from a thread \"%s\" which" +`
`67`		`- " does not have a HiveMQ extension classloader as its context classloader.";`
	`65`	`+ private static final @NotNull String NO_ACCESS_MESSAGE = "Only HiveMQ Extensions can access Services.";`
`68`	`66`
`69`	`67`	`//this map is filled by HiveMQ with implementations for all services`
`70`	`68`	`@SuppressWarnings("MismatchedQueryAndUpdateOfCollection")`
`@@ -169,17 +167,18 @@ public class Services {`
`169`	`167`	`private static <T> @NotNull T getClassObject(final @NotNull Class<T> clazz) {`
`170`	`168`
`171`	`169`	`if (services == null) {`
`172`		`- throw new RuntimeException(String.format(NO_ACCESS_MESSAGE, Thread.currentThread().getName()));`
	`170`	`+ throw new RuntimeException(NO_ACCESS_MESSAGE);`
`173`	`171`	`}`
`174`	`172`
`175`	`173`	`final Object object = services.get(clazz.getCanonicalName());`
`176`	`174`	`if (object == null) {`
`177`	`175`	`//don't cache this exception to keep the stacktrace, this is not expected to happen very often`
`178`		`- throw new RuntimeException(String.format(NO_ACCESS_MESSAGE, Thread.currentThread().getName()));`
	`176`	`+ throw new RuntimeException(NO_ACCESS_MESSAGE);`
`179`	`177`	`}`
`180`	`178`	`if (clazz.isInstance(object)) {`
	`179`	`+ //noinspection unchecked`
`181`	`180`	`return (T) object;`
`182`	`181`	`}`
`183`		`- throw new RuntimeException(String.format(NO_ACCESS_MESSAGE, Thread.currentThread().getName()));`
	`182`	`+ throw new RuntimeException(NO_ACCESS_MESSAGE);`
`184`	`183`	`}`
`185`	`184`	`}`