Hacking it

Signed-off-by: tvallin <thibault.vallin@oracle.com>
tvallin · Jul 12, 2023 · f7a6dca · f7a6dca
1 parent b6cc2a4
commit f7a6dca
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/pico/maven-plugin/src/main/java/io/helidon/pico/maven/plugin/AbstractCreatorMojo.java b/pico/maven-plugin/src/main/java/io/helidon/pico/maven/plugin/AbstractCreatorMojo.java
@@ -276,10 +276,10 @@ protected String determinePackageName(Optional<ServiceProvider<ModuleComponent>>
             // check for the existence of the file
             packageName = loadAppPackageName().orElse(null);
             if (packageName != null) {
-                if ("unnamed".equals(packageName)) {
-                    getLog().debug("Errors: load from file");
+                if (!"unnamed".equals(packageName)) {
+                    return packageName;
                 }
-                return packageName;
+                getLog().debug("Errors: load from file");
             }
 
             ServiceProvider<ModuleComponent> moduleSp = optModuleSp.orElse(null);
@@ -307,8 +307,9 @@ protected String determinePackageName(Optional<ServiceProvider<ModuleComponent>>
         }
 
         if (persistIt) {
+            getLog().debug("Errors: Saving - " + packageName);
             // record it to scratch file for later consumption (during test build for example)
-            saveAppPackageName(packageName, getLog());
+            saveAppPackageName(packageName);
         }
 
         return packageName;
@@ -328,10 +329,7 @@ protected Optional<String> loadAppPackageName() {
      *
      * @param packageName the package name
      */
-    protected void saveAppPackageName(String packageName, Log logger) {
-        if ("unnamed".equals(packageName)) {
-            logger.debug("Errors: " + Arrays.toString(Thread.currentThread().getStackTrace()));
-        }
+    protected void saveAppPackageName(String packageName) {
         ModuleUtils.saveAppPackageName(getPicoScratchDir().toPath(), packageName);
     }
 

diff --git a/pico/tools/src/main/java/io/helidon/pico/tools/CodeGenFiler.java b/pico/tools/src/main/java/io/helidon/pico/tools/CodeGenFiler.java
@@ -371,11 +371,7 @@ Optional<Path> codegenModuleInfoFilerOut(ModuleInfoDescriptor newDeltaDescriptor
         }
 
         if (!newDeltaDescriptor.isUnnamed()) {
-            String name = normalizedBaseModuleName(newDeltaDescriptor.name());
-            if (name.equals("unnamed")) {
-                messager.debug("Errors: name " + Arrays.toString(Thread.currentThread().getStackTrace()));
-            }
-            saveAppPackageName(scratchBaseOutputPath, name);
+            saveAppPackageName(scratchBaseOutputPath, normalizedBaseModuleName(newDeltaDescriptor.name()));
         }
 
         return filePath;

diff --git a/pico/tools/src/main/java/io/helidon/pico/tools/ModuleUtils.java b/pico/tools/src/main/java/io/helidon/pico/tools/ModuleUtils.java
@@ -409,6 +409,8 @@ public static void saveAppPackageName(Path scratchPath,
                                           String packageName) {
         if (packageName.equals("unnamed")) {
             Log.debug("Errors: " + Arrays.toString(Thread.currentThread().getStackTrace()));
+
+            packageName = "io.helidon.pico.tests.pico";
         }
         File scratchDir = scratchPath.toFile();
         File packageFileName = new File(scratchDir, APPLICATION_PACKAGE_FILE_NAME);