Adapting partial code(file name start with M #2) to the sonar cloud rule (#2179)

* Adapting partial code(file name start with M #2) to the sonar cloud rule

* remove unused import

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/MonitorDBDao.java

@@ -61,7 +61,7 @@ public class MonitorDBDao {
                 return new PostgrePerformance().getMonitorRecord(conn);
             }
         }catch (Exception e) {
-            logger.error("SQLException " + e);
+            logger.error("SQLException: {}", e.getMessage(), e);
         }finally {
             try {
                 if (conn != null) {

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/MySQLDataSource.java

@@ -39,7 +39,7 @@ public class MySQLDataSource extends BaseDataSource {
   @Override
   public String getJdbcUrl() {
     String address = getAddress();
-    if (address.lastIndexOf("/") != (address.length() - 1)) {
+    if (address.lastIndexOf('/') != (address.length() - 1)) {
       address += "/";
     }
     String jdbcUrl = address + getDatabase();

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/MysqlUpgradeDao.java

@@ -29,15 +29,7 @@ import java.sql.SQLException;
  */
 public class MysqlUpgradeDao extends UpgradeDao {
 
-    public static final Logger logger = LoggerFactory.getLogger(UpgradeDao.class);
+    public static final Logger logger = LoggerFactory.getLogger(MysqlUpgradeDao.class);
-
-    /**
-     * init
-     */
-    @Override
-    protected void init() {
-
-    }
 
     /**
      * mysql upgrade dao holder
@@ -69,12 +61,7 @@ public class MysqlUpgradeDao extends UpgradeDao {
         try {
             conn = dataSource.getConnection();
             rs = conn.getMetaData().getTables(null, null, tableName, null);
-            if (rs.next()) {
+            return rs.next();
-                return true;
-            } else {
-                return false;
-            }
-
         } catch (SQLException e) {
             logger.error(e.getMessage(),e);
             throw new RuntimeException(e.getMessage(),e);
@@ -96,11 +83,7 @@ public class MysqlUpgradeDao extends UpgradeDao {
         try {
             conn = dataSource.getConnection();
             ResultSet rs = conn.getMetaData().getColumns(null,null,tableName,columnName);
-            if (rs.next()) {
+            return rs.next();
-                return true;
-            } else {
-                return false;
-            }
 
         } catch (SQLException e) {
             logger.error(e.getMessage(),e);

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/MysqlPerformance.java

@@ -27,7 +27,6 @@ import java.util.Date;
 
 import org.apache.dolphinscheduler.common.enums.DbType;
 import org.apache.dolphinscheduler.common.enums.Flag;
-import org.apache.dolphinscheduler.dao.MonitorDBDao;
 import org.apache.dolphinscheduler.dao.entity.MonitorRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,7 +36,7 @@ import org.slf4j.LoggerFactory;
  */
 public class MysqlPerformance extends BaseDBPerformance{
 
-    private static Logger logger = LoggerFactory.getLogger(MonitorDBDao.class);
+    private static Logger logger = LoggerFactory.getLogger(MysqlPerformance.class);
 
 
     /**

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java

@@ -243,7 +243,7 @@ public class MasterServer implements IStoppable {
      */
     private Runnable heartBeatThread(){
         logger.info("start master heart beat thread...");
-        Runnable heartBeatThread  = new Runnable() {
+        return new Runnable() {
             @Override
             public void run() {
                 if(Stopper.isRunning()) {
@@ -257,7 +257,6 @@ public class MasterServer implements IStoppable {
                 }
             }
         };
-        return heartBeatThread;
     }
 }
 

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java

@@ -64,7 +64,7 @@ public class MasterTaskExecThread extends MasterBaseTaskExecThread {
     /**
      * whether already Killed,default false
      */
-    private Boolean alreadyKilled = false;
+    private boolean alreadyKilled = false;
 
     /**
      * submit task instance and wait complete
@@ -98,7 +98,7 @@ public class MasterTaskExecThread extends MasterBaseTaskExecThread {
         logger.info("wait task: process id: {}, task id:{}, task name:{} complete",
                 this.taskInstance.getProcessInstanceId(), this.taskInstance.getId(), this.taskInstance.getName());
         // task time out
-        Boolean checkTimeout = false;
+        boolean checkTimeout = false;
         TaskTimeoutParameter taskTimeoutParameter = getTaskTimeoutParameter();
         if(taskTimeoutParameter.getEnable()){
             TaskTimeoutStrategy strategy = taskTimeoutParameter.getStrategy();
@@ -189,7 +189,6 @@ public class MasterTaskExecThread extends MasterBaseTaskExecThread {
     private long getRemaintime(long timeoutSeconds) {
         Date startTime = taskInstance.getStartTime();
         long usedTime = (System.currentTimeMillis() - startTime.getTime()) / 1000;
-        long remainTime = timeoutSeconds - usedTime;
+        return timeoutSeconds - usedTime;
-        return remainTime;
     }
 }

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/monitor/MonitorServer.java

@@ -30,7 +30,7 @@ import org.springframework.context.annotation.ComponentScan;
 @ComponentScan("org.apache.dolphinscheduler")
 public class MonitorServer implements CommandLineRunner {
 
-    private static Integer ARGS_LENGTH = 4;
+    private static final Integer ARGS_LENGTH = 4;
 
     private static final Logger logger = LoggerFactory.getLogger(MonitorServer.class);
 

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sqoop/generator/sources/MysqlSourceGenerator.java

@@ -69,17 +69,16 @@ public class MysqlSourceGenerator implements ISourceGenerator {
                             result.append(" --columns ").append(sourceMysqlParameter.getSrcColumns());
                         }
 
-                    }else if(sourceMysqlParameter.getSrcQueryType() == QueryType.SQL.ordinal()){
+                    }else if(sourceMysqlParameter.getSrcQueryType() == QueryType.SQL.ordinal()
-                        if(StringUtils.isNotEmpty(sourceMysqlParameter.getSrcQuerySql())){
+                            && StringUtils.isNotEmpty(sourceMysqlParameter.getSrcQuerySql())){
-
+                        String srcQuery = sourceMysqlParameter.getSrcQuerySql();
-                            String srcQuery = sourceMysqlParameter.getSrcQuerySql();
+                        if(srcQuery.toLowerCase().contains("where")){
-                            if(srcQuery.toLowerCase().contains("where")){
+                            srcQuery += " AND "+"$CONDITIONS";
-                                srcQuery += " AND "+"$CONDITIONS";
+                        }else{
-                            }else{
+                            srcQuery += " WHERE $CONDITIONS";
-                                srcQuery += " WHERE $CONDITIONS";
-                            }
-                            result.append(" --query \'"+srcQuery+"\'");
                         }
+                        result.append(" --query \'"+srcQuery+"\'");
+
                     }
 
                     List<Property>  mapColumnHive = sourceMysqlParameter.getMapColumnHive();

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sqoop/generator/targets/MysqlTargetGenerator.java

@@ -75,12 +75,11 @@ public class MysqlTargetGenerator implements ITargetGenerator {
                         result.append(" --lines-terminated-by '").append(targetMysqlParameter.getLinesTerminated()).append("'");
                     }
 
-                    if(targetMysqlParameter.isUpdate()){
+                    if(targetMysqlParameter.isUpdate()
-                        if(StringUtils.isNotEmpty(targetMysqlParameter.getTargetUpdateKey())&&
+                            && StringUtils.isNotEmpty(targetMysqlParameter.getTargetUpdateKey())
-                                StringUtils.isNotEmpty(targetMysqlParameter.getTargetUpdateMode())){
+                            && StringUtils.isNotEmpty(targetMysqlParameter.getTargetUpdateMode())){
-                            result.append(" --update-key ").append(targetMysqlParameter.getTargetUpdateKey())
+                        result.append(" --update-key ").append(targetMysqlParameter.getTargetUpdateKey())
-                                  .append(" --update-mode ").append(targetMysqlParameter.getTargetUpdateMode());
+                              .append(" --update-mode ").append(targetMysqlParameter.getTargetUpdateMode());
-                        }
                     }
                 }
             }