packaging: document fatjar and stork distribution jooby-project#1785

jknack · jknack · commit 6b73d1b7e6b5 · 2020-06-12T10:45:14.000-03:00
diff --git a/modules/jooby-cli/build.xml b/modules/jooby-cli/build.xml
diff --git a/modules/jooby-cli/pom.xml b/modules/jooby-cli/pom.xml
@@ -58,6 +58,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.jacoco</groupId>
       <artifactId>org.jacoco.agent</artifactId>
@@ -69,18 +75,20 @@
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>properties-maven-plugin</artifactId>
+        <version>1.0.0</version>
         <executions>
           <execution>
             <phase>generate-resources</phase>
-            <configuration>
-              <target>
-                <ant antfile="${project.basedir}/build.xml"></ant>
-              </target>
-            </configuration>
             <goals>
-              <goal>run</goal>
+              <goal>write-project-properties</goal>
             </goals>
+            <configuration>
+              <outputFile>
+                ${project.build.outputDirectory}${file.separator}dependencies.properties
+              </outputFile>
+            </configuration>
           </execution>
         </executions>
       </plugin>
diff --git a/modules/jooby-cli/src/main/java/io/jooby/internal/cli/CommandContextImpl.java b/modules/jooby-cli/src/main/java/io/jooby/internal/cli/CommandContextImpl.java
@@ -29,6 +29,8 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class CommandContextImpl implements Context {
 
@@ -142,7 +144,13 @@ public Map<String, String> getDependencyMap() throws IOException {
       }
     }
     Map result = new LinkedHashMap<>();
-    result.putAll(versions);
+    for (Map.Entry<Object, Object> entry : versions.entrySet()) {
+      String key = Stream.of(entry.getKey().toString().split("\\.|-"))
+          .map(name -> Character.toUpperCase(name.charAt(0)) + name.substring(1))
+          .collect(Collectors.joining());
+      key = Character.toLowerCase(key.charAt(0)) + key.substring(1);
+      result.put(key, entry.getValue().toString());
+    }
     return result;
   }
 }
diff --git a/modules/jooby-cli/src/test/java/io/jooby/internal/cli/CommandContextImplTest.java b/modules/jooby-cli/src/test/java/io/jooby/internal/cli/CommandContextImplTest.java
@@ -0,0 +1,33 @@
+package io.jooby.internal.cli;
+
+import org.jline.reader.LineReader;
+import org.jline.terminal.Terminal;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class CommandContextImplTest {
+
+  @Test
+  public void shouldLoadDependencyFile() throws IOException {
+    PrintWriter writer = mock(PrintWriter.class);
+
+    Terminal terminal = mock(Terminal.class);
+    when(terminal.writer()).thenReturn(writer);
+
+    LineReader reader = mock(LineReader.class);
+    when(reader.getTerminal()).thenReturn(terminal);
+
+    CommandContextImpl ctx = new CommandContextImpl(reader, "2.8.5");
+
+    Map<String, String> dependencyMap = ctx.getDependencyMap();
+    assertNotNull(dependencyMap);
+    assertNotNull(dependencyMap.get("mavenTilesPluginVersion"));
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@`
`29`	`29`	`import java.util.Map;`
`30`	`30`	`import java.util.Properties;`
`31`	`31`	`import java.util.Set;`
	`32`	`+import java.util.stream.Collectors;`
	`33`	`+import java.util.stream.Stream;`
`32`	`34`
`33`	`35`	`public class CommandContextImpl implements Context {`
`34`	`36`
`@@ -142,7 +144,13 @@ public Map<String, String> getDependencyMap() throws IOException {`
`142`	`144`	`}`
`143`	`145`	`}`
`144`	`146`	`Map result = new LinkedHashMap<>();`
`145`		`- result.putAll(versions);`
	`147`	`+ for (Map.Entry<Object, Object> entry : versions.entrySet()) {`
	`148`	`+ String key = Stream.of(entry.getKey().toString().split("\\.\|-"))`
	`149`	`+ .map(name -> Character.toUpperCase(name.charAt(0)) + name.substring(1))`
	`150`	`+ .collect(Collectors.joining());`
	`151`	`+ key = Character.toLowerCase(key.charAt(0)) + key.substring(1);`
	`152`	`+ result.put(key, entry.getValue().toString());`
	`153`	`+ }`
`146`	`154`	`return result;`
`147`	`155`	`}`
`148`	`156`	`}`