Jelajahi Sumber

整理:消除部分编译器警告

wanxq 3 tahun lalu
induk
melakukan
25d709c11b

+ 25 - 26
src/main/java/io/renren/config/DbConfig.java

@@ -9,14 +9,14 @@
 package io.renren.config;
 
 import io.renren.dao.*;
-import io.renren.utils.RRException;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 
+import javax.annotation.Resource;
+
 /**
  * 数据库配置
  *
@@ -25,45 +25,44 @@ import org.springframework.context.annotation.Primary;
 @Configuration
 public class DbConfig {
     @Value("${renren.database: mysql}")
-    private String database;
-    @Autowired
-    private MySQLGeneratorDao mySQLGeneratorDao;
-    @Autowired
-    private OracleGeneratorDao oracleGeneratorDao;
-    @Autowired
-    private SQLServerGeneratorDao sqlServerGeneratorDao;
-    @Autowired
-    private PostgreSQLGeneratorDao postgreSQLGeneratorDao;
+    private String _dbDriver;
+    @Resource
+    private MySQLGeneratorDao _daoMySql;
+    @Resource
+    private OracleGeneratorDao _daoOracle;
+    @Resource
+    private SQLServerGeneratorDao _daoSqlServer;
+    @Resource
+    private PostgreSQLGeneratorDao _daoPostgres;
 
-    private static boolean mongo = false;
+    private static boolean _useMongo = false;
 
     @Bean
     @Primary
     @Conditional(MongoNullCondition.class)
     public GeneratorDao getGeneratorDao() {
-        if ("mysql".equalsIgnoreCase(database)) {
-            return mySQLGeneratorDao;
-        } else if ("oracle".equalsIgnoreCase(database)) {
-            return oracleGeneratorDao;
-        } else if ("sqlserver".equalsIgnoreCase(database)) {
-            return sqlServerGeneratorDao;
-        } else if ("postgresql".equalsIgnoreCase(database)) {
-            return postgreSQLGeneratorDao;
+        if ("mysql".equalsIgnoreCase(_dbDriver)) {
+            return _daoMySql;
+        } else if ("oracle".equalsIgnoreCase(_dbDriver)) {
+            return _daoOracle;
+        } else if ("sqlserver".equalsIgnoreCase(_dbDriver)) {
+            return _daoSqlServer;
+        } else if ("postgresql".equalsIgnoreCase(_dbDriver)) {
+            return _daoPostgres;
         } else {
-            throw new RRException("不支持当前数据库:" + database);
+            throw new RuntimeException("不支持当前数据库:" + _dbDriver);
         }
     }
 
     @Bean
     @Primary
     @Conditional(MongoCondition.class)
-    public GeneratorDao getMongoDBDao(MongoDBGeneratorDao mongoDBGeneratorDao) {
-        mongo = true;
-        return mongoDBGeneratorDao;
+    public GeneratorDao getMongoDBDao(MongoDBGeneratorDao daoMongo) {
+        _useMongo = true;
+        return daoMongo;
     }
 
     public static boolean isMongo() {
-        return mongo;
+        return _useMongo;
     }
-
 }

+ 1 - 2
src/main/java/io/renren/config/MongoCondition.java

@@ -1,12 +1,11 @@
 package io.renren.config;
 
-import org.apache.commons.lang.StringUtils;
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 
 /**
- * @author: gxz gongxuanzhang@foxmail.com
+ * @author gxz gongxuanzhang@foxmail.com
  **/
 public class MongoCondition implements Condition {
 

+ 3 - 3
src/main/java/io/renren/config/MongoManager.java

@@ -13,7 +13,7 @@ import java.util.concurrent.ConcurrentHashMap;
 public class MongoManager {
 
     /***mongo扫描很消耗性能 尤其是子类的封装  使用缓存**/
-    private static Map<String, MongoDefinition> mongoCache = new ConcurrentHashMap<>();
+    private static final Map<String, MongoDefinition> mongoCache = new ConcurrentHashMap<>();
 
     public static Map<String, MongoDefinition> getCache() {
         return mongoCache;
@@ -23,8 +23,8 @@ public class MongoManager {
         return mongoCache.getOrDefault(tableName, null);
     }
 
-    public static MongoDefinition putInfo(String tableName, MongoDefinition mongoDefinition) {
-        return mongoCache.put(tableName, mongoDefinition);
+    public static void putInfo(String tableName, MongoDefinition mongoDefinition) {
+        mongoCache.put(tableName, mongoDefinition);
     }
 
     /**

+ 11 - 11
src/main/java/io/renren/controller/SysGeneratorController.java

@@ -13,12 +13,12 @@ import io.renren.utils.PageUtils;
 import io.renren.utils.Query;
 import io.renren.utils.R;
 import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Map;
@@ -31,8 +31,8 @@ import java.util.Map;
 @Controller
 @RequestMapping("/sys/generator")
 public class SysGeneratorController {
-	@Autowired
-	private SysGeneratorService sysGeneratorService;
+	@Resource
+	private SysGeneratorService _genSvc;
 	
 	/**
 	 * 列表
@@ -40,7 +40,7 @@ public class SysGeneratorController {
 	@ResponseBody
 	@RequestMapping("/list")
 	public R list(@RequestParam Map<String, Object> params){
-		PageUtils pageUtil = sysGeneratorService.queryList(new Query(params));
+		PageUtils pageUtil = _genSvc.queryList(new Query(params));
 		
 		return R.ok().put("page", pageUtil);
 	}
@@ -49,14 +49,14 @@ public class SysGeneratorController {
 	 * 生成代码
 	 */
 	@RequestMapping("/code")
-	public void code(String tables, HttpServletResponse response) throws IOException{
-		byte[] data = sysGeneratorService.generatorCode(tables.split(","));
+	public void code(String tables, HttpServletResponse res) throws IOException{
+		byte[] data = _genSvc.generatorCode(tables.split(","));
 		
-		response.reset();  
-        response.setHeader("Content-Disposition", "attachment; filename=\"renren.zip\"");  
-        response.addHeader("Content-Length", "" + data.length);  
-        response.setContentType("application/octet-stream; charset=UTF-8");  
+		res.reset();
+        res.setHeader("Content-Disposition", "attachment; filename=\"renren.zip\"");
+        res.addHeader("Content-Length", "" + data.length);
+        res.setContentType("application/octet-stream; charset=UTF-8");
   
-        IOUtils.write(data, response.getOutputStream());  
+        IOUtils.write(data, res.getOutputStream());
 	}
 }

+ 31 - 28
src/main/java/io/renren/service/SysGeneratorService.java

@@ -13,16 +13,16 @@ import com.github.pagehelper.PageHelper;
 import io.renren.config.MongoManager;
 import io.renren.dao.GeneratorDao;
 import io.renren.dao.MongoDBGeneratorDao;
-import io.renren.entity.mongo.MongoDefinition;
 import io.renren.factory.MongoDBCollectionFactory;
 import io.renren.utils.GenUtils;
 import io.renren.utils.PageUtils;
 import io.renren.utils.Query;
 import org.apache.commons.io.IOUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.zip.ZipOutputStream;
@@ -34,46 +34,49 @@ import java.util.zip.ZipOutputStream;
  */
 @Service
 public class SysGeneratorService {
-    @Autowired
-    private GeneratorDao generatorDao;
+    @Resource
+    private GeneratorDao _generator;
 
 
     public PageUtils queryList(Query query) {
-        Page<?> page = PageHelper.startPage(query.getPage(), query.getLimit());
-        List<Map<String, Object>> list = generatorDao.queryList(query);
-        int total = (int) page.getTotal();
-        if (generatorDao instanceof MongoDBGeneratorDao) {
-            total = MongoDBCollectionFactory.getCollectionTotal(query);
+        try (Page<?> page = PageHelper.startPage(query.getPage(), query.getLimit())) {
+            List<Map<String, Object>> list = _generator.queryList(query);
+            int total = (int) page.getTotal();
+            if (_generator instanceof MongoDBGeneratorDao) {
+                total = MongoDBCollectionFactory.getCollectionTotal(query);
+            }
+            return new PageUtils(list, total, query.getLimit(), query.getPage());
         }
-        return new PageUtils(list, total, query.getLimit(), query.getPage());
     }
 
     public Map<String, String> queryTable(String tableName) {
-        return generatorDao.queryTable(tableName);
+        return _generator.queryTable(tableName);
     }
 
     public List<Map<String, String>> queryColumns(String tableName) {
-        return generatorDao.queryColumns(tableName);
+        return _generator.queryColumns(tableName);
     }
 
 
     public byte[] generatorCode(String[] tableNames) {
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        ZipOutputStream zip = new ZipOutputStream(outputStream);
-        for (String tableName : tableNames) {
-            //查询表信息
-            Map<String, String> table = queryTable(tableName);
-            //查询列信息
-            List<Map<String, String>> columns = queryColumns(tableName);
-            //生成代码
-            GenUtils.generatorCode(table, columns, zip);
+        try (ByteArrayOutputStream os = new ByteArrayOutputStream()) {
+            try (ZipOutputStream zip = new ZipOutputStream(os)) {
+                for (String tableName : tableNames) {
+                    //查询表信息
+                    Map<String, String> table = queryTable(tableName);
+                    //查询列信息
+                    List<Map<String, String>> columns = queryColumns(tableName);
+                    //生成代码
+                    GenUtils.generatorCode(table, columns, zip);
+                }
+                if (MongoManager.isMongo()) {
+                    GenUtils.generatorMongoCode(tableNames, zip);
+                }
+                IOUtils.closeQuietly(zip);
+            }
+            return os.toByteArray();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
         }
-        if (MongoManager.isMongo()) {
-            GenUtils.generatorMongoCode(tableNames, zip);
-        }
-
-
-        IOUtils.closeQuietly(zip);
-        return outputStream.toByteArray();
     }
 }

+ 1 - 2
src/main/java/io/renren/utils/GenUtils.java

@@ -25,8 +25,7 @@ import java.util.zip.ZipOutputStream;
 /**
  * 代码生成器   工具类
  *
- * @author chenshun
- * @email sunlightcs@gmail.com
+ * @author chenshun: sunlightcs@gmail.com
  * @date 2016年12月19日 下午11:40:24
  */
 public class GenUtils {

+ 1 - 1
src/main/java/io/renren/utils/MongoScanner.java

@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
  * @author: gxz  514190950@qq.com
  **/
 public class MongoScanner {
-    private Logger logger = LoggerFactory.getLogger(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     private MongoCollection<Document> collection;
 

+ 1 - 2
src/main/java/io/renren/utils/RRException.java

@@ -3,8 +3,7 @@ package io.renren.utils;
 /**
  * 自定义异常
  * 
- * @author chenshun
- * @email sunlightcs@gmail.com
+ * @author chenshun: sunlightcs@gmail.com
  * @date 2016年10月27日 下午10:11:27
  */
 public class RRException extends RuntimeException {