Simplify main

Author: jabrena

.editorconfig

@@ -0,0 +1,36 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# File generated by jbang setup@jabrena
+
+# top-most EditorConfig file
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.html]
+indent_style = space
+indent_size = 4
+
+[*.json]
+indent_style = space
+indent_size = 4
+
+[*.xml]
+indent_style = space
+indent_size = 4
+
+[*.java]
+indent_style = space
+indent_size = 4
+
+[*.yml,*.yaml]
+indent_style = space
+indent_size = 2
+
+[*.dsl]
+indent_style = space
+indent_size = 4

README.md

@@ -95,6 +95,9 @@ sdk env install
 jwebserver -p 9000 -d "$(pwd)/build/reports/"
 ./gradlew clean build snapshot
 java -jar build/libs/context-mapper-cli-0.1.0-SNAPSHOT.jar
+
+sdk use java 11.0.27-tem
+java -jar build/libs/context-mapper-cli-0.1.0-SNAPSHOT.jar
 ```
 
 ## Contributing

build.gradle

@@ -34,6 +34,11 @@ application {
     applicationName = 'cm'
 }
 
+javadoc {
+    options.addStringOption('Xdoclint:none', '-quiet')
+    failOnError false
+}
+
 jar {
     manifest {
         attributes (

src/main/java/org/contextmapper/cli/ContextMapperCLI.java

@@ -7,7 +7,7 @@
 import java.util.function.Supplier;
 
 @Command(
-    name = "cm", 
+    name = "cm",
     versionProvider = VersionProvider.class,
     description = "Context Mapper CLI",
     subcommands = {
@@ -18,33 +18,14 @@
     usageHelpAutoWidth = true)
 public class ContextMapperCLI implements Runnable {
 
-    private static final int REQUIRED_JAVA_VERSION = 17;
-    static Supplier<Integer> javaVersionSupplier = () -> Runtime.version().feature();
-
     @Override
     public void run() {
         System.out.println("Context Mapper CLI. Use 'cm --help' for usage information.");
     }
 
-    static void checkJavaVersion(Runnable exiter) {
-        int currentVersion = javaVersionSupplier.get();
-        if (currentVersion < REQUIRED_JAVA_VERSION) {
-            System.err.printf("Invalid Java version '%s' (>=%s is required).%n", currentVersion, REQUIRED_JAVA_VERSION);
-            exiter.run();
-        }
-    }
-
-    private static void checkJavaVersion() {
-        checkJavaVersion(() -> System.exit(1));
-    }
-
-    static int runCLI(String[] args) {
-        return new CommandLine(new ContextMapperCLI()).execute(args);
-    }
-
     public static void main(String[] args) {
-        checkJavaVersion();
-        int exitCode = runCLI(args);
+        CommandLine commandLine = new CommandLine(new ContextMapperCLI());
+        int exitCode = commandLine.execute(args);
         System.exit(exitCode);
     }
 }

src/test/java/org/contextmapper/cli/ContextMapperCLITest.java

@@ -49,25 +49,25 @@ void main_WhenCalledWithoutCommand_ThenPrintsTopLevelHelp() {
     @DisplayName("main() should print top-level help when called with --help option")
     void main_WhenCalledWithHelpOption_ThenPrintsTopLevelHelp() {
         // Given
-        String[] args = {"--help"};
+        String[] args = { "--help" };
 
         // When
         int exitCode = cmd.execute(args);
 
         // Then
         assertThat(exitCode).isEqualTo(0);
         assertThat(outContent.toString())
-            .contains("Usage: cm [-hV] [COMMAND]")
-            .contains("Commands:")
-            .contains("validate  Validates a CML file.")
-            .contains("generate  Generates output from a CML file.");
+                .contains("Usage: cm [-hV] [COMMAND]")
+                .contains("Commands:")
+                .contains("validate  Validates a CML file.")
+                .contains("generate  Generates output from a CML file.");
     }
 
     @Test
     @DisplayName("main() should print version when called with --version option")
     void main_WhenCalledWithVersionOption_ThenPrintsVersion() {
         // Given
-        String[] args = {"--version"};
+        String[] args = { "--version" };
 
         // When
         int exitCode = cmd.execute(args);
@@ -81,23 +81,23 @@ void main_WhenCalledWithVersionOption_ThenPrintsVersion() {
     @DisplayName("main() should print error and usage when called with an invalid option")
     void main_WhenCalledWithInvalidOption_ThenPrintsErrorAndUsage() {
         // Given
-        String[] args = {"--invalid-option"};
+        String[] args = { "--invalid-option" };
 
         // When
         int exitCode = cmd.execute(args);
 
         // Then
         assertThat(exitCode).isNotEqualTo(0);
         assertThat(errContent.toString())
-            .contains("Unknown option: '--invalid-option'")
-            .contains("Usage: cm [-hV] [COMMAND]");
+                .contains("Unknown option: '--invalid-option'")
+                .contains("Usage: cm [-hV] [COMMAND]");
     }
 
     @Test
     @DisplayName("main() should print error and usage when called with an invalid subcommand")
     void main_WhenCalledWithInvalidSubcommand_ThenPrintsErrorAndUsage() {
         // Given
-        String[] args = {"invalid-command"};
+        String[] args = { "invalid-command" };
 
         // When
         int exitCode = cmd.execute(args);
@@ -106,22 +106,4 @@ void main_WhenCalledWithInvalidSubcommand_ThenPrintsErrorAndUsage() {
         assertThat(exitCode).isNotEqualTo(0);
         assertThat(errContent.toString()).contains("Unmatched argument at index 0: 'invalid-command'");
     }
-
-    @Test
-    @DisplayName("runCLI() should return 0 and print help when called with --help option")
-    void runCLI_WhenCalledWithHelpOption_ThenReturnsZeroAndPrintsHelp() {
-        // Given
-        String[] args = {"--help"};
-
-        // When
-        int exitCode = ContextMapperCLI.runCLI(args);
-
-        // Then
-        assertThat(exitCode).isEqualTo(0);
-        assertThat(outContent.toString())
-            .contains("Usage: cm [-hV] [COMMAND]")
-            .contains("Commands:")
-            .contains("validate  Validates a CML file.")
-            .contains("generate  Generates output from a CML file.");
-    }
 }

src/test/java/org/contextmapper/cli/VersionProviderTest.java

@@ -36,8 +36,8 @@ void getVersion_whenImplVersionIsPresent_returnsVersionString() throws Exception
 
         // Assert
         assertThat(version).isNotNull()
-                           .hasSize(1)
-                           .containsExactly("Context Mapper CLI v" + expectedVersion);
+                .hasSize(1)
+                .containsExactly("Context Mapper CLI v" + expectedVersion);
     }
 
     @Test
@@ -52,8 +52,8 @@ void getVersion_whenImplVersionIsNull_returnsDevelopmentVersionString() throws E
 
         // Assert
         assertThat(version).isNotNull()
-                           .hasSize(1)
-                           .containsExactly("Context Mapper CLI DEVELOPMENT VERSION");
+                .hasSize(1)
+                .containsExactly("Context Mapper CLI DEVELOPMENT VERSION");
     }
 
     @Test
@@ -66,7 +66,7 @@ void getVersion_whenPackageIsNull_returnsDevelopmentVersionString() throws Excep
 
         // Assert
         assertThat(version).isNotNull()
-                           .hasSize(1)
-                           .containsExactly("Context Mapper CLI DEVELOPMENT VERSION");
+                .hasSize(1)
+                .containsExactly("Context Mapper CLI DEVELOPMENT VERSION");
     }
-} 
+}

src/test/java/org/contextmapper/cli/commands/ContextMapperGeneratorTest.java

@@ -18,7 +18,8 @@ class ContextMapperGeneratorTest {
             "PLANT_UML, plantuml",
             "GENERIC, generic"
     })
-    void getName_WhenUsingGeneratorEnumValue_ThenCanGetGeneratorName(ContextMapperGenerator generator, String expectedName) {
+    void getName_WhenUsingGeneratorEnumValue_ThenCanGetGeneratorName(ContextMapperGenerator generator,
+            String expectedName) {
         // Given
         // generator and expectedName are provided by @CsvSource
 
@@ -30,7 +31,7 @@ void getName_WhenUsingGeneratorEnumValue_ThenCanGetGeneratorName(ContextMapperGe
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"CONTEXT_MAP", "PLANT_UML", "GENERIC"})
+    @ValueSource(strings = { "CONTEXT_MAP", "PLANT_UML", "GENERIC" })
     void getDescription_WhenUsingGeneratorEnumValue_ThenCanGetGeneratorDescription(final String enumValueAsString) {
         // Given
         final ContextMapperGenerator generator = ContextMapperGenerator.valueOf(enumValueAsString);
@@ -62,7 +63,7 @@ void toString_ReturnsName(ContextMapperGenerator generator, String expectedName)
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"context-map", "plantuml", "generic", "CONTEXT-MAP", "PlantUML", "GeNeRiC"})
+    @ValueSource(strings = { "context-map", "plantuml", "generic", "CONTEXT-MAP", "PlantUML", "GeNeRiC" })
     void byName_WhenWithValidName_ThenReturnGenerator(final String validGeneratorKey) {
         // Given
         // validGeneratorKey is provided by @ValueSource
@@ -80,8 +81,7 @@ void byName_WhenWithoutName_ThenThrowIllegalArgumentException() {
         // No specific setup needed
 
         // When & Then
-        assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() ->
-                ContextMapperGenerator.byName(null))
+        assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> ContextMapperGenerator.byName(null))
                 .withMessageContaining("Please provide a name for the generator.");
     }
 
@@ -91,8 +91,7 @@ void byName_WhenWithEmptyName_ThenThrowIllegalArgumentException() {
         // No specific setup needed
 
         // When & Then
-        assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() ->
-                ContextMapperGenerator.byName(""))
+        assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> ContextMapperGenerator.byName(""))
                 .withMessageContaining("Please provide a name for the generator.");
     }
 
@@ -102,13 +101,14 @@ void byName_WhenWithInvalidName_ThenThrowIllegalArgumentException() {
         // No specific setup needed
 
         // When & Then
-        assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() ->
-                ContextMapperGenerator.byName("just a string"))
-                .withMessageContaining("No generator found for the name 'just a string'. Valid values are: context-map, plantuml, generic");
+        assertThatExceptionOfType(IllegalArgumentException.class)
+                .isThrownBy(() -> ContextMapperGenerator.byName("just a string"))
+                .withMessageContaining(
+                        "No generator found for the name 'just a string'. Valid values are: context-map, plantuml, generic");
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"CONTEXT_MAP", "PLANT_UML", "GENERIC"})
+    @ValueSource(strings = { "CONTEXT_MAP", "PLANT_UML", "GENERIC" })
     void getGenerator_WhenCalled_ThenReturnGeneratorImplementation(final String enumValueAsString) {
         // Given
         final ContextMapperGenerator generator = ContextMapperGenerator.valueOf(enumValueAsString);
@@ -133,7 +133,7 @@ void getDisplayName_ReturnsCorrectFormat(ContextMapperGenerator generator, Strin
 
         // When
         String displayName = generator.getDisplayName();
-        
+
         // Then
         assertThat(displayName).isEqualTo(expectedDisplayName);
     }