Fix sonar problems resulted by merging master

server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java

@@ -982,7 +982,9 @@ public class TsFileProcessor {
     File logFile = FSFactoryProducer.getFSFactory()
         .getFile(tsFileResource.getFile().getParent(),
             tsFileResource.getFile().getName() + VM_LOG_NAME);
-    logFile.delete();
+    if (logFile.exists()) {
+      Files.delete(logFile.toPath());
+    }
   }
 
   class VmMergeTask implements Runnable {

server/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java

@@ -19,6 +19,13 @@
 
 package org.apache.iotdb.db.writelog.recover;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
 import org.apache.iotdb.db.engine.fileSystem.SystemFileFactory;
 import org.apache.iotdb.db.engine.memtable.IMemTable;
 import org.apache.iotdb.db.engine.memtable.PrimitiveMemTable;
@@ -48,12 +55,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Collections;
-
-import static org.junit.Assert.*;
-
 public class LogReplayerTest {
 
   @Before
@@ -104,7 +105,8 @@ public class LogReplayerTest {
       WriteLogNode node =
           MultiFileLogNodeManager.getInstance().getNode(logNodePrefix + tsFile.getName());
       node.write(
-          new InsertRowPlan("root.sg.device0", 100, "sensor0", TSDataType.INT64, String.valueOf(0)));
+          new InsertRowPlan("root.sg.device0", 100, "sensor0", TSDataType.INT64,
+              String.valueOf(0)));
       node.write(
           new InsertRowPlan("root.sg.device0", 2, "sensor1", TSDataType.INT64, String.valueOf(0)));
       for (int i = 1; i < 5; i++) {
@@ -135,15 +137,15 @@ public class LogReplayerTest {
 
       Modification[] mods = modFile.getModifications().toArray(new Modification[0]);
       assertEquals(1, mods.length);
-      assertEquals(mods[0].getPathString(), "root.sg.device0.sensor0");
-      assertEquals(mods[0].getVersionNum(), 5);
-      assertEquals(((Deletion)mods[0]).getEndTime(), 200);
+      assertEquals("root.sg.device0.sensor0", mods[0].getPathString());
+      assertEquals(5, mods[0].getVersionNum());
+      assertEquals(((Deletion) mods[0]).getEndTime(), 200);
 
-      assertEquals(2, (long) tsFileResource.getStartTime("root.sg.device0"));
-      assertEquals(100, (long) tsFileResource.getEndTime("root.sg.device0"));
+      assertEquals(2, tsFileResource.getStartTime("root.sg.device0"));
+      assertEquals(100, tsFileResource.getEndTime("root.sg.device0"));
       for (int i = 1; i < 5; i++) {
-        assertEquals(i, (long) tsFileResource.getStartTime("root.sg.device" + i));
-        assertEquals(i, (long) tsFileResource.getEndTime("root.sg.device" + i));
+        assertEquals(i, tsFileResource.getStartTime("root.sg.device" + i));
+        assertEquals(i, tsFileResource.getEndTime("root.sg.device" + i));
       }
     } finally {
       modFile.close();

tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/ChunkMetadata.java

@@ -225,8 +225,7 @@ public class ChunkMetadata implements Accountable {
         version == that.version &&
         Objects.equals(measurementUid, that.measurementUid) &&
         tsDataType == that.tsDataType &&
-        ((deleteIntervalList == null && that.deleteIntervalList == null) || deleteIntervalList
-            .equals(that.deleteIntervalList)) &&
+        Objects.equals(deleteIntervalList, that.deleteIntervalList) &&
         Objects.equals(statistics, that.statistics);
   }