refactor: Improve module structure

Author: rsenden

build-logic/src/main/kotlin/com/fortify/fcli/buildlogic/FcliJavaConventionsPlugin.kt

@@ -179,7 +179,8 @@ class FcliJavaConventionsPlugin: Plugin<Project> {
             description = "Generate GraalVM resource-config.json"
             dependsOn(ensureGeneratedDirs)
             dependsOn(generateZipResources, buildTimeActions)
-            inputs.dir("src/main/resources")
+            val srcResDir = project.file("src/main/resources")
+            if (srcResDir.isDirectory) { inputs.dir(srcResDir) }
             inputs.dir(generatedZipResourcesDir)
             inputs.dir(generatedActionOutputResourcesDir)
             val outputDirProvider = generatedResourceConfigDir.map { it.dir("META-INF/native-image/fcli-generated/${project.name}") }
@@ -194,7 +195,9 @@ class FcliJavaConventionsPlugin: Plugin<Project> {
                     }
                 }
                 val srcBase = project.layout.projectDirectory.dir("src/main/resources").asFile
-                addFiles(srcBase, project.fileTree(srcBase) { exclude("**/i18n/**", "META-INF/**", "**/zip/**") })
+                if (srcBase.isDirectory) {
+                    addFiles(srcBase, project.fileTree(srcBase) { exclude("**/i18n/**", "META-INF/**", "**/zip/**") })
+                }
                 val genZipBase = generatedZipResourcesDir.get().asFile
                 addFiles(genZipBase, project.fileTree(genZipBase))
                 val genActionBase = generatedActionOutputResourcesDir.get().asFile

fcli-core/fcli-action/build.gradle.kts

@@ -1 +1,5 @@
-plugins { id("fcli.module-conventions") }
+plugins { id("fcli.module-conventions") }
+
+dependencies {
+    implementation(project(property("fcliCommonActionRef") as String))
+}

fcli-core/fcli-ai-assist/build.gradle.kts

@@ -1,10 +1,12 @@
 plugins { id("fcli.module-conventions") }
 
 dependencies {
-	val fodRef = project.findProperty("fcliFoDRef") as String
-	val sscRef = project.findProperty("fcliSSCRef") as String
-	val toolRef = project.findProperty("fcliToolRef") as String
-	implementation(project(fodRef))
-	implementation(project(sscRef))
-	implementation(project(toolRef))
+    val commonActionRef = project.findProperty("fcliCommonActionRef") as String
+    val commonToolRef = project.findProperty("fcliCommonToolRef") as String
+    val fodRef = project.findProperty("fcliFoDRef") as String
+    val sscRef = project.findProperty("fcliSSCRef") as String
+    implementation(project(commonActionRef))
+    implementation(project(commonToolRef))
+    implementation(project(fodRef))
+    implementation(project(sscRef))
 }

fcli-core/fcli-app/build.gradle.kts

@@ -7,7 +7,10 @@ plugins {
 
 // Inter-project dependencies
 val refs = listOf(
-    "fcliCommonRef","fcliActionRef","fcliAiAssistRef","fcliAviatorRef","fcliConfigRef","fcliFoDRef","fcliSSCRef","fcliSCSastRef","fcliSCDastRef","fcliToolRef","fcliLicenseRef","fcliUtilRef"
+    "fcliCommonRef","fcliCommonCiRef","fcliCommonActionRef","fcliCommonToolRef",
+    "fcliActionRef","fcliAiAssistRef","fcliAviatorRef","fcliConfigRef",
+    "fcliFoDRef","fcliSSCRef","fcliSCSastRef","fcliSCDastRef",
+    "fcliToolRef","fcliLicenseRef","fcliUtilRef"
 )
 references@ for (r in refs) {
     val p = project.findProperty(r) as String? ?: continue@references

fcli-core/fcli-app/src/main/java/com/fortify/cli/app/_main/cli/cmd/FCLIRootCommands.java

@@ -43,7 +43,7 @@
  * @author Ruud Senden
  */
 @Command(name = "fcli", 
-    resourceBundle = "com.fortify.cli.common.i18n.FortifyCLIMessages",
+    resourceBundle = "com.fortify.cli.app.i18n.FortifyCLIMessages",
     versionProvider = FortifyCLIVersionProvider.class,
     subcommands = {
             GenericActionCommands.class,

fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/util/I18nParameterExceptionHandler.java

@@ -35,7 +35,7 @@ public class I18nParameterExceptionHandler implements CommandLine.IParameterExce
      */
     public I18nParameterExceptionHandler(IParameterExceptionHandler origDefaultHandler){
         this.origDefaultHandler = origDefaultHandler;
-        String resourceBundleName = "com.fortify.cli.common.i18n.FortifyCLIMessages";
+        String resourceBundleName = "com.fortify.cli.app.i18n.FortifyCLIMessages";
         i18nResource = ResourceBundle.getBundle(resourceBundleName, LanguageHelper.getConfiguredLanguageDescriptor().getLocale());
     }
 

…ommon/i18n/FortifyCLIMessages.properties …i/app/i18n/FortifyCLIMessages.propertiesfcli-core/fcli-common/src/main/resources/com/fortify/cli/common/i18n/FortifyCLIMessages.properties renamed to fcli-core/fcli-app/src/main/resources/com/fortify/cli/app/i18n/FortifyCLIMessages.properties fcli-core/fcli-common/src/main/resources/com/fortify/cli/common/i18n/FortifyCLIMessages.properties renamed to fcli-core/fcli-app/src/main/resources/com/fortify/cli/app/i18n/FortifyCLIMessages.properties

@@ -93,10 +93,6 @@ fcli.confirm = Confirm operation.
 fcli.confirmPromptOptions = Y/N
 fcli.expectedConfirmPromptResponse = Y
 
-# Options defined in AbstractReportGenerateCommand
-report-dir = Write report output to the given directory.
-report-zip = Write report output to the given zip-file.
-
 # Default usage header & description. Effectively, these are only applied to 
 # the top-level fcli command as each module-specific resource bundle overrides
 # these default usage header & description with empty values. See the following

fcli-core/fcli-aviator-common/build.gradle.kts

@@ -12,7 +12,7 @@ java {
 tasks.withType<JavaCompile>().configureEach { dependsOn("generateProto") }
 
 dependencies {
-    implementation(project(":fcli-core:fcli-common"))
+    implementation(project(":fcli-core:fcli-common-core"))
     implementation("org.yaml:snakeyaml:2.3")
 
     // JAXB for XML object marshalling (used in FVDLProcessor legacy parser)

fcli-core/fcli-common-action/.gitignore

@@ -0,0 +1,2 @@
+/bin/
+/build/

fcli-core/fcli-common-action/build.gradle.kts

@@ -0,0 +1,5 @@
+plugins { id("fcli.module-conventions") }
+
+dependencies {
+    implementation(project(property("fcliCommonCiRef") as String))
+}