optimize code

Author: robinhood-jim

core/src/main/java/com/robin/core/base/datameta/BaseDataBaseMeta.java

@@ -44,7 +44,7 @@ public abstract class BaseDataBaseMeta implements DataBaseInterface, Serializabl
 	protected DataBaseParam param;
 	protected String dbType;
 	//Enum type of all support DB
-	public static final String[] DB_TYPE_ENMU ={"Oracle","Mysql","DB2","Sqlserver","Sybase","Postgresql","Phoenix4","Hive1","Hive","Oraclerac","H2","Impala"};
+	public static final String[] DB_TYPE_ENMU ={TYPE_ORACLE,TYPE_MYSQL,TYPE_DB2,TYPE_SQLSERVER,TYPE_SYBASE,TYPE_PGSQL,TYPE_PHONEIX,TYPE_HIVE,TYPE_HIVE2,TYPE_ORACLERAC,TYPE_H2,TYPE_IMPALA};
 	//jdbc Url Template like jdbc:mysql://[hostName]:[port]/[databaseName]?useUnicode=true&characterEncoding=[encode]
 	public static final Pattern PATTERN_TEMPLATE_PARAM = Pattern.compile("\\[.*?\\]");
 	@Override
@@ -125,7 +125,7 @@ public String getAddColumnStatement(String tableName, String schema,
 										DataBaseColumnMeta v) {
 		StringBuilder builder=new StringBuilder();
 		builder.append("ALTER TABLE ").append(getTableSpec(tableName,schema)).append(" ADD COLUMN ");
-		builder.append(v.getColumnName()).append(" ").append(getSqlGen().returnTypeDef(v.getColumnType().toString(),v));
+		builder.append(v.getColumnName()).append(" ").append(getSqlGen().returnTypeDef(v.getColumnType(),v));
 		if(v.isIncrement() && supportAutoInc()){
 			builder.append(" ").append(getSqlGen().getAutoIncrementDef());
 		}

core/src/main/java/com/robin/core/sql/util/AbstractSqlGen.java

@@ -75,15 +75,9 @@ private String doFilterSql(List<FilterCondition> paramList,String linkOper){
             if (ObjectUtils.isEmpty(param.getValue()) || CollectionUtils.isEmpty(param.getConditions())) {
                 continue;
             }
-            String prevoper = param.getPrefixOper();
-            String nextoper = param.getSuffixOper();
+            String prevoper = !ObjectUtils.isEmpty(param.getPrefixOper())?param.getPrefixOper():"";
+            String nextoper = !ObjectUtils.isEmpty(param.getSuffixOper())?param.getSuffixOper():"";
 
-            if (prevoper == null || prevoper.length() == 0) {
-                prevoper = "";
-            }
-            if (nextoper == null || nextoper.length() == 0) {
-                nextoper = "";
-            }
             if(org.apache.commons.lang3.StringUtils.isEmpty(linkOper)) {
                 replaceStr = Const.OPERATOR_AND;
             }
@@ -284,7 +278,7 @@ public String getFieldDefineSqlPart(FieldContent field) {
     }
     @Override
     public String getFieldDefineSqlByMeta(DataBaseColumnMeta columnMeta){
-        String datatype = columnMeta.getColumnType().toString();
+        String datatype = columnMeta.getColumnType();
         StringBuilder builder = new StringBuilder();
         String name = columnMeta.getColumnName();
         builder.append(name).append(" ").append(returnTypeDef(datatype, columnMeta));
@@ -620,7 +614,7 @@ public String getSchemaName(String schema) {
             return "\"" + schema + "\"";
         }
     }
-    protected String getNoPageSql(String sql,PageQuery pageQuery){
+    protected String getNoPageSql(String sql,PageQuery<?> pageQuery){
         Assert.isTrue(pageQuery.getPageSize()==0,"");
         StringBuilder builder=new StringBuilder(sql);
         if(!StringUtils.isEmpty(pageQuery.getOrder()) && !StringUtils.isEmpty(pageQuery.getOrderDirection())){
@@ -629,7 +623,7 @@ protected String getNoPageSql(String sql,PageQuery pageQuery){
         return builder.toString();
     }
 
-    protected Integer[] getStartEndRecord(PageQuery pageQuery) {
+    protected Integer[] getStartEndRecord(PageQuery<?> pageQuery) {
         int nBegin = (pageQuery.getPageNumber() - 1) * pageQuery.getPageSize();
         int tonums = nBegin + pageQuery.getPageSize();
         if (!ObjectUtils.isEmpty(pageQuery.getRecordCount()) && pageQuery.getRecordCount() < tonums) {
@@ -718,7 +712,7 @@ else if(!org.springframework.util.StringUtils.isEmpty(pageQuery.getOrder())){
         pagingSelect.append(" )r) r ");
         return pagingSelect;
     }
-    protected void checkSqlAndPage(String sql,PageQuery pageQuery){
+    protected void checkSqlAndPage(String sql,PageQuery<?> pageQuery){
         Assert.isTrue(!ObjectUtils.isEmpty(sql),"querySql not null");
         //Assert.notNull(pageQuery,"pageQuery is Null");
     }

hadooptool/src/main/java/com/robin/comm/fileaccess/writer/OrcFileWriter.java

@@ -3,7 +3,6 @@
 import com.robin.comm.fileaccess.util.MockFileSystem;
 import com.robin.comm.fileaccess.util.OrcUtil;
 import com.robin.core.base.util.Const;
-import com.robin.core.base.util.ResourceConst;
 import com.robin.core.fileaccess.meta.DataCollectionMeta;
 import com.robin.core.fileaccess.meta.DataSetColumnMeta;
 import com.robin.core.fileaccess.util.ResourceUtil;
@@ -18,14 +17,15 @@
 import org.apache.orc.TypeDescription;
 import org.apache.orc.Writer;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 import javax.naming.OperationNotSupportedException;
 import java.io.IOException;
-
 import java.sql.Timestamp;
-import java.util.*;
+import java.util.Date;
+import java.util.InputMismatchException;
+import java.util.Map;
+import java.util.Objects;
 
 
 public class OrcFileWriter extends AbstractFileWriter {
@@ -97,7 +97,6 @@ public void finishWrite() throws IOException {
             batch.reset();
         }
         if(owriter!=null){
-            //owriter.notify();
             owriter.close();
         }
     }

sonar-project.properties

@@ -1,5 +1,5 @@
-sonar.projectKey=JavaFrame
-sonar.projectName=JavaFrame
+sonar.projectKey=JavaFramework
+sonar.projectName=JavaFramework
 sonar.sources=.
 sonar.projectVersion=1.0
 sonar.java.binaries=target/classes

web/src/main/java/com/robin/core/web/international/Translator.java

@@ -22,7 +22,7 @@ public class Translator {
     private static ResourceBundleMessageSource messageSource;
 
     public Translator(ResourceBundleMessageSource messageSource){
-        Translator.messageSource=messageSource;
+        this.messageSource=messageSource;
     }
     public static String toLocale(String msgCode) {
         Locale locale = LocaleContextHolder.getLocale();