Adds lombok generator

Author: NetoDevel

generator-core/src/main/java/br/com/generator/core/GeneratorExecutor.java

@@ -30,6 +30,18 @@ public File generate(GeneratorOptions options) throws IOException {
 
     public File addDependecies(GeneratorOptions options) throws IOException {
         String contentTemplate = loadPom(options.getTemplatePath());
+
+        Boolean alreadyDeps = false;
+        if (options.getDependencies() != null) {
+            for (int i = 0; i < options.getDependencies().size(); i++) {
+                if (contentTemplate.contains(options.getDependencies().get(i))) {
+                    System.out.println("[INFO] ".concat(options.getDependencies().get(i)).concat(" already added."));
+                    alreadyDeps = true;
+                }
+            }
+        }
+        if (alreadyDeps) return null;
+
         String contentReplaced = templateEngine.replaceValues(contentTemplate, options.getKeyValue());
 
         File fileGenerated = new File(options.getDestination());

generator-core/src/main/java/br/com/generator/core/GeneratorOptions.java

@@ -1,5 +1,6 @@
 package br.com.generator.core;
 
+import java.util.List;
 import java.util.Map;
 
 public class GeneratorOptions {
@@ -10,6 +11,7 @@ public class GeneratorOptions {
     private String properties;
     private Map<String, String> pluginValues;
     private Map<String, String> keyValue;
+    private List<String> dependencies;
 
     public String getDestination() {
         return destination;
@@ -58,4 +60,12 @@ public Map<String, String> getPluginValues() {
     public void setPluginValues(Map<String, String> pluginValues) {
         this.pluginValues = pluginValues;
     }
+
+    public List<String> getDependencies() {
+        return dependencies;
+    }
+
+    public void setDependencies(List<String> dependencies) {
+        this.dependencies = dependencies;
+    }
 }

spring-scaffold-cli/src/main/java/br/com/command/model/ModelHandler.java

@@ -5,6 +5,7 @@
 import br.com.templates.entity.EntityCache;
 import br.com.templates.entity.EntityExecutor;
 import br.com.templates.entity.EntityGenerator;
+import br.com.templates.entity.LombokDependencyGenerator;
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
 import org.springframework.boot.cli.command.options.OptionHandler;
@@ -64,6 +65,8 @@ private void generateModelJava(String nameClass, String parameters) throws IOExc
         EntityExecutor entityExecutor = new EntityExecutor();
         entityExecutor.run(nameClass, parameters);
 
+        lombokGenerate();
+
         for (EntityCache entity : entityExecutor.getEntities()) {
             GeneratorOptions generatorOptions = new GeneratorOptions();
             generatorOptions.setName(entity.getName().concat(".java"));
@@ -78,6 +81,16 @@ private void generateModelJava(String nameClass, String parameters) throws IOExc
             EntityGenerator entityGenerator = new EntityGenerator(generatorOptions);
             entityGenerator.runGenerate();
         }
+
+    }
+
+    private void lombokGenerate() throws IOException {
+        GeneratorOptions lombokDepsOptions = new GeneratorOptions();
+        lombokDepsOptions.setTemplatePath(scaffoldInfoHelper.getPomPath());
+        lombokDepsOptions.setDestination(scaffoldInfoHelper.getPomDest());
+
+        LombokDependencyGenerator lombokDependencyGenerator = new LombokDependencyGenerator(lombokDepsOptions);
+        lombokDependencyGenerator.runGenerate();
     }
 
 }

spring-scaffold-cli/src/test/java/br/com/command/model/ModelHandlerTest.java

@@ -32,6 +32,8 @@ public void shouldReturnOk() throws Exception {
 
         Mockito.when(scaffoldInfoHelper.getPackage()).thenReturn("com.example");
         Mockito.when(scaffoldInfoHelper.getPathPackage()).thenReturn(temporaryPath.getAbsolutePath().concat("\\com\\example\\"));
+        Mockito.when(scaffoldInfoHelper.getPomPath()).thenReturn(getClass().getResource("/templates/template-fake-pom.xml").toURI().getPath());
+        Mockito.when(scaffoldInfoHelper.getPomDest()).thenReturn(temporaryPath.getAbsolutePath().concat("/pom.xml"));
 
         ModelHandler modelHandler = new ModelHandler(scaffoldInfoHelper);
         ExitStatus exitStatus = modelHandler.run("-n", "User", "-p", "name:String Foo:references(relation:hasMany, name:String)");

templates/src/main/java/br/com/templates/entity/EntityExecutor.java

@@ -20,6 +20,14 @@ public String run(String nameClass, String argumentValue) {
         String[] attributes = argumentValue.split(" ");
 
         StringBuilder attributeToReplace = new StringBuilder();
+
+        String idAttribute =
+                "\n" +
+                "\t@Id @GeneratedValue(strategy = GenerationType.AUTO)\n" +
+                "\tprivate Integer id;";
+
+        attributeToReplace.append("\t".concat(idAttribute.concat("\n")));
+
         for (int i = 0; i < attributes.length; i++) {
             String attribute = generateAttribute(attributes[i]);
             attributeToReplace.append("\t".concat(attribute.concat("\n")));

templates/src/main/java/br/com/templates/entity/LombokDependencyGenerator.java

@@ -0,0 +1,38 @@
+package br.com.templates.entity;
+
+import br.com.generator.core.Generator;
+import br.com.generator.core.GeneratorOptions;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class LombokDependencyGenerator extends Generator {
+
+    private GeneratorOptions generatorOptions;
+
+    public LombokDependencyGenerator(GeneratorOptions generatorOptions) {
+        this.generatorOptions = generatorOptions;
+    }
+
+    public File runGenerate() throws IOException {
+        String dependency = "\n" +
+                "    <dependency>\n" +
+                "        <groupId>org.projectlombok</groupId>\n" +
+                "        <artifactId>lombok</artifactId>\n" +
+                "        <scope>provided</scope>\n" +
+                "    </dependency>\n" +
+                "</dependencies>";
+
+        Map<String, String> keyValue = new HashMap<String, String>();
+        keyValue.put("</dependencies>", dependency);
+        this.generatorOptions.setKeyValue(keyValue);
+        this.generatorOptions.setName("pom.xml");
+        this.generatorOptions.setDependencies(Collections.singletonList("org.projectlombok"));
+
+        return addDependency(this.generatorOptions);
+    }
+
+}

templates/src/main/resources/templates.entity/entity-template.txt

@@ -1,6 +1,6 @@
 package ${package};
 
-  @Id @GeneratedValue(strategy = GenerationType.AUTO)
-  private Integer id;
+import lombok.Data;
+import java.util.List;
 
 ${content}

templates/src/test/java/br/com/templates/entity/EntityCacheTest.java

@@ -30,13 +30,17 @@ public void shouldReturnContentOfUser() {
                 "@Entity\n" +
                 "@Data\n" +
                 "public class User {\n" +
+                "\t\n" +
+                "\t@Id @GeneratedValue(strategy = GenerationType.AUTO)\n" +
+                "\tprivate Integer id;\n" +
                 "\tprivate String name;\n" +
                 "\tprivate Integer age;\n" +
                 "\t\t\n" +
                 "\t@OneToMany\n" +
                 "\tprivate List<Foo> foo;\n" +
                 "}\n";
-        assertEquals(expectedValue.trim(), entityExecutor.getEntities().get(1).getContent());
+
+        assertEquals(expectedValue.trim(), entityExecutor.getEntities().get(1).getContent().trim());
     }
 
     @Test

templates/src/test/java/br/com/templates/entity/EntityExecutorTest.java

@@ -22,6 +22,9 @@ public void shouldCreateEntity() {
                 "@Entity\n" +
                 "@Data\n" +
                 "public class User {\n" +
+                "\t\n" +
+                "\t@Id @GeneratedValue(strategy = GenerationType.AUTO)\n" +
+                "\tprivate Integer id;\n" +
                 "\tprivate String name;\n" +
                 "\tprivate Integer age;\n" +
                 "}\n";
@@ -46,6 +49,9 @@ public void givenRelationHasMany_shouldReturnWithRelation() {
                 "@Entity\n" +
                 "@Data\n" +
                 "public class User {\n" +
+                "\t\n" +
+                "\t@Id @GeneratedValue(strategy = GenerationType.AUTO)\n" +
+                "\tprivate Integer id;\n" +
                 "\tprivate String name;\n" +
                 "\tprivate Integer age;\n" +
                 "\t\t\n" +
@@ -64,6 +70,9 @@ public void givenRelationBelongsTo_shouldReturnWithRelation() {
                 "@Entity\n" +
                 "@Data\n" +
                 "public class User {\n" +
+                "\t\n" +
+                "\t@Id @GeneratedValue(strategy = GenerationType.AUTO)\n" +
+                "\tprivate Integer id;\n" +
                 "\tprivate String name;\n" +
                 "\tprivate Integer age;\n" +
                 "\t\t\n" +