Handle default package name when generating class names

Fixes #13540
quarkusio · Nov 29, 2020 · db09061 · db09061
1 parent 3a7f715
commit db09061
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/...ions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java b/...ions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java
@@ -529,7 +529,7 @@ private String generateImplementation(ClassInfo defaultBundleInterface, String d
         }
 
         String targetPackage = DotNames.packageName(bundleInterface.name());
-        String generatedName = targetPackage.replace('.', '/') + "/" + baseName + SUFFIX;
+        String generatedName = (targetPackage.isEmpty() ? "" : targetPackage.replace('.', '/') + "/") + baseName + SUFFIX;
 
         // MyMessages_Bundle implements MyMessages, Resolver
         Builder builder = ClassCreator.builder().classOutput(classOutput).className(generatedName)

diff --git a/...cheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java b/...cheduler/deployment/src/main/java/io/quarkus/scheduler/deployment/SchedulerProcessor.java
@@ -241,7 +241,8 @@ private String generateInvoker(ScheduledBusinessMethodItem scheduledMethod, Clas
             sigBuilder.append(i.name().toString());
         }
         String targetPackage = DotNames.packageName(bean.getImplClazz().name());
-        String generatedName = targetPackage.replace('.', '/') + "/" + baseName + INVOKER_SUFFIX + "_" + method.name() + "_"
+        String generatedName = (targetPackage.isEmpty() ? "" : targetPackage.replace('.', '/') + "/") + baseName
+                + INVOKER_SUFFIX + "_" + method.name() + "_"
                 + HashUtil.sha1(sigBuilder.toString());
 
         ClassCreator invokerCreator = ClassCreator.builder().classOutput(classOutput).className(generatedName)

diff --git a/...vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/VertxWebProcessor.java b/...vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/VertxWebProcessor.java
@@ -516,7 +516,8 @@ private String generateHandler(HandlerDescriptor desc, BeanInfo bean, MethodInfo
         for (Type i : method.parameters()) {
             sigBuilder.append(i.name().toString());
         }
-        String generatedName = targetPackage.replace('.', '/') + "/" + baseName + HANDLER_SUFFIX + "_" + method.name() + "_"
+        String generatedName = (targetPackage.isEmpty() ? "" : targetPackage.replace('.', '/') + "/") + baseName
+                + HANDLER_SUFFIX + "_" + method.name() + "_"
                 + HashUtil.sha1(sigBuilder.toString() + hashSuffix);
 
         ClassCreator invokerCreator = ClassCreator.builder().classOutput(classOutput).className(generatedName)

diff --git a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/EventBusConsumer.java b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/EventBusConsumer.java
@@ -115,7 +115,8 @@ static String generateInvoker(BeanInfo bean, MethodInfo method,
         for (Type i : method.parameters()) {
             sigBuilder.append(i.name().toString());
         }
-        String generatedName = targetPackage.replace('.', '/') + "/" + baseName + INVOKER_SUFFIX + "_" + method.name() + "_"
+        String generatedName = (targetPackage.isEmpty() ? "" : targetPackage.replace('.', '/') + "/") + baseName
+                + INVOKER_SUFFIX + "_" + method.name() + "_"
                 + HashUtil.sha1(sigBuilder.toString());
 
         ClassCreator invokerCreator = ClassCreator.builder().classOutput(classOutput).className(generatedName)

diff --git a/...dent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractGenerator.java b/...dent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/AbstractGenerator.java
@@ -42,7 +42,7 @@ static String generatedNameFromTarget(String targetPackage, String baseName, Str
         if (targetPackage == null || targetPackage.isEmpty()) {
             return baseName + suffix;
         } else {
-            return targetPackage.replace('.', '/') + "/" + baseName + suffix;
+            return (targetPackage.isEmpty() ? "" : targetPackage.replace('.', '/') + "/") + baseName + suffix;
         }
     }
 

diff --git a/...ojects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java b/...ojects/qute/generator/src/main/java/io/quarkus/qute/generator/ValueResolverGenerator.java
@@ -884,7 +884,7 @@ static String generatedNameFromTarget(String targetPackage, String baseName, Str
         } else if (targetPackage.startsWith("java")) {
             return "io/quarkus/qute" + "/" + baseName + suffix;
         } else {
-            return targetPackage.replace('.', '/') + "/" + baseName + suffix;
+            return (targetPackage.isEmpty() ? "" : targetPackage.replace('.', '/') + "/") + baseName + suffix;
         }
     }