This is an automated email from the ASF dual-hosted git repository. ascherbakov pushed a commit to branch ignite-13885 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 54b30d9e0a9860027c4f5b5f6807ab79286da682 Author: Alexey Scherbakov <[email protected]> AuthorDate: Tue Dec 29 18:12:02 2020 +0300 IGNITE-13885 get rid of commons. --- modules/raft/pom.xml | 12 +++++------- .../jraft/storage/snapshot/local/LocalSnapshotCopier.java | 5 ++--- .../src/test/java/com/alipay/sofa/jraft/RouteTableTest.java | 6 +++--- .../test/java/com/alipay/sofa/jraft/core/CliServiceTest.java | 6 +++--- .../src/test/java/com/alipay/sofa/jraft/core/NodeTest.java | 5 ++--- .../test/java/com/alipay/sofa/jraft/core/TestCluster.java | 9 ++++----- .../java/com/alipay/sofa/jraft/storage/BaseStorageTest.java | 10 ++++++---- .../java/com/alipay/sofa/jraft/storage/FileServiceTest.java | 11 +++++++---- .../sofa/jraft/storage/impl/LocalRaftMetaStorageTest.java | 4 ++-- .../alipay/sofa/jraft/storage/io/LocalFileReaderTest.java | 5 +++-- .../storage/snapshot/local/LocalSnapshotMetaTableTest.java | 6 +++--- .../storage/snapshot/local/LocalSnapshotReaderTest.java | 3 +-- .../storage/snapshot/local/LocalSnapshotStorageTest.java | 3 +-- .../alipay/sofa/jraft/util/FileOutputSignalHandlerTest.java | 7 +++---- 14 files changed, 45 insertions(+), 47 deletions(-) diff --git a/modules/raft/pom.xml b/modules/raft/pom.xml index 911c2d4..781090f 100644 --- a/modules/raft/pom.xml +++ b/modules/raft/pom.xml @@ -78,12 +78,6 @@ <artifactId>log4j-jcl</artifactId> <version>2.13.2</version> </dependency> - <!-- commons --> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.4</version> - </dependency> <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> @@ -115,9 +109,13 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> + <!-- annotationProcessorPaths requires maven-compiler-plugin version 3.5 or higher --> <version>3.8.1</version> + <configuration> + <source>11</source> + <target>11</target> + </configuration> </plugin> </plugins> </build> - </project> diff --git a/modules/raft/src/main/java/com/alipay/sofa/jraft/storage/snapshot/local/LocalSnapshotCopier.java b/modules/raft/src/main/java/com/alipay/sofa/jraft/storage/snapshot/local/LocalSnapshotCopier.java index bd9d81c..f359f61 100644 --- a/modules/raft/src/main/java/com/alipay/sofa/jraft/storage/snapshot/local/LocalSnapshotCopier.java +++ b/modules/raft/src/main/java/com/alipay/sofa/jraft/storage/snapshot/local/LocalSnapshotCopier.java @@ -27,7 +27,6 @@ import java.util.concurrent.Future; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.apache.commons.io.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -298,7 +297,7 @@ public class LocalSnapshotCopier extends SnapshotCopier { if (localMeta.getSource() == FileSource.FILE_SOURCE_LOCAL) { final String sourcePath = lastSnapshot.getPath() + File.separator + fileName; final String destPath = writer.getPath() + File.separator + fileName; - FileUtils.deleteQuietly(new File(destPath)); + Utils.delete(new File(destPath)); try { Files.createLink(Paths.get(destPath), Paths.get(sourcePath)); } catch (final IOException e) { @@ -319,7 +318,7 @@ public class LocalSnapshotCopier extends SnapshotCopier { } for (final String fileName : toRemove) { final String removePath = writer.getPath() + File.separator + fileName; - FileUtils.deleteQuietly(new File(removePath)); + Utils.delete(new File(removePath)); LOG.info("Deleted file: {}", removePath); } return true; diff --git a/modules/raft/src/test/java/com/alipay/sofa/jraft/RouteTableTest.java b/modules/raft/src/test/java/com/alipay/sofa/jraft/RouteTableTest.java index 1995d3b..9b76f4e 100644 --- a/modules/raft/src/test/java/com/alipay/sofa/jraft/RouteTableTest.java +++ b/modules/raft/src/test/java/com/alipay/sofa/jraft/RouteTableTest.java @@ -16,12 +16,12 @@ */ package com.alipay.sofa.jraft; +import com.alipay.sofa.jraft.util.Utils; import java.io.File; import java.util.ArrayList; import java.util.HashSet; import java.util.List; -import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -59,7 +59,7 @@ public class RouteTableTest { cliClientService = new CliClientServiceImpl(); cliClientService.init(new CliOptions()); this.dataPath = TestUtils.mkTempDir(); - FileUtils.forceMkdir(new File(this.dataPath)); + new File(this.dataPath).mkdirs(); assertEquals(NodeImpl.GLOBAL_NUM_NODES.get(), 0); final List<PeerId> peers = TestUtils.generatePeers(3); @@ -78,7 +78,7 @@ public class RouteTableTest { Thread.sleep(1000); assertEquals(NodeImpl.GLOBAL_NUM_NODES.get(), 0); } - FileUtils.deleteDirectory(new File(this.dataPath)); + Utils.delete(new File(this.dataPath)); NodeManager.getInstance().clear(); RouteTable.getInstance().reset(); } diff --git a/modules/raft/src/test/java/com/alipay/sofa/jraft/core/CliServiceTest.java b/modules/raft/src/test/java/com/alipay/sofa/jraft/core/CliServiceTest.java index d51258c..a49e5ad 100644 --- a/modules/raft/src/test/java/com/alipay/sofa/jraft/core/CliServiceTest.java +++ b/modules/raft/src/test/java/com/alipay/sofa/jraft/core/CliServiceTest.java @@ -16,6 +16,7 @@ */ package com.alipay.sofa.jraft.core; +import com.alipay.sofa.jraft.util.Utils; import java.io.File; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -30,7 +31,6 @@ import java.util.TreeSet; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -75,7 +75,7 @@ public class CliServiceTest { public void setup() throws Exception { System.out.println(">>>>>>>>>>>>>>> Start test method: " + this.testName.getMethodName()); this.dataPath = TestUtils.mkTempDir(); - FileUtils.forceMkdir(new File(this.dataPath)); + new File(this.dataPath).mkdirs(); assertEquals(NodeImpl.GLOBAL_NUM_NODES.get(), 0); final List<PeerId> peers = TestUtils.generatePeers(3); @@ -109,7 +109,7 @@ public class CliServiceTest { Thread.sleep(1000); assertEquals(NodeImpl.GLOBAL_NUM_NODES.get(), 0); } - FileUtils.deleteDirectory(new File(this.dataPath)); + Utils.delete(new File(this.dataPath)); NodeManager.getInstance().clear(); RouteTable.getInstance().reset(); System.out.println(">>>>>>>>>>>>>>> End test method: " + this.testName.getMethodName()); diff --git a/modules/raft/src/test/java/com/alipay/sofa/jraft/core/NodeTest.java b/modules/raft/src/test/java/com/alipay/sofa/jraft/core/NodeTest.java index ffbc283..687ba0a 100644 --- a/modules/raft/src/test/java/com/alipay/sofa/jraft/core/NodeTest.java +++ b/modules/raft/src/test/java/com/alipay/sofa/jraft/core/NodeTest.java @@ -33,7 +33,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -146,7 +145,7 @@ public class NodeTest { public void setup() throws Exception { System.out.println(">>>>>>>>>>>>>>> Start test method: " + this.testName.getMethodName()); this.dataPath = TestUtils.mkTempDir(); - FileUtils.forceMkdir(new File(this.dataPath)); + new File(this.dataPath).mkdirs(); assertEquals(NodeImpl.GLOBAL_NUM_NODES.get(), 0); this.testStartMs = Utils.monotonicMs(); dumpThread.interrupt(); // reset dump timeout @@ -163,7 +162,7 @@ public class NodeTest { Thread.sleep(5000); assertEquals(0, NodeImpl.GLOBAL_NUM_NODES.get()); } - FileUtils.deleteDirectory(new File(this.dataPath)); + Utils.delete(new File(this.dataPath)); NodeManager.getInstance().clear(); this.startedCounter.set(0); this.stoppedCounter.set(0); diff --git a/modules/raft/src/test/java/com/alipay/sofa/jraft/core/TestCluster.java b/modules/raft/src/test/java/com/alipay/sofa/jraft/core/TestCluster.java index aa1bf5e..ffbc985 100644 --- a/modules/raft/src/test/java/com/alipay/sofa/jraft/core/TestCluster.java +++ b/modules/raft/src/test/java/com/alipay/sofa/jraft/core/TestCluster.java @@ -16,6 +16,7 @@ */ package com.alipay.sofa.jraft.core; +import com.alipay.sofa.jraft.util.Utils; import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; @@ -31,8 +32,6 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Collectors; -import org.apache.commons.io.FileUtils; - import com.alipay.sofa.jraft.JRaftServiceFactory; import com.alipay.sofa.jraft.Node; import com.alipay.sofa.jraft.RaftGroupService; @@ -179,7 +178,7 @@ public class TestCluster { nodeOptions.setRaftOptions(raftOptions); } final String serverDataPath = this.dataPath + File.separator + listenAddr.toString().replace(':', '_'); - FileUtils.forceMkdir(new File(serverDataPath)); + new File(serverDataPath).mkdirs(); nodeOptions.setLogUri(serverDataPath + File.separator + "logs"); nodeOptions.setRaftMetaUri(serverDataPath + File.separator + "meta"); nodeOptions.setSnapshotUri(serverDataPath + File.separator + "snapshot"); @@ -229,7 +228,7 @@ public class TestCluster { nodeOptions.setRaftOptions(raftOptions); } final String serverDataPath = this.dataPath + File.separator + listenAddr.toString().replace(':', '_'); - FileUtils.forceMkdir(new File(serverDataPath)); + new File(serverDataPath).mkdirs(); nodeOptions.setLogUri(serverDataPath + File.separator + "logs"); nodeOptions.setRaftMetaUri(serverDataPath + File.separator + "meta"); nodeOptions.setSnapshotUri(serverDataPath + File.separator + "snapshot"); @@ -309,7 +308,7 @@ public class TestCluster { public void clean(final Endpoint listenAddr) throws IOException { final String path = this.dataPath + File.separator + listenAddr.toString().replace(':', '_'); System.out.println("Clean dir:" + path); - FileUtils.deleteDirectory(new File(path)); + Utils.delete(new File(path)); } public Node getLeader() { diff --git a/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/BaseStorageTest.java b/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/BaseStorageTest.java index e7f00c1..c505ad8 100644 --- a/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/BaseStorageTest.java +++ b/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/BaseStorageTest.java @@ -16,10 +16,12 @@ */ package com.alipay.sofa.jraft.storage; +import com.alipay.sofa.jraft.util.Utils; import java.io.File; import java.io.IOException; -import org.apache.commons.io.FileUtils; +import java.nio.charset.Charset; +import java.nio.file.Files; import org.junit.After; import com.alipay.sofa.jraft.test.TestUtils; @@ -29,18 +31,18 @@ public class BaseStorageTest { public void setup() throws Exception { this.path = TestUtils.mkTempDir(); - FileUtils.forceMkdir(new File(this.path)); + new File(this.path).mkdirs(); } @After public void teardown() throws Exception { - FileUtils.deleteDirectory(new File(this.path)); + Utils.delete(new File(this.path)); } protected String writeData() throws IOException { File file = new File(this.path + File.separator + "data"); String data = "jraft is great!"; - FileUtils.writeStringToFile(file, data); + Files.writeString(file.toPath(), data); return data; } diff --git a/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/FileServiceTest.java b/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/FileServiceTest.java index a9f93fe..7887683 100644 --- a/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/FileServiceTest.java +++ b/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/FileServiceTest.java @@ -16,10 +16,13 @@ */ package com.alipay.sofa.jraft.storage; +import com.alipay.sofa.jraft.util.Utils; import java.io.File; import java.io.IOException; -import org.apache.commons.io.FileUtils; +import java.nio.file.Files; +import java.nio.file.OpenOption; +import java.nio.file.StandardOpenOption; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -51,7 +54,7 @@ public class FileServiceTest { @After public void teardown() { - FileUtils.deleteQuietly(new File(this.path)); + Utils.delete(new File(this.path)); FileService.getInstance().clear(); } @@ -90,7 +93,7 @@ public class FileServiceTest { private String writeData() throws IOException { File file = new File(this.path + File.separator + "data"); String data = "jraft is great!"; - FileUtils.writeStringToFile(file, data); + Files.writeString(file.toPath(), data); return data; } @@ -113,7 +116,7 @@ public class FileServiceTest { File file = new File(this.path + File.separator + "data"); String data = "jraft is great!"; for (int i = 0; i < 1000; i++) { - FileUtils.writeStringToFile(file, data, true); + Files.writeString(file.toPath(), data, StandardOpenOption.APPEND); } return data; } diff --git a/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/impl/LocalRaftMetaStorageTest.java b/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/impl/LocalRaftMetaStorageTest.java index fe52645..f480fa8 100644 --- a/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/impl/LocalRaftMetaStorageTest.java +++ b/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/impl/LocalRaftMetaStorageTest.java @@ -16,10 +16,10 @@ */ package com.alipay.sofa.jraft.storage.impl; +import com.alipay.sofa.jraft.util.Utils; import java.io.File; import java.io.IOException; -import org.apache.commons.io.FileUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -94,7 +94,7 @@ public class LocalRaftMetaStorageTest extends BaseStorageTest { @Test public void testSaveFail() throws IOException { - FileUtils.deleteDirectory(new File(this.path)); + Utils.delete(new File(this.path)); assertFalse(this.raftMetaStorage.setVotedFor(new PeerId("localhost", 8081))); Mockito.verify(this.node, Mockito.times(1)).onError((RaftException) Mockito.any()); } diff --git a/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/io/LocalFileReaderTest.java b/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/io/LocalFileReaderTest.java index d78452a..d4bcc66 100644 --- a/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/io/LocalFileReaderTest.java +++ b/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/io/LocalFileReaderTest.java @@ -19,11 +19,12 @@ package com.alipay.sofa.jraft.storage.io; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; +import com.alipay.sofa.jraft.util.Utils; import java.io.File; import java.io.FileNotFoundException; import java.nio.ByteBuffer; -import org.apache.commons.io.FileUtils; +import java.nio.file.Files; import org.junit.Before; import org.junit.Test; @@ -84,7 +85,7 @@ public class LocalFileReaderTest extends BaseStorageTest { for (int i = 0; i < 4096; i++) { data += i % 10; } - FileUtils.writeStringToFile(file, data); + Files.writeString(file.toPath(), data); int read = this.fileReader.readFile(bufRef, "data", 0, 1024); assertEquals(1024, read); diff --git a/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/snapshot/local/LocalSnapshotMetaTableTest.java b/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/snapshot/local/LocalSnapshotMetaTableTest.java index 8438c3a..575403b 100644 --- a/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/snapshot/local/LocalSnapshotMetaTableTest.java +++ b/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/snapshot/local/LocalSnapshotMetaTableTest.java @@ -16,11 +16,11 @@ */ package com.alipay.sofa.jraft.storage.snapshot.local; +import com.alipay.sofa.jraft.util.Utils; import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; -import org.apache.commons.io.FileUtils; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -72,7 +72,7 @@ public class LocalSnapshotMetaTableTest { assertTrue(table.listFiles().contains("data2")); String path = TestUtils.mkTempDir(); - FileUtils.forceMkdir(new File(path)); + new File(path).mkdirs(); try { String filePath = path + File.separator + "table"; table.saveToFile(filePath); @@ -84,7 +84,7 @@ public class LocalSnapshotMetaTableTest { Assert.assertEquals(meta1, newTable.getFileMeta("data1")); Assert.assertEquals(meta2, newTable.getFileMeta("data2")); } finally { - FileUtils.deleteDirectory(new File(path)); + Utils.delete(new File(path)); } } diff --git a/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/snapshot/local/LocalSnapshotReaderTest.java b/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/snapshot/local/LocalSnapshotReaderTest.java index 834803c..2343a2b 100644 --- a/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/snapshot/local/LocalSnapshotReaderTest.java +++ b/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/snapshot/local/LocalSnapshotReaderTest.java @@ -18,7 +18,6 @@ package com.alipay.sofa.jraft.storage.snapshot.local; import java.io.File; -import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -52,7 +51,7 @@ public class LocalSnapshotReaderTest extends BaseStorageTest { public void setup() throws Exception { super.setup(); this.path = this.path + File.separator + Snapshot.JRAFT_SNAPSHOT_PREFIX + snapshotIndex; - FileUtils.forceMkdir(new File(path)); + new File(path).mkdirs(); this.table = new LocalSnapshotMetaTable(new RaftOptions()); this.table.addFile("testFile", LocalFileMetaOutter.LocalFileMeta.newBuilder().setChecksum("test").build()); table.saveToFile(path + File.separator + Snapshot.JRAFT_SNAPSHOT_META_FILE); diff --git a/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/snapshot/local/LocalSnapshotStorageTest.java b/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/snapshot/local/LocalSnapshotStorageTest.java index 5d4077f..3086bed 100644 --- a/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/snapshot/local/LocalSnapshotStorageTest.java +++ b/modules/raft/src/test/java/com/alipay/sofa/jraft/storage/snapshot/local/LocalSnapshotStorageTest.java @@ -18,7 +18,6 @@ package com.alipay.sofa.jraft.storage.snapshot.local; import java.io.File; -import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -45,7 +44,7 @@ public class LocalSnapshotStorageTest extends BaseStorageTest { super.setup(); String snapshotPath = this.path + File.separator + Snapshot.JRAFT_SNAPSHOT_PREFIX + lastSnapshotIndex; - FileUtils.forceMkdir(new File(snapshotPath)); + new File(snapshotPath).mkdirs(); this.table = new LocalSnapshotMetaTable(new RaftOptions()); this.table.setMeta(RaftOutter.SnapshotMeta.newBuilder().setLastIncludedIndex(this.lastSnapshotIndex) .setLastIncludedTerm(1).build()); diff --git a/modules/raft/src/test/java/com/alipay/sofa/jraft/util/FileOutputSignalHandlerTest.java b/modules/raft/src/test/java/com/alipay/sofa/jraft/util/FileOutputSignalHandlerTest.java index 34479fa..f363d63 100644 --- a/modules/raft/src/test/java/com/alipay/sofa/jraft/util/FileOutputSignalHandlerTest.java +++ b/modules/raft/src/test/java/com/alipay/sofa/jraft/util/FileOutputSignalHandlerTest.java @@ -20,7 +20,6 @@ import java.io.File; import java.io.IOException; import java.nio.file.Paths; -import org.apache.commons.io.FileUtils; import org.junit.Test; import static org.junit.Assert.assertTrue; @@ -34,7 +33,7 @@ public class FileOutputSignalHandlerTest { public void testGetOutputFileWithEmptyPath() throws IOException { final File f = getOutputFile("", "test1.log"); assertTrue(f.exists()); - FileUtils.forceDelete(f); + Utils.delete(f); } @Test @@ -42,7 +41,7 @@ public class FileOutputSignalHandlerTest { final String path = "abc"; final File f = getOutputFile(path, "test2.log"); assertTrue(f.exists()); - FileUtils.forceDelete(new File(path)); + Utils.delete(new File(path)); } @Test @@ -50,7 +49,7 @@ public class FileOutputSignalHandlerTest { final String path = Paths.get("cde").toAbsolutePath().toString(); final File f = getOutputFile(path, "test3.log"); assertTrue(f.exists()); - FileUtils.forceDelete(new File(path)); + Utils.delete(new File(path)); } private File getOutputFile(final String path, final String baseName) throws IOException {
