Merge pull request #56 from NetoDevel/feature/jv-fix-structure

Update structure project

Author: netodevel

…va/br/com/generate/AbstractGenerate.java …main/java/br/com/generate/Generator.javaspring-boot-generate/src/main/java/br/com/generate/AbstractGenerate.java renamed to spring-boot-generate/src/main/java/br/com/generate/Generator.java spring-boot-generate/src/main/java/br/com/generate/AbstractGenerate.java renamed to spring-boot-generate/src/main/java/br/com/generate/Generator.java

@@ -4,12 +4,13 @@
 import java.io.IOException;
 import java.io.InputStream;
 
+import br.com.generate.helpers.ScaffoldInfoHelper;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.springframework.util.StringUtils;
 
 
-public abstract class AbstractGenerate extends ReadScaffoldInfo implements IGenerate {
+public abstract class Generator extends ScaffoldInfoHelper implements GeneratorBoundary {
 
 	public String readTemplateFile(String fileNameTemplate) throws IOException {
 		InputStream in = getClass().getResourceAsStream("/templates/java/" + getLayer() + "/" + fileNameTemplate);

spring-boot-generate/src/main/java/br/com/generate/GeneratorBoundary.java

@@ -0,0 +1,10 @@
+package br.com.generate;
+
+import java.io.IOException;
+
+public interface GeneratorBoundary {
+
+	boolean generate(String nameClass, String parameters, String fileNameTemplate) throws IOException;
+	
+	String getLayer();
+}

spring-boot-generate/src/main/java/br/com/generate/IGenerate.java

@@ -2,10 +2,8 @@
 
 public final class Layers {
 
-	public static final String CONTROLLER = "controller";
-	public static final String MODEL = "model";
-	public static final String REPOSITORY = "repository";
-	public static final String SERVICE = "service";
-	public static final String THYMELEAF = "thymeleaf";
-	
+    public static final String CONTROLLER = "controller";
+    public static final String MODEL = "model";
+    public static final String REPOSITORY = "repository";
+    public static final String SERVICE = "service";
 }

spring-boot-generate/src/main/java/br/com/generate/Layers.java

@@ -1,11 +1,14 @@
-package br.com.generate;
+package br.com.generate.helpers;
+
+import br.com.generate.Generator;
+import br.com.generate.validators.GenerateValidator;
 
 import java.io.IOException;
 
 /**
  * @author NetoDevel
  */
-public abstract class ReadTemplateFile extends AbstractGenerate {
+public abstract class FileHelper extends Generator {
 
 	public abstract String operationGenerate(String javaStrings, String nameClass, String parameters);
 

…va/br/com/generate/ReadTemplateFile.java …/br/com/generate/helpers/FileHelper.javaspring-boot-generate/src/main/java/br/com/generate/ReadTemplateFile.java renamed to spring-boot-generate/src/main/java/br/com/generate/helpers/FileHelper.java spring-boot-generate/src/main/java/br/com/generate/ReadTemplateFile.java renamed to spring-boot-generate/src/main/java/br/com/generate/helpers/FileHelper.java

@@ -1,4 +1,4 @@
-package br.com.util;
+package br.com.generate.helpers;
 
 import java.util.Arrays;
 import java.util.List;
@@ -8,37 +8,37 @@
 /**
  * @author NetoDevel
  */
-public class ModelGenerateUtils {
+public class ModelGenerateHelper {
 
 	private final static String TAB = "	";
 
 	private String importVariable;
 
 	private String nameVariable;
 
-	public ModelGenerateUtils(String importVariable, String nameVariable) {
+	public ModelGenerateHelper(String importVariable, String nameVariable) {
 		super();
 		this.setImportVariable(importVariable);
 		this.setNameVariable(nameVariable);
 	}
 
-	public ModelGenerateUtils(){
+	public ModelGenerateHelper(){
 	}
 
-	public static List<ModelGenerateUtils> listGenerateImports() {
+	public static List<ModelGenerateHelper> listGenerateImports() {
 		return Arrays.asList(
-				new ModelGenerateUtils("java.lang.String", "String"),
-				new ModelGenerateUtils("java.lang.Integer", "Integer"),
-				new ModelGenerateUtils("java.lang.Double", "Double"),
-				new ModelGenerateUtils("java.lang.Float", "Float"),
-				new ModelGenerateUtils("java.lang.Long", "Long"),
-				new ModelGenerateUtils("java.lang.Short", "Short"),
-				new ModelGenerateUtils("java.lang.Byte", "Byte"),
-				new ModelGenerateUtils("java.lang.Char", "Char"),
-				new ModelGenerateUtils("java.lang.Boolean", "Boolean"),
-				new ModelGenerateUtils("java.lang.Object", "Object"),
-				new ModelGenerateUtils("java.util.Date", "Date"),
-				new ModelGenerateUtils("java.math.BigDecimal", "BigDecimal"));
+				new ModelGenerateHelper("java.lang.String", "String"),
+				new ModelGenerateHelper("java.lang.Integer", "Integer"),
+				new ModelGenerateHelper("java.lang.Double", "Double"),
+				new ModelGenerateHelper("java.lang.Float", "Float"),
+				new ModelGenerateHelper("java.lang.Long", "Long"),
+				new ModelGenerateHelper("java.lang.Short", "Short"),
+				new ModelGenerateHelper("java.lang.Byte", "Byte"),
+				new ModelGenerateHelper("java.lang.Char", "Char"),
+				new ModelGenerateHelper("java.lang.Boolean", "Boolean"),
+				new ModelGenerateHelper("java.lang.Object", "Object"),
+				new ModelGenerateHelper("java.util.Date", "Date"),
+				new ModelGenerateHelper("java.math.BigDecimal", "BigDecimal"));
 	}
 
 	public static String generateImports(String parameters) {

…java/br/com/util/ModelGenerateUtils.java …enerate/helpers/ModelGenerateHelper.javaspring-boot-generate/src/main/java/br/com/util/ModelGenerateUtils.java renamed to spring-boot-generate/src/main/java/br/com/generate/helpers/ModelGenerateHelper.java spring-boot-generate/src/main/java/br/com/util/ModelGenerateUtils.java renamed to spring-boot-generate/src/main/java/br/com/generate/helpers/ModelGenerateHelper.java

@@ -1,4 +1,4 @@
-package br.com.generate;
+package br.com.generate.helpers;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -13,7 +13,7 @@
 /**
  * @author NetoDevel 
  */
-public abstract class ReadScaffoldInfo {
+public abstract class ScaffoldInfoHelper {
 
 	public FileReader getArq() throws FileNotFoundException{
 		FileReader arq = new FileReader(getUserDir() + "/src/main/resources/scaffold.info");