随手优化

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/engine/BeetlTemplateEngine.java

@@ -1,16 +1,14 @@
 package com.baomidou.mybatisplus.generator.engine;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Map;
-
+import com.baomidou.mybatisplus.generator.config.builder.ConfigBuilder;
 import org.beetl.core.Configuration;
 import org.beetl.core.GroupTemplate;
 import org.beetl.core.Template;
 import org.beetl.core.resource.ClasspathResourceLoader;
 
-import com.baomidou.mybatisplus.generator.config.builder.ConfigBuilder;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Map;
 
 /**
  * <p>
@@ -39,10 +37,10 @@ public class BeetlTemplateEngine extends AbstractTemplateEngine {
     @Override
     public void writer(Map<String, Object> objectMap, String templatePath, String outputFile) throws Exception {
         Template template = groupTemplate.getTemplate(templatePath);
-        FileOutputStream fileOutputStream = new FileOutputStream(new File(outputFile));
-        template.binding(objectMap);
-        template.renderTo(fileOutputStream);
-        fileOutputStream.close();
+        try (FileOutputStream fileOutputStream = new FileOutputStream(outputFile)) {
+            template.binding(objectMap);
+            template.renderTo(fileOutputStream);
+        }
         logger.debug("模板:" + templatePath + ";  文件:" + outputFile);
     }
 

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/engine/FreemarkerTemplateEngine.java

@@ -18,11 +18,9 @@ package com.baomidou.mybatisplus.generator.engine;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.generator.config.ConstVal;
 import com.baomidou.mybatisplus.generator.config.builder.ConfigBuilder;
-
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 
-import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStreamWriter;
 import java.util.Map;
@@ -52,17 +50,15 @@ public class FreemarkerTemplateEngine extends AbstractTemplateEngine {
     @Override
     public void writer(Map<String, Object> objectMap, String templatePath, String outputFile) throws Exception {
         Template template = configuration.getTemplate(templatePath);
-        FileOutputStream fileOutputStream = new FileOutputStream(new File(outputFile));
-        template.process(objectMap, new OutputStreamWriter(fileOutputStream, ConstVal.UTF8));
-        fileOutputStream.close();
+        try (FileOutputStream fileOutputStream = new FileOutputStream(outputFile)) {
+            template.process(objectMap, new OutputStreamWriter(fileOutputStream, ConstVal.UTF8));
+        }
         logger.debug("模板:" + templatePath + ";  文件:" + outputFile);
     }
 
 
     @Override
     public String templateFilePath(String filePath) {
-        StringBuilder fp = new StringBuilder();
-        fp.append(filePath).append(".ftl");
-        return fp.toString();
+        return filePath + ".ftl";
     }
 }

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/engine/VelocityTemplateEngine.java

@@ -15,21 +15,20 @@
  */
 package com.baomidou.mybatisplus.generator.engine;
 
-import java.io.BufferedWriter;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-import java.util.Map;
-import java.util.Properties;
-
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.generator.config.ConstVal;
+import com.baomidou.mybatisplus.generator.config.builder.ConfigBuilder;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;
 import org.apache.velocity.app.VelocityEngine;
 
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.generator.config.ConstVal;
-import com.baomidou.mybatisplus.generator.config.builder.ConfigBuilder;
+import java.io.BufferedWriter;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
+import java.util.Map;
+import java.util.Properties;
 
 /**
  * <p>
@@ -66,10 +65,11 @@ public class VelocityTemplateEngine extends AbstractTemplateEngine {
             return;
         }
         Template template = velocityEngine.getTemplate(templatePath, ConstVal.UTF8);
-        FileOutputStream fos = new FileOutputStream(outputFile);
-        BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(fos, ConstVal.UTF8));
-        template.merge(new VelocityContext(objectMap), writer);
-        writer.close();
+        try (FileOutputStream fos = new FileOutputStream(outputFile);
+             OutputStreamWriter ow = new OutputStreamWriter(fos, ConstVal.UTF8);
+             BufferedWriter writer = new BufferedWriter(ow)) {
+            template.merge(new VelocityContext(objectMap), writer);
+        }
         logger.debug("模板:" + templatePath + ";  文件:" + outputFile);
     }
 
@@ -79,8 +79,6 @@ public class VelocityTemplateEngine extends AbstractTemplateEngine {
         if (null == filePath || filePath.contains(DOT_VM)) {
             return filePath;
         }
-        StringBuilder fp = new StringBuilder();
-        fp.append(filePath).append(DOT_VM);
-        return fp.toString();
+        return filePath + DOT_VM;
     }
 }