Fix initialization logic and improve readability across core and plugins

jeka-bot · jeka-bot · commit 1af911252646 · 2025-10-23T22:16:20.000+02:00
- Replace incorrect method `preInitMethodsOf` with `postInitMethodsOf`.
- Enhance Javadoc annotations with cleaner docstring syntax.
- Introduce optional runtime library inclusion in `BundleKBean`.
- Refactor dependency resolution for clearer context in logs.
- Add utility methods and minor performance improvements across files.
diff --git a/core/src/main/java/dev/jeka/core/api/project/JkProject.java b/core/src/main/java/dev/jeka/core/api/project/JkProject.java
@@ -726,7 +726,7 @@ public List<String> getRunJavaOptions() {
      *  Returns the Java version effectively used for compiling and running.
      */
     public String getEffectiveJavaVersion() {
-        return Optional.of(this.jvmTargetVersion).orElse(JkJavaVersion.ofCurrent()).toString();
+        return Optional.ofNullable(this.jvmTargetVersion).orElse(JkJavaVersion.ofCurrent()).toString();
     }
 
     LocalAndTxtDependencies textAndLocalDeps() {
diff --git a/core/src/main/java/dev/jeka/core/tool/builtins/app/AppBuilder.java b/core/src/main/java/dev/jeka/core/tool/builtins/app/AppBuilder.java
@@ -38,8 +38,8 @@ class AppBuilder {
 
     static final String SHE_BANG = "#!/bin/sh";
 
-    static Path build(Path baseDir, boolean isNative) {
-        String[] buildArgs = buildArgs(baseDir, isNative);
+    static Path build(Path baseDir, boolean isNative, boolean isBundle) {
+        String[] buildArgs = buildArgs(baseDir, isNative, isBundle);
         JkLog.verbose("Use commands: %s", String.join(" ", buildArgs));
         JkProcess.ofWinOrUx("jeka.bat", "jeka")
                 .setWorkingDir(baseDir)
@@ -95,7 +95,7 @@ private static Path createShellFile(Path baseDir, Path jarPath) {
                 .get();
     }
 
-    private static String[] buildArgs(Path base, boolean nativeCompile) {
+    private static String[] buildArgs(Path base, boolean nativeCompile, boolean bundle) {
         Path jekaProperties = base.resolve(JkConstants.PROPERTIES_FILE);
         List<String> args = new LinkedList<>();
         if (Files.exists(jekaProperties)) {
@@ -118,7 +118,10 @@ private static String[] buildArgs(Path base, boolean nativeCompile) {
                     args.add("base:");
                     args.add("pack");
                 }
-
+            }
+            if (bundle) {
+                args.add("bundle:");
+                args.add("pack");
             }
         }
         args.add("-Djeka.test.skip=true");
diff --git a/core/src/main/java/dev/jeka/core/tool/builtins/app/AppKBean.java b/core/src/main/java/dev/jeka/core/tool/builtins/app/AppKBean.java
@@ -24,6 +24,7 @@
 import dev.jeka.core.tool.JkDoc;
 import dev.jeka.core.tool.JkDocUrl;
 import dev.jeka.core.tool.KBean;
+import dev.jeka.core.tool.builtins.project.BundleKBean;
 import dev.jeka.core.tool.builtins.tooling.nativ.NativeKBean;
 
 import java.util.List;
@@ -227,7 +228,8 @@ public void install() {
 
         // Install built app in target folder
         boolean isNative = find(NativeKBean.class).isPresent();
-        appManager.install(appName, repoAndTag, isNative);
+        boolean bundle = find(BundleKBean.class).isPresent();
+        appManager.install(appName, repoAndTag, isNative, bundle);
 
         JkLog.info("App has been installed in %s.", appManager.appDir);
         JkLog.info("Run with: %s", JkAnsi.yellow(suggestedAppName));
diff --git a/core/src/main/java/dev/jeka/core/tool/builtins/app/AppManager.java b/core/src/main/java/dev/jeka/core/tool/builtins/app/AppManager.java
@@ -23,6 +23,8 @@
 import dev.jeka.core.api.system.JkLog;
 import dev.jeka.core.api.tooling.git.JkGit;
 import dev.jeka.core.api.utils.*;
+import dev.jeka.core.tool.JkConstants;
+import dev.jeka.core.tool.builtins.project.BundleKBean;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -61,7 +63,7 @@ static AppManager of() {
                 JkLocator.getCacheDir().resolve("git").resolve("apps"));
     }
 
-    void install(String appName, RepoAndTag repoAndTag, boolean isNative) {
+    void install(String appName, RepoAndTag repoAndTag, boolean isNative, boolean isBundle) {
         Path repoDir = repoDir(appName);
         JkUtilsPath.deleteQuietly(repoDir, false);
         JkUtilsPath.createDirectories(repoDir);
@@ -72,7 +74,7 @@ void install(String appName, RepoAndTag repoAndTag, boolean isNative) {
                 .addParams(repoAndTag.repoUrl, repoDir.toString())
                 .exec();
         JkLog.info("Build app...");
-        buildAndInstall(appName, isNative, repoDir);
+        buildAndInstall(appName, isNative, repoDir, isBundle);
     }
 
     void updateWithTag(String appName, String tag) {
@@ -89,7 +91,7 @@ void updateWithTag(String appName, String tag) {
 
         boolean isNative = isNative(appFile);
         JkLog.info("Re-building the app...");
-        buildAndInstall(appName, isNative, repoDir);
+        buildAndInstall(appName, isNative, repoDir, isBundle());
     }
 
     void updateToLastCommit(String appName) {
@@ -107,7 +109,8 @@ void updateToLastCommit(String appName) {
 
         boolean isNative = isNative(appFile);
         JkLog.info("Re-building the app...");
-        buildAndInstall(appName, isNative, repoDir);
+
+        buildAndInstall(appName, isNative, repoDir, isBundle());
 
         JkLog.endTask();
     }
@@ -277,10 +280,10 @@ static boolean isAppNameValid(String name) {
         return name.matches("[a-zA-Z0-9\\-]+");
     }
 
-    private void buildAndInstall(String appName, boolean isNative, Path repoDir) {
+    private void buildAndInstall(String appName, boolean isNative, Path repoDir, boolean isBundle) {
         Path artefact;
         try {
-            artefact = AppBuilder.build(repoDir, isNative);
+            artefact = AppBuilder.build(repoDir, isNative, isBundle());
         } catch (RuntimeException e) {
             JkGit git = JkGit.of(repoDir);
             String remoteRepoUrl = git.getRemoteUrl();
@@ -347,6 +350,11 @@ private boolean isNative(Path appFile) {
         return !content.trim().startsWith(AppBuilder.SHE_BANG);
     }
 
+    private boolean isBundle() {
+        return Files.exists(
+                this.repoCacheDir.resolve(JkConstants.OUTPUT_PATH).resolve(BundleKBean.JPACKAGE_TEMP_DIR_NAME));
+    }
+
     static class AppVersion {
 
         final String appName;
diff --git a/core/src/main/java/dev/jeka/core/tool/builtins/app/Catalog.java b/core/src/main/java/dev/jeka/core/tool/builtins/app/Catalog.java
@@ -40,10 +40,6 @@ private Catalog(Map<String, AppInfo> apps) {
         this.apps = apps;
     }
 
-    static Catalog ofBuiltin() {
-        return ofInputStream(() -> Catalog.class.getResourceAsStream("demo-catalog.properties"));
-    }
-
     static Catalog of(String url) {
         try (InputStream inputStream = JkUtilsIO.toUrl(url).openStream()) {
             Properties properties = new Properties();
@@ -72,9 +68,22 @@ void print(String catalogName) {
             System.out.println("Desc: " + appInfo.description);
             System.out.println("Repo: " + appInfo.repo);
             System.out.println("Run : " + JkAnsi.yellow("jeka -r " + appInfo.repo + " -p"));
-            System.out.println("Inst: " + JkAnsi.yellow("jeka app: install repo="
-                    + appName + "@" + catalogName));
-            //System.out.println("Inst: " + JkAnsi.yellow("jeka app: install repo=" + appName + "@" + catalogName ));
+            int longestMsg = "Install as java cmd-line".length();
+            if (appInfo.nativable) {
+                longestMsg = "Install as native command-line".length();
+            }
+            String javaMsg = JkUtilsString.padEnd("Install as java cmd-line", longestMsg, ' ');
+
+            System.out.println(javaMsg+ ": " + JkAnsi.yellow("jeka app: install repo=" + appName + "@" + catalogName));
+            if (appInfo.nativable) {
+                System.out.println("Install as native command-line: " + JkAnsi.yellow("jeka app: install repo="
+                        + appName + "@" + catalogName + " native:"));
+            }
+            if (appInfo.bundable) {
+                String bundableMsg = JkUtilsString.padEnd("Install as app bundle", longestMsg, ' ');
+                System.out.println(bundableMsg + ": " + JkAnsi.yellow("jeka app: install repo="
+                        + appName + "@" + catalogName + " bundle:"));
+            }
             System.out.println();
         }
     }
@@ -95,18 +104,25 @@ private static Map<String, AppInfo> appEntries(JkProperties properties) {
         Map<String, AppInfo> result = new TreeMap<>();
         for (String appName : appNames) {
             Map<String, String> map = JkProperties.ofMap(appPros).getAllStartingWith(appName + ".", false);
-            AppInfo appInfo = new AppInfo(map.get("desc"), map.get("repo"), map.get("type"));
+            AppInfo appInfo = new AppInfo(
+                    map.get("desc"),
+                    map.get("repo"),
+                    map.get("type"),
+                    map.get("native"),
+                    map.get("bundle"));
             result.put(appName, appInfo);
         }
         return result;
     }
 
     static class AppInfo {
 
-        public AppInfo(String description, String repo, String type) {
+        public AppInfo(String description, String repo, String type, String nativable, String bundable) {
             this.description = description;
             this.repo = repo;
             this.type = type;
+            this.nativable = "true".equals(nativable);
+            this.bundable = "true".equals(bundable);
         }
 
         public final String description;
@@ -115,12 +131,11 @@ public AppInfo(String description, String repo, String type) {
 
         public final String type;
 
-        private String shortenRepoUrl() {
-            if (repo.startsWith(GITHUB_URL)) {
-                return repo.substring(GITHUB_URL.length());
-            }
-            return repo;
-        }
+        public final boolean nativable;
+
+        public final boolean bundable;
+
+
     }
 
 
diff --git a/core/src/main/java/dev/jeka/core/tool/builtins/project/BundleKBean.java b/core/src/main/java/dev/jeka/core/tool/builtins/project/BundleKBean.java
@@ -29,6 +29,8 @@
         """)
 public final class BundleKBean extends KBean {
 
+    public static final String JPACKAGE_TEMP_DIR_NAME = "jpackage-input";
+
     @JkDoc("If true, a custom JRE is created including only Java modules used by the application.")
     public boolean customJre;
 
@@ -243,7 +245,7 @@ private static List<String[]> toOptionArray(JkMultiValue<String> multiValue) {
     private void setProjectOptions(JkJpackage jkPackage) {
         JkProject project = projectKBean.project;
 
-        Path inputDir = projectKBean.getOutputDir().resolve("jpackage-input");
+        Path inputDir = projectKBean.getOutputDir().resolve(JPACKAGE_TEMP_DIR_NAME);
         createInputDir(inputDir);
 
         String mainClass = project.pack.getOrFindMainClass();

Original file line number	Diff line number	Diff line change
`@@ -726,7 +726,7 @@ public List<String> getRunJavaOptions() {`
`726`	`726`	`* Returns the Java version effectively used for compiling and running.`
`727`	`727`	`*/`
`728`	`728`	`public String getEffectiveJavaVersion() {`
`729`		`- return Optional.of(this.jvmTargetVersion).orElse(JkJavaVersion.ofCurrent()).toString();`
	`729`	`+ return Optional.ofNullable(this.jvmTargetVersion).orElse(JkJavaVersion.ofCurrent()).toString();`
`730`	`730`	`}`
`731`	`731`
`732`	`732`	`LocalAndTxtDependencies textAndLocalDeps() {`