You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kd...@apache.org on 2017/02/23 19:41:27 UTC
[1/3] geode git commit: GEODE-2457: Replace
org.apache.geode.internal.FileUtil with org.apache.commons.io.FileUtils
Repository: geode
Updated Branches:
refs/heads/develop fa5963a3e -> 29246ab7f
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
index 9174806..5f885e1 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
@@ -14,7 +14,6 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import static org.awaitility.Awaitility.waitAtMost;
import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
import static org.apache.geode.distributed.ConfigurationProperties.GROUPS;
import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_PORT;
@@ -34,7 +33,9 @@ import static org.apache.geode.test.dunit.Assert.assertNull;
import static org.apache.geode.test.dunit.Assert.assertTrue;
import static org.apache.geode.test.dunit.Assert.fail;
import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
+import static org.awaitility.Awaitility.waitAtMost;
+import org.apache.commons.io.FileUtils;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.PartitionAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
@@ -54,7 +55,6 @@ import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.ClassBuilder;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.RegionEntryContext;
@@ -1364,7 +1364,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
for (String path : this.filesToBeDeleted) {
try {
final File fileToDelete = new File(path);
- FileUtil.delete(fileToDelete);
+ FileUtils.forceDelete(fileToDelete);
if (path.endsWith(".jar")) {
executeCommand("undeploy --jar=" + fileToDelete.getName());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
index 3729416..5b07f28 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
@@ -36,6 +36,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import org.apache.commons.io.FileUtils;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
@@ -53,11 +54,10 @@ import org.apache.geode.cache.query.data.PortfolioPdx;
import org.apache.geode.compression.SnappyCompressor;
import org.apache.geode.distributed.DistributedSystemDisconnectedException;
import org.apache.geode.distributed.Locator;
-import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.distributed.internal.ClusterConfigurationService;
+import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.PartitionedRegion;
@@ -257,7 +257,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
vm.invoke(new SerializableRunnable() {
public void run() {
try {
- FileUtil.delete((new File(diskStoreName + vm.getPid())));
+ FileUtils.deleteDirectory((new File(diskStoreName + vm.getPid())));
} catch (IOException iex) {
// There's nothing else we can do
}
@@ -498,7 +498,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
vm.invoke(new SerializableRunnable() {
public void run() {
try {
- FileUtil.delete((new File(diskStoreName + vm.getPid())));
+ FileUtils.deleteDirectory((new File(diskStoreName + vm.getPid())));
} catch (IOException iex) {
// There's nothing else we can do
}
@@ -1475,7 +1475,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
private void deleteFiles() throws IOException {
for (String path : this.filesToBeDeleted) {
- FileUtil.delete(new File(path));
+ FileUtils.deleteDirectory(new File(path));
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
index 2fc8e84..cb9a8c6 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart1DUnitTest.java
@@ -14,19 +14,15 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import static org.apache.geode.test.dunit.Assert.*;
-import static org.apache.geode.test.dunit.LogWriterUtils.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.fail;
+import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
+import org.apache.commons.io.FileUtils;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.logging.LogWriterImpl;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.CommandResult;
@@ -38,6 +34,11 @@ import org.apache.geode.test.junit.categories.FlakyTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
/**
* Dunit class for testing gemfire function commands : export logs
*/
@@ -100,7 +101,7 @@ public class MiscellaneousCommandsExportLogsPart1DUnitTest extends CliCommandTes
} else {
fail("testExportLogs failed as did not get CommandResult");
}
- FileUtil.delete(new File("./testExportLogs" + dir));
+ FileUtils.deleteDirectory(new File("./testExportLogs" + dir));
}
@Category(FlakyTest.class) // GEODE-1477 (http)
@@ -132,6 +133,6 @@ public class MiscellaneousCommandsExportLogsPart1DUnitTest extends CliCommandTes
} else {
fail("testExportLogsForMerge failed as did not get CommandResult");
}
- FileUtil.delete(new File("./testExportLogsForMerge" + dir));
+ FileUtils.deleteDirectory(new File("./testExportLogsForMerge" + dir));
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
index d1f44d1..2b2e524 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart2DUnitTest.java
@@ -14,19 +14,15 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import static org.apache.geode.test.dunit.Assert.*;
-import static org.apache.geode.test.dunit.LogWriterUtils.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.fail;
+import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
+import org.apache.commons.io.FileUtils;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.logging.LogWriterImpl;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.CommandResult;
@@ -34,10 +30,14 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.junit.categories.DistributedTest;
-
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
/**
* Dunit class for testing gemfire function commands : export logs
*/
@@ -101,7 +101,7 @@ public class MiscellaneousCommandsExportLogsPart2DUnitTest extends CliCommandTes
} else {
fail("testExportLogsForLogLevel failed as did not get CommandResult");
}
- FileUtil.delete(new File("testExportLogsForLogLevel" + dir));
+ FileUtils.deleteDirectory(new File("testExportLogsForLogLevel" + dir));
}
@Test
@@ -136,6 +136,6 @@ public class MiscellaneousCommandsExportLogsPart2DUnitTest extends CliCommandTes
} else {
fail("testExportLogsForLogLevelWithUPTOLOGLEVEL failed as did not get CommandResult");
}
- FileUtil.delete(new File("testExportLogsForLogLevelWithUPTOLOGLEVEL" + dir));
+ FileUtils.deleteDirectory(new File("testExportLogsForLogLevelWithUPTOLOGLEVEL" + dir));
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
index b6a4a5b..efef2c4 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
@@ -14,11 +14,17 @@
*/
package org.apache.geode.management.internal.cli.commands;
+import static org.apache.geode.distributed.ConfigurationProperties.GROUPS;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.fail;
+import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
+
+import org.apache.commons.io.FileUtils;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.logging.LogWriterImpl;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.CommandResult;
@@ -36,11 +42,6 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Properties;
-import static org.apache.geode.test.dunit.Assert.assertEquals;
-import static org.apache.geode.test.dunit.Assert.fail;
-import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
/**
* Dunit class for testing gemfire function commands : export logs
*/
@@ -115,7 +116,7 @@ public class MiscellaneousCommandsExportLogsPart3DUnitTest extends CliCommandTes
} else {
fail("testExportLogsForGroup failed as did not get CommandResult");
}
- FileUtil.delete(new File("testExportLogsForGroup" + dir));
+ FileUtils.deleteQuietly(new File("testExportLogsForGroup" + dir));
}
@Test
@@ -150,6 +151,6 @@ public class MiscellaneousCommandsExportLogsPart3DUnitTest extends CliCommandTes
} else {
fail("testExportLogsForMember failed as did not get CommandResult");
}
- FileUtil.delete(new File("testExportLogsForMember" + dir));
+ FileUtils.deleteQuietly(new File("testExportLogsForMember" + dir));
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
index b712785..9d64bd9 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart4DUnitTest.java
@@ -14,19 +14,15 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import static org.apache.geode.test.dunit.Assert.*;
-import static org.apache.geode.test.dunit.LogWriterUtils.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import static org.apache.geode.test.dunit.Assert.fail;
+import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
+import org.apache.commons.io.FileUtils;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.logging.LogWriterImpl;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.CommandResult;
@@ -38,6 +34,11 @@ import org.apache.geode.test.junit.categories.FlakyTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
/**
* Dunit class for testing gemfire function commands : export logs
*/
@@ -100,7 +101,7 @@ public class MiscellaneousCommandsExportLogsPart4DUnitTest extends CliCommandTes
} else {
fail("testExportLogsForTimeRange1 failed as did not get CommandResult");
}
- FileUtil.delete(new File("testExportLogsForTimeRange1" + dir));
+ FileUtils.deleteQuietly(new File("testExportLogsForTimeRange1" + dir));
}
@Category(FlakyTest.class) // GEODE-1500 (http)
@@ -132,6 +133,6 @@ public class MiscellaneousCommandsExportLogsPart4DUnitTest extends CliCommandTes
} else {
fail("testExportLogsForTimeRangeForOnlyStartTime failed as did not get CommandResult");
}
- FileUtil.delete(new File("testExportLogsForTimeRangeForOnlyStartTime" + dir));
+ FileUtils.deleteQuietly(new File("testExportLogsForTimeRangeForOnlyStartTime" + dir));
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java
index 685bd48..42a0624 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/QueueCommandsDUnitTest.java
@@ -34,15 +34,15 @@ import static org.apache.geode.test.dunit.Assert.fail;
import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
import static org.apache.geode.test.dunit.Wait.waitForCriterion;
+import org.apache.commons.io.FileUtils;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
import org.apache.geode.distributed.Locator;
-import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.distributed.internal.ClusterConfigurationService;
+import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.ClassBuilder;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
@@ -62,6 +62,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.nio.file.Files;
import java.util.List;
import java.util.Properties;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -418,7 +419,10 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
for (String path : this.filesToBeDeleted) {
try {
final File fileToDelete = new File(path);
- FileUtil.delete(fileToDelete);
+ if (fileToDelete.isDirectory())
+ FileUtils.deleteDirectory(fileToDelete);
+ else
+ Files.delete(fileToDelete.toPath());
if (path.endsWith(".jar")) {
executeCommand("undeploy --jar=" + fileToDelete.getName());
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/UserCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/UserCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/UserCommandsDUnitTest.java
index 9611b39..24f5cdb 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/UserCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/UserCommandsDUnitTest.java
@@ -14,10 +14,12 @@
*/
package org.apache.geode.management.internal.cli.commands;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+
+import org.apache.commons.io.FileUtils;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.ClassBuilder;
import org.apache.geode.internal.ClassPathLoader;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.CommandManager;
import org.apache.geode.management.internal.cli.result.CommandResult;
@@ -32,8 +34,6 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Properties;
-import static org.apache.geode.test.dunit.Assert.assertEquals;
-
/**
* Unit tests for configuring user commands.
*
@@ -58,9 +58,9 @@ public class UserCommandsDUnitTest extends CliCommandTestBase {
@Override
public final void postTearDownCacheTestCase() throws Exception {
if (this.deleteJarDirectory) {
- FileUtil.delete(this.jarDirectory);
+ FileUtils.deleteDirectory(this.jarDirectory);
} else {
- FileUtil.delete(this.jarFile);
+ FileUtils.forceDelete(this.jarFile);
}
System.clearProperty(CommandManager.USER_CMD_PACKAGES_PROPERTY);
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
index 753fcde..ef15cd5 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxAttributesJUnitTest.java
@@ -14,13 +14,21 @@
*/
package org.apache.geode.pdx;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+
+import org.apache.commons.io.FileUtils;
import org.apache.geode.DataSerializer;
import org.apache.geode.ToDataException;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.CacheWriterException;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.client.PoolManager;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.GemFireCacheImpl;
@@ -42,9 +50,6 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.Map;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
-
/**
*
*/
@@ -66,7 +71,7 @@ public class PdxAttributesJUnitTest {
if (instance != null) {
instance.close();
}
- FileUtil.delete(diskDir);
+ FileUtils.deleteDirectory(diskDir);
File[] defaultStoreFiles = new File(".").listFiles(new FilenameFilter() {
public boolean accept(File dir, String name) {
@@ -75,7 +80,7 @@ public class PdxAttributesJUnitTest {
});
for (File file : defaultStoreFiles) {
- FileUtil.delete(file);
+ FileUtils.forceDelete(file);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
index 72645d9..d1502cd 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
@@ -14,31 +14,12 @@
*/
package org.apache.geode.pdx;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.NotSerializableException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.geode.test.junit.categories.SerializationTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import org.apache.geode.CopyHelper;
import org.apache.geode.DataSerializable;
@@ -51,7 +32,6 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.internal.DSCODE;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.PdxSerializerObject;
import org.apache.geode.internal.SystemAdmin;
@@ -66,6 +46,30 @@ import org.apache.geode.pdx.internal.PdxWriterImpl;
import org.apache.geode.pdx.internal.PeerTypeRegistration;
import org.apache.geode.pdx.internal.TypeRegistry;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SerializationTest;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.NotSerializableException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
@Category({IntegrationTest.class, SerializationTest.class})
public class PdxSerializableJUnitTest {
@@ -188,7 +192,13 @@ public class PdxSerializableJUnitTest {
try {
this.c.close();
} finally {
- FileUtil.deleteMatching(new File("."), "BACKUP(DEFAULT|pdxDS|r2DS).*");
+ Pattern pattern = Pattern.compile("BACKUP(DEFAULT|pdxDS|r2DS).*");
+ File[] files = new File(".").listFiles((dir1, name) -> pattern.matcher(name).matches());
+ if (files != null) {
+ for (File file : files) {
+ Files.delete(file.toPath());
+ }
+ }
}
}
}
@@ -265,7 +275,13 @@ public class PdxSerializableJUnitTest {
try {
this.c.close();
} finally {
- FileUtil.deleteMatching(new File("."), "BACKUP(DEFAULT|r2DS).*");
+ Pattern pattern = Pattern.compile("BACKUP(DEFAULT|r2DS).*");
+ File[] files = new File(".").listFiles((dir1, name) -> pattern.matcher(name).matches());
+ if (files != null) {
+ for (File file : files) {
+ Files.delete(file.toPath());
+ }
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
index d7b15fc..4e0e82f 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
@@ -14,7 +14,13 @@
*/
package org.apache.geode.test.dunit.standalone;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_NETWORK_PARTITION_DETECTION;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.InternalLocator;
+import org.apache.geode.test.dunit.VM;
import java.io.BufferedReader;
import java.io.File;
@@ -24,6 +30,7 @@ import java.io.InputStreamReader;
import java.io.PrintStream;
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
+import java.nio.file.Files;
import java.rmi.AccessException;
import java.rmi.NotBoundException;
import java.rmi.RemoteException;
@@ -33,13 +40,6 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.io.FileUtils;
-
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.distributed.internal.InternalLocator;
-import org.apache.geode.internal.FileUtil;
-import org.apache.geode.test.dunit.VM;
-
/**
*
*/
@@ -76,7 +76,7 @@ public class ProcessManager {
workingDir.mkdirs();
} else if (!bouncedVM || DUnitLauncher.MAKE_NEW_WORKING_DIRS) {
try {
- FileUtil.delete(workingDir);
+ Files.delete(workingDir.toPath());
} catch (IOException e) {
// This delete is occasionally failing on some platforms, maybe due to a lingering
// process. Allow the process to be launched anyway.
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/util/test/TestUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/util/test/TestUtil.java b/geode-core/src/test/java/org/apache/geode/util/test/TestUtil.java
index 927008b..92fd2c5 100644
--- a/geode-core/src/test/java/org/apache/geode/util/test/TestUtil.java
+++ b/geode-core/src/test/java/org/apache/geode/util/test/TestUtil.java
@@ -14,14 +14,14 @@
*/
package org.apache.geode.util.test;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.SystemUtils;
+
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
-import org.apache.commons.lang.SystemUtils;
-import org.apache.geode.internal.FileUtil;
-
public class TestUtil {
/**
@@ -46,7 +46,7 @@ public class TestUtil {
String filename = name.replaceFirst(".*/", "");
File tmpFile = File.createTempFile(filename, null);
tmpFile.deleteOnExit();
- FileUtil.copy(resource, tmpFile);
+ FileUtils.copyFile(new File(resource.getFile()), tmpFile);
return compatibleWithWindows(tmpFile.getAbsolutePath());
}
return compatibleWithWindows(path);
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
index 4620f1d..f0704e8 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/WANTestBase.java
@@ -14,41 +14,35 @@
*/
package org.apache.geode.internal.cache.wan;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentSkipListSet;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
-
-import org.awaitility.Awaitility;
-import org.junit.experimental.categories.Category;
-
+import static org.apache.geode.distributed.ConfigurationProperties.CONSERVE_SOCKETS;
+import static org.apache.geode.distributed.ConfigurationProperties.DISTRIBUTED_SYSTEM_ID;
+import static org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_CIPHERS;
+import static org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_ENABLED;
+import static org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_KEYSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_KEYSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_KEYSTORE_TYPE;
+import static org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_PROTOCOLS;
+import static org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_REQUIRE_AUTHENTICATION;
+import static org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_TRUSTSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.GATEWAY_SSL_TRUSTSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_HTTP_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_START;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE;
+import static org.apache.geode.distributed.ConfigurationProperties.REMOTE_LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.apache.commons.io.FileUtils;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.AttributesMutator;
import org.apache.geode.cache.Cache;
@@ -92,7 +86,6 @@ import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.admin.remote.DistributionLocatorId;
import org.apache.geode.internal.cache.BucketRegion;
import org.apache.geode.internal.cache.CacheConfig;
@@ -132,6 +125,36 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.util.test.TestUtil;
+import org.awaitility.Awaitility;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
@Category(DistributedTest.class)
public class WANTestBase extends JUnit4DistributedTestCase {
@@ -3703,7 +3726,7 @@ public class WANTestBase extends JUnit4DistributedTestCase {
public static void deletePDXDir() throws IOException {
File pdxDir = new File(CacheTestCase.getDiskDir(), "pdx");
- FileUtil.delete(pdxDir);
+ FileUtils.deleteDirectory(pdxDir);
}
public static void shutdownLocator() {
[3/3] geode git commit: GEODE-2457: Replace
org.apache.geode.internal.FileUtil with org.apache.commons.io.FileUtils
Posted by kd...@apache.org.
GEODE-2457: Replace org.apache.geode.internal.FileUtil with org.apache.commons.io.FileUtils
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/29246ab7
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/29246ab7
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/29246ab7
Branch: refs/heads/develop
Commit: 29246ab7f136e6bd8c91d055980a6ed639ad60e6
Parents: fa5963a
Author: Kevin J. Duling <kd...@pivotal.io>
Authored: Fri Feb 10 15:45:45 2017 -0800
Committer: Kevin J. Duling <kd...@pivotal.io>
Committed: Thu Feb 23 11:09:35 2017 -0800
----------------------------------------------------------------------
.../session/installer/InstallerJUnitTest.java | 19 +-
.../org/apache/geode/BundledJarsJUnitTest.java | 27 +-
...erConfigurationServiceEndToEndDUnitTest.java | 8 -
.../org/apache/geode/internal/FileUtil.java | 328 -------------------
.../geode/internal/cache/DiskInitFile.java | 60 ++--
.../geode/internal/cache/DiskStoreImpl.java | 192 +++++------
.../org/apache/geode/internal/cache/Oplog.java | 82 ++++-
.../internal/cache/PersistentOplogSet.java | 40 ++-
.../cache/persistence/BackupManager.java | 57 ++--
.../cache/persistence/RestoreScript.java | 6 +-
.../io/MainWithChildrenRollingFileHandler.java | 23 +-
.../geode/internal/logging/MergeLogFiles.java | 29 +-
.../client/ClientCacheFactoryJUnitTest.java | 17 +-
.../geode/cache/query/QueryTestUtils.java | 30 +-
.../dunit/QueryIndexUsingXMLDUnitTest.java | 31 +-
.../functional/IndexCreationJUnitTest.java | 51 +--
.../AbstractLauncherIntegrationTestCase.java | 16 +-
.../geode/internal/FileUtilJUnitTest.java | 101 ------
.../geode/internal/JarDeployerDUnitTest.java | 28 +-
.../internal/JarDeployerIntegrationTest.java | 2 +-
.../geode/internal/PdxDeleteFieldDUnitTest.java | 30 +-
.../geode/internal/PdxDeleteFieldJUnitTest.java | 32 +-
.../geode/internal/PdxRenameDUnitTest.java | 30 +-
.../geode/internal/PdxRenameJUnitTest.java | 20 +-
.../geode/internal/cache/BackupDUnitTest.java | 113 ++++---
.../geode/internal/cache/BackupJUnitTest.java | 58 +++-
.../cache/DiskRegionAsyncRecoveryJUnitTest.java | 28 +-
.../internal/cache/DiskRegionTestingBase.java | 36 +-
.../cache/IncrementalBackupDUnitTest.java | 167 ++++++----
.../geode/internal/cache/OplogRVVJUnitTest.java | 42 +--
.../cache/PartitionedRegionStatsJUnitTest.java | 25 +-
.../PersistentPartitionedRegionJUnitTest.java | 25 +-
...tentColocatedPartitionedRegionDUnitTest.java | 55 ++--
.../PersistentPartitionedRegionTestBase.java | 33 +-
.../fixed/FixedPartitioningTestBase.java | 40 ++-
.../persistence/BackupInspectorJUnitTest.java | 18 +-
.../PersistentReplicatedTestBase.java | 26 +-
.../RollingUpgrade2DUnitTest.java | 6 +-
.../rollingupgrade/RollingUpgradeDUnitTest.java | 7 +-
.../logging/log4j/Log4J2PerformanceTest.java | 27 +-
.../log4j/LogWriterLoggerPerformanceTest.java | 27 +-
.../internal/net/SSLSocketIntegrationTest.java | 49 +--
...eateAlterDestroyRegionCommandsDUnitTest.java | 6 +-
.../commands/DiskStoreCommandsDUnitTest.java | 10 +-
...laneousCommandsExportLogsPart1DUnitTest.java | 21 +-
...laneousCommandsExportLogsPart2DUnitTest.java | 22 +-
...laneousCommandsExportLogsPart3DUnitTest.java | 17 +-
...laneousCommandsExportLogsPart4DUnitTest.java | 21 +-
.../cli/commands/QueueCommandsDUnitTest.java | 10 +-
.../cli/commands/UserCommandsDUnitTest.java | 10 +-
.../geode/pdx/PdxAttributesJUnitTest.java | 19 +-
.../geode/pdx/PdxSerializableJUnitTest.java | 72 ++--
.../test/dunit/standalone/ProcessManager.java | 18 +-
.../org/apache/geode/util/test/TestUtil.java | 8 +-
.../geode/internal/cache/wan/WANTestBase.java | 97 +++---
55 files changed, 1078 insertions(+), 1294 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
index e51241b..aa3e0d2 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
@@ -14,22 +14,21 @@
*/
package org.apache.geode.modules.session.installer;
-import static org.junit.Assert.*;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import org.apache.geode.internal.FileUtil;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import static org.junit.Assert.assertEquals;
+import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+
@Category(IntegrationTest.class)
public class InstallerJUnitTest {
@@ -43,7 +42,7 @@ public class InstallerJUnitTest {
private void testTransformation(final String name) throws Exception {
File webXmlFile = temporaryFolder.newFile();
- FileUtil.copy(getClass().getResource(name), webXmlFile);
+ FileUtils.copyFile(new File(getClass().getResource(name).getFile()), webXmlFile);
final String[] args = {"-t", "peer-to-peer", "-w", webXmlFile.getAbsolutePath()};
ByteArrayOutputStream output = new ByteArrayOutputStream();
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
index b7ada4a..3f0e2c0 100644
--- a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
@@ -14,13 +14,21 @@
*/
package org.apache.geode;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.RestAPITest;
+import org.apache.geode.util.test.TestUtil;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
-import java.util.List;
+import java.util.Collection;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
@@ -28,15 +36,6 @@ import java.util.jar.JarFile;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.geode.test.junit.categories.RestAPITest;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.internal.FileUtil;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.util.test.TestUtil;
-
@Category({IntegrationTest.class, RestAPITest.class})
public class BundledJarsJUnitTest {
@@ -93,11 +92,11 @@ public class BundledJarsJUnitTest {
"Please set the GEODE_HOME environment variable to the product installation directory.",
geodeHomeDirectory.isDirectory());
- List<File> jars = FileUtil.findAll(geodeHomeDirectory, ".*\\.jar");
+ Collection<File> jars = FileUtils.listFiles(geodeHomeDirectory, new String[] {"jar"}, true);
TreeMap<String, String> sortedJars = new TreeMap<String, String>();
- jars.stream().forEach(jar -> sortedJars.put(jar.getName(), jar.getPath()));
+ jars.forEach(jar -> sortedJars.put(jar.getName(), jar.getPath()));
- List<File> wars = FileUtil.findAll(geodeHomeDirectory, ".*\\.war");
+ Collection<File> wars = FileUtils.listFiles(geodeHomeDirectory, new String[] {"war"}, true);
TreeSet<File> sortedWars = new TreeSet<File>(wars);
sortedWars.stream().flatMap(BundledJarsJUnitTest::extractJarNames)
.forEach(jar -> sortedJars.put(jar.getName(), jar.getPath()));
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java
index a96f8af..0103cf6 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationServiceEndToEndDUnitTest.java
@@ -27,8 +27,6 @@ import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.apache.geode.distributed.ConfigurationProperties.NAME;
import static org.apache.geode.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
-import static org.apache.geode.internal.FileUtil.delete;
-import static org.apache.geode.internal.FileUtil.deleteMatching;
import static org.apache.geode.internal.lang.StringUtils.isBlank;
import static org.apache.geode.management.internal.cli.CliUtil.getAllNormalMembers;
import static org.apache.geode.test.dunit.Assert.assertEquals;
@@ -48,7 +46,6 @@ import org.apache.geode.cache.wan.GatewaySender.OrderPolicy;
import org.apache.geode.distributed.Locator;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.ClassBuilder;
-import org.apache.geode.internal.JarDeployer;
import org.apache.geode.internal.admin.remote.ShutdownAllRequest;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.management.cli.Result.Status;
@@ -323,11 +320,6 @@ public class ClusterConfigurationServiceEndToEndDUnitTest extends CliCommandTest
jarFileNames.add(jarName);
}
- private void deleteSavedJarFiles() throws IOException {
- deleteMatching(new File("."), "^" + JarDeployer.JAR_PREFIX + "Deploy1.*#\\d++$");
- delete(new File("Deploy1.jar"));
- }
-
private Object[] setup() throws IOException {
final int[] ports = getRandomAvailableTCPPorts(3);
final int locator1Port = ports[0];
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/main/java/org/apache/geode/internal/FileUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/FileUtil.java b/geode-core/src/main/java/org/apache/geode/internal/FileUtil.java
deleted file mode 100644
index 2d72930..0000000
--- a/geode-core/src/main/java/org/apache/geode/internal/FileUtil.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.internal;
-
-import org.apache.geode.distributed.internal.DistributionConfig;
-
-import java.io.*;
-import java.net.URL;
-import java.nio.channels.FileChannel;
-import java.nio.file.Files;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This class contains static methods for manipulating files and directories, such as recursively
- * copying or deleting files.
- *
- * TODO A lot of this functionality is probably duplicating apache commons io, maybe we should
- * switch to that.
- *
- *
- */
-public class FileUtil {
- public static final long MAX_TRANSFER_SIZE =
- Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "FileUtil.MAX_TRANSFER_SIZE", 1024 * 1024)
- .longValue();
- public static final boolean USE_NIO =
- !Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "FileUtil.USE_OLD_IO");
- public static final String extSeparator = ".";
-
- /**
- * Copy a file from the source file to the destination file. If the source is a directory, it will
- * be copied recursively.
- *
- * Note that unlike unix cp, if the destination is directory, the source *contents* will be copied
- * to the destination *contents*, not as a subdirectory of dest.
- *
- * @param source the source file or directory
- * @param dest the destination file or directory.
- * @throws IOException
- */
- public static void copy(File source, File dest) throws IOException {
- if (source.isDirectory()) {
- dest.mkdir();
- for (File child : listFiles(source)) {
- copy(child, new File(dest, child.getName()));
- }
- } else {
- if (source.exists()) {
- long lm = source.lastModified();
- if (dest.isDirectory()) {
- dest = new File(dest, source.getName());
- }
- FileOutputStream fos = new FileOutputStream(dest);
- try {
- FileInputStream fis = new FileInputStream(source);
- try {
- if (USE_NIO) {
- nioCopy(fos, fis);
- } else {
- oioCopy(source, fos, fis);
- }
- } finally {
- fis.close();
- }
- } finally {
- fos.close();
- }
- dest.setExecutable(source.canExecute(), true);
- dest.setLastModified(lm);
- }
- }
- }
-
- /**
- * Basically just like {@link File#listFiles()} but instead of returning null returns an empty
- * array. This fixes bug 43729
- */
- public static File[] listFiles(File dir) {
- File[] result = dir.listFiles();
- if (result == null) {
- result = new File[0];
- }
- return result;
- }
-
- /**
- * Basically just like {@link File#listFiles(FilenameFilter)} but instead of returning null
- * returns an empty array. This fixes bug 43729
- */
- public static File[] listFiles(File dir, FilenameFilter filter) {
- File[] result = dir.listFiles(filter);
- if (result == null) {
- result = new File[0];
- }
- return result;
- }
-
- /**
- * Copy a single file using NIO.
- *
- * @throws IOException
- */
- private static void nioCopy(FileOutputStream fos, FileInputStream fis) throws IOException {
- FileChannel outChannel = fos.getChannel();
- FileChannel inChannel = fis.getChannel();
- long length = inChannel.size();
- long offset = 0;
- while (true) {
- long remaining = length - offset;
-
- long toTransfer = remaining < MAX_TRANSFER_SIZE ? remaining : MAX_TRANSFER_SIZE;
- long transferredBytes = inChannel.transferTo(offset, toTransfer, outChannel);
- offset += transferredBytes;
- length = inChannel.size();
- if (offset >= length) {
- break;
- }
- }
- }
-
- /**
- * Copy a single file using the java.io.
- *
- * @throws IOException
- */
- private static void oioCopy(File source, FileOutputStream fos, FileInputStream fis)
- throws IOException {
- int size = (int) (source.length() < MAX_TRANSFER_SIZE ? source.length() : MAX_TRANSFER_SIZE);
- byte[] buffer = new byte[size];
- int read;
- while ((read = fis.read(buffer)) > 0) {
- fos.write(buffer, 0, read);
- }
-
- }
-
- /**
- * Recursively delete a file or directory.
- *
- * @throws IOException if the file or directory couldn't be deleted. Unlike File.delete, which
- * just returns false.
- */
- public static void delete(File file) throws IOException {
- if (!file.exists())
- return;
-
- if (file.isDirectory()) {
- for (File child : listFiles(file)) {
- delete(child);
- }
- }
-
- Files.delete(file.toPath());
- }
-
- /**
- * Recursively delete a file or directory. A description of any files or directories that can not
- * be deleted will be added to failures if failures is non-null. This method tries to delete as
- * much as possible.
- */
- public static void delete(File file, StringBuilder failures) {
- if (!file.exists())
- return;
-
- if (file.isDirectory()) {
- for (File child : listFiles(file)) {
- delete(child, failures);
- }
- }
-
- try {
- Files.delete(file.toPath());
- } catch (IOException e) {
- if (failures != null) {
- failures.append("Could not delete ").append(file).append(" due to ").append(e.getMessage())
- .append('\n');
- }
- }
- }
-
- /**
- * Find the file whose name matches the given regular expression. The regex is matched against the
- * absolute path of the file.
- *
- * This could probably use a lot of optimization!
- */
- public static File find(File baseFile, String regex) {
- if (baseFile.getAbsolutePath().matches(regex)) {
- return baseFile;
- }
- if (baseFile.exists() && baseFile.isDirectory()) {
- for (File child : listFiles(baseFile)) {
- File foundFile = find(child, regex);
- if (foundFile != null) {
- return foundFile;
- }
- }
- }
- return null;
- }
-
- /**
- * Find a files in a given base directory that match a the given regex. The regex is matched
- * against the full path of the file.
- */
- public static List<File> findAll(File baseFile, String regex) {
- ArrayList<File> found = new ArrayList<File>();
- findAll(baseFile, regex, found);
- return found;
- }
-
- /**
- * Destroys all files that match the given regex that are in the given directory. If a destroy
- * fails it is ignored and an attempt is made to destroy any other files that match.
- */
- public static void deleteMatching(File baseFile, String regex) {
- if (baseFile.exists() && baseFile.isDirectory()) {
- for (File child : listFiles(baseFile)) {
- if (child.getName().matches(regex)) {
- try {
- delete(child);
- } catch (IOException ignore) {
- }
- }
- }
- }
- }
-
- /** Implementation of findAll. */
- private static void findAll(File baseFile, String regex, List<File> found) {
- if (baseFile.getAbsolutePath().matches(regex)) {
- found.add(baseFile);
- }
- if (baseFile.exists() && baseFile.isDirectory()) {
- for (File child : listFiles(baseFile)) {
- findAll(child, regex, found);
- }
- }
- }
-
- /**
- * Convert a file into a relative path from a given parent. This is useful if you want to write
- * out the file name into that parent directory.
- *
- * @param parent The parent directory.
- * @param file The file we want to covert to a relative file.
- * @return A file, such that new File(parent, returnValue) == file. Note that if file does not
- * have the parent in it's path, an the absolute version if the file is returned.
- */
- public static File removeParent(File parent, File file) {
- String absolutePath = file.getAbsolutePath();
- String parentAbsolutePath = parent.getAbsolutePath();
- String newPath = absolutePath.replace(parentAbsolutePath + "/", "");
- return new File(newPath);
- }
-
- /**
- * Copy a URL to a file.
- *
- * @throws IOException
- */
- public static void copy(URL url, File file) throws IOException {
- InputStream is = url.openStream();
- try {
- OutputStream os = new FileOutputStream(file);
- try {
- byte[] buffer = new byte[8192];
- int read;
- while ((read = is.read(buffer)) > 0) {
- os.write(buffer, 0, read);
- }
- } finally {
- os.close();
- }
- } finally {
- is.close();
- }
-
- }
-
- /**
- * A safer version of File.mkdirs, which works around a race in the 1.5 JDK where two VMs creating
- * the same directory chain at the same time could end up in one VM failing to create a
- * subdirectory.
- *
- * @param file
- */
- public static boolean mkdirs(File file) {
- final File parentFile = file.getAbsoluteFile().getParentFile();
- if (!parentFile.exists()) {
- mkdirs(parentFile);
- }
- // As long as someone successfully created the parent file
- // go ahead and create the child directory.
- if (parentFile.exists()) {
- return file.mkdir();
- } else {
- return false;
- }
- }
-
- /**
- * Returns the file name with the extension stripped off (if it has one).
- *
- * @param fileName the file name
- * @return the file name with the extension stripped off (if it had one)
- */
- public static String stripOffExtension(final String fileName) {
- if (fileName.contains(extSeparator)) {
- // strip off the extension and right-most "."
- return fileName.substring(0, fileName.lastIndexOf(extSeparator));
- }
- return fileName;
- }
-}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/main/java/org/apache/geode/internal/cache/DiskInitFile.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskInitFile.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskInitFile.java
index 4023b71..f6bf17f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskInitFile.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskInitFile.java
@@ -20,35 +20,7 @@ import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.longs.LongIterator;
import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
import it.unimi.dsi.fastutil.objects.ObjectIterator;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.DataOutput;
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.logging.log4j.Logger;
-
+import org.apache.commons.io.FileUtils;
import org.apache.geode.CancelCriterion;
import org.apache.geode.CancelException;
import org.apache.geode.DataSerializer;
@@ -59,7 +31,6 @@ import org.apache.geode.cache.EvictionAlgorithm;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.compression.Compressor;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.InternalInstantiator;
@@ -80,6 +51,33 @@ import org.apache.geode.internal.cache.versions.RegionVersionVector;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.logging.log4j.Logger;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.DataOutput;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
/**
* Does all the IF file work for a DiskStoreImpl.
@@ -1506,7 +1504,7 @@ public class DiskInitFile implements DiskInitFileInterpreter {
public void copyTo(File targetDir) throws IOException {
lock.lock(false);
try {
- FileUtil.copy(this.ifFile, targetDir);
+ FileUtils.copyFileToDirectory(this.ifFile, targetDir);
} finally {
lock.unlock();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
index e53aa5d..cce8100 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DiskStoreImpl.java
@@ -14,25 +14,47 @@
*/
package org.apache.geode.internal.cache;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
+import org.apache.commons.io.FileUtils;
import org.apache.geode.CancelCriterion;
import org.apache.geode.CancelException;
import org.apache.geode.StatisticsFactory;
import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheClosedException;
+import org.apache.geode.cache.DiskAccessException;
+import org.apache.geode.cache.DiskStore;
+import org.apache.geode.cache.DiskStoreFactory;
+import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.cache.persistence.PersistentID;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.i18n.StringId;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.DiskEntry.Helper.ValueWrapper;
import org.apache.geode.internal.cache.DiskEntry.RecoveredEntry;
import org.apache.geode.internal.cache.ExportDiskRegion.ExportWriter;
import org.apache.geode.internal.cache.lru.LRUAlgorithm;
import org.apache.geode.internal.cache.lru.LRUStatistics;
-import org.apache.geode.internal.cache.persistence.*;
+import org.apache.geode.internal.cache.persistence.BackupInspector;
+import org.apache.geode.internal.cache.persistence.BackupManager;
+import org.apache.geode.internal.cache.persistence.BytesAndBits;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.internal.cache.persistence.DiskRegionView;
+import org.apache.geode.internal.cache.persistence.DiskStoreFilter;
+import org.apache.geode.internal.cache.persistence.DiskStoreID;
+import org.apache.geode.internal.cache.persistence.OplogType;
+import org.apache.geode.internal.cache.persistence.PRPersistentConfig;
+import org.apache.geode.internal.cache.persistence.PersistentMemberID;
+import org.apache.geode.internal.cache.persistence.PersistentMemberPattern;
+import org.apache.geode.internal.cache.persistence.RestoreScript;
import org.apache.geode.internal.cache.snapshot.GFSnapshot;
import org.apache.geode.internal.cache.snapshot.GFSnapshot.SnapshotWriter;
import org.apache.geode.internal.cache.snapshot.SnapshotPacket.SnapshotRecord;
@@ -50,17 +72,41 @@ import org.apache.geode.pdx.internal.EnumInfo;
import org.apache.geode.pdx.internal.PdxField;
import org.apache.geode.pdx.internal.PdxType;
import org.apache.geode.pdx.internal.PeerTypeRegistration;
-import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
-import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
import org.apache.logging.log4j.Logger;
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.PrintStream;
import java.net.InetAddress;
import java.nio.channels.ClosedByInterruptException;
import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
@@ -70,8 +116,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
/**
* Represents a (disk-based) persistent store for region data. Used for both persistent recoverable
* regions and overflow-only regions.
@@ -86,15 +130,15 @@ public class DiskStoreImpl implements DiskStore {
private static final String BACKUP_DIR_PREFIX = "dir";
public static final boolean KRF_DEBUG = Boolean.getBoolean("disk.KRF_DEBUG");
- public static final int MAX_OPEN_INACTIVE_OPLOGS = Integer
- .getInteger(DistributionConfig.GEMFIRE_PREFIX + "MAX_OPEN_INACTIVE_OPLOGS", 7).intValue();
+ public static final int MAX_OPEN_INACTIVE_OPLOGS =
+ Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "MAX_OPEN_INACTIVE_OPLOGS", 7);
/*
* If less than 20MB (default - configurable through this property) of the available space is left
* for logging and other misc stuff then it is better to bail out.
*/
- public static final int MIN_DISK_SPACE_FOR_LOGS = Integer
- .getInteger(DistributionConfig.GEMFIRE_PREFIX + "MIN_DISK_SPACE_FOR_LOGS", 20).intValue();
+ public static final int MIN_DISK_SPACE_FOR_LOGS =
+ Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "MIN_DISK_SPACE_FOR_LOGS", 20);
/** Represents an invalid id of a key/value on disk */
public static final long INVALID_ID = 0L; // must be zero
@@ -158,17 +202,15 @@ public class DiskStoreImpl implements DiskStore {
* other regions waiting for a compactor thread from the pool. Ignored if set to <= 0. Made non
* static so tests can set it.
*/
- private final int MAX_OPLOGS_PER_COMPACTION = Integer
- .getInteger(DistributionConfig.GEMFIRE_PREFIX + "MAX_OPLOGS_PER_COMPACTION", Integer
- .getInteger(DistributionConfig.GEMFIRE_PREFIX + "MAX_OPLOGS_PER_ROLL", 1).intValue())
- .intValue();
+ private final int MAX_OPLOGS_PER_COMPACTION = Integer.getInteger(
+ DistributionConfig.GEMFIRE_PREFIX + "MAX_OPLOGS_PER_COMPACTION",
+ Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "MAX_OPLOGS_PER_ROLL", 1).intValue());
/**
*
*/
- public static final int MAX_CONCURRENT_COMPACTIONS = Integer
- .getInteger(DistributionConfig.GEMFIRE_PREFIX + "MAX_CONCURRENT_COMPACTIONS", Integer
- .getInteger(DistributionConfig.GEMFIRE_PREFIX + "MAX_CONCURRENT_ROLLS", 1).intValue())
- .intValue();
+ public static final int MAX_CONCURRENT_COMPACTIONS = Integer.getInteger(
+ DistributionConfig.GEMFIRE_PREFIX + "MAX_CONCURRENT_COMPACTIONS",
+ Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "MAX_CONCURRENT_ROLLS", 1).intValue());
/**
* This system property indicates that maximum number of delayed write tasks that can be pending
@@ -1441,8 +1483,8 @@ public class DiskStoreImpl implements DiskStore {
private volatile boolean flusherThreadTerminated;
private void startAsyncFlusher() {
- final String thName = LocalizedStrings.DiskRegion_ASYNCHRONOUS_DISK_WRITER_0
- .toLocalizedString(new Object[] {getName()});
+ final String thName =
+ LocalizedStrings.DiskRegion_ASYNCHRONOUS_DISK_WRITER_0.toLocalizedString(getName());
this.flusherThread = new Thread(
LoggingThreadGroup.createThreadGroup(
LocalizedStrings.DiskRegion_DISK_WRITERS.toLocalizedString(), logger),
@@ -1802,7 +1844,7 @@ public class DiskStoreImpl implements DiskStore {
f.deleteOnExit();
dae = null;
break;
- } catch (IOException ex) {
+ } catch (IOException | IllegalStateException ex) {
if (fs != null) {
try {
fs.close();
@@ -1811,16 +1853,6 @@ public class DiskStoreImpl implements DiskStore {
}
dae = new DiskAccessException(
LocalizedStrings.Oplog_COULD_NOT_LOCK_0.toLocalizedString(f.getPath()), ex, this);
- } catch (IllegalStateException ex2) {
- // OverlappingFileLockExtension needs to be caught here see bug 41290
- if (fs != null) {
- try {
- fs.close();
- } catch (IOException ignore) {
- }
- }
- dae = new DiskAccessException(
- LocalizedStrings.Oplog_COULD_NOT_LOCK_0.toLocalizedString(f.getPath()), ex2, this);
}
cnt++;
try {
@@ -1945,17 +1977,7 @@ public class DiskStoreImpl implements DiskStore {
{
FilenameFilter overflowFileFilter =
new DiskStoreFilter(OplogType.OVERFLOW, true, partialFileName);
- for (DirectoryHolder dh : this.directories) {
- File dir = dh.getDir();
- // delete all overflow files
- File[] files = FileUtil.listFiles(dir, overflowFileFilter);
- for (File file : files) {
- boolean deleted = file.delete();
- if (!deleted && file.exists() && logger.isDebugEnabled()) {
- logger.debug("Could not delete file {}", file);
- }
- }
- }
+ deleteFiles(overflowFileFilter);
}
persistentOplogs.createOplogs(needsOplogs, persistentBackupFiles);
@@ -1991,8 +2013,8 @@ public class DiskStoreImpl implements DiskStore {
private void statsClose() {
this.stats.close();
if (this.directories != null) {
- for (int i = 0; i < this.directories.length; i++) {
- this.directories[i].close();
+ for (final DirectoryHolder directory : this.directories) {
+ directory.close();
}
}
}
@@ -2137,9 +2159,7 @@ public class DiskStoreImpl implements DiskStore {
try {
// Now while holding the write lock remove any elements from the queue
// for this region.
- Iterator<Object> it = this.asyncQueue.iterator();
- while (it.hasNext()) {
- Object o = it.next();
+ for (final Object o : this.asyncQueue) {
if (o instanceof AsyncDiskEntry) {
AsyncDiskEntry ade = (AsyncDiskEntry) o;
if (shouldClear(region, rvv, ade)) {
@@ -2531,8 +2551,7 @@ public class DiskStoreImpl implements DiskStore {
int incBackgroundTasks() {
getCache().getCachePerfStats().incDiskTasksWaiting();
- int v = this.backgroundTasks.incrementAndGet();
- return v;
+ return this.backgroundTasks.incrementAndGet();
}
void decBackgroundTasks() {
@@ -2636,13 +2655,14 @@ public class DiskStoreImpl implements DiskStore {
}
private void deleteFiles(FilenameFilter overflowFileFilter) {
- for (int i = 0; i < this.directories.length; i++) {
- File dir = this.directories[i].getDir();
- File[] files = FileUtil.listFiles(dir, overflowFileFilter);
- for (File file : files) {
- boolean deleted = file.delete();
- if (!deleted && file.exists() && logger.isDebugEnabled()) {
- logger.debug("Could not delete file {}", file);
+ for (final DirectoryHolder directory : this.directories) {
+ File[] files = directory.getDir().listFiles(overflowFileFilter);
+ if (files != null) {
+ for (File file : files) {
+ boolean deleted = file.delete();
+ if (!deleted && file.exists() && logger.isDebugEnabled()) {
+ logger.debug("Could not delete file {}", file);
+ }
}
}
}
@@ -2738,8 +2758,8 @@ public class DiskStoreImpl implements DiskStore {
// Find all of the member's diskstore oplogs in the member's baseline
// diskstore directory structure (*.crf,*.krf,*.drf)
- List<File> baselineOplogFiles = FileUtil.findAll(baselineDir, ".*\\.[kdc]rf$");
-
+ Collection<File> baselineOplogFiles =
+ FileUtils.listFiles(baselineDir, new String[] {"krf", "drf", "crf"}, true);
// Our list of oplogs to copy (those not already in the baseline)
List<Oplog> oplogList = new LinkedList<Oplog>();
@@ -2858,11 +2878,7 @@ public class DiskStoreImpl implements DiskStore {
* @return true if compaction done; false if it was not
*/
private synchronized boolean scheduleIfNeeded(CompactableOplog[] opLogs) {
- if (!this.scheduled) {
- return schedule(opLogs);
- } else {
- return false;
- }
+ return !this.scheduled && schedule(opLogs);
}
/**
@@ -2873,8 +2889,8 @@ public class DiskStoreImpl implements DiskStore {
if (!this.compactorEnabled)
return false;
if (opLogs != null) {
- for (int i = 0; i < opLogs.length; i++) {
- opLogs[i].prepareForCompact();
+ for (final CompactableOplog opLog : opLogs) {
+ opLog.prepareForCompact();
}
this.scheduled = true;
this.scheduledOplogs = opLogs;
@@ -2922,10 +2938,7 @@ public class DiskStoreImpl implements DiskStore {
return true;
}
CancelCriterion stopper = getCache().getCancelCriterion();
- if (stopper.isCancelInProgress()) {
- return true;
- }
- return false;
+ return stopper.isCancelInProgress();
}
/**
@@ -2953,7 +2966,7 @@ public class DiskStoreImpl implements DiskStore {
String tName = "OplogCompactor " + getName() + " for oplog " + oplogs[0].toString();
Thread.currentThread().setName(tName);
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for (int j = 0; j < oplogs.length; ++j) {
buffer.append(oplogs[j].toString());
if (j + 1 < oplogs.length) {
@@ -3239,9 +3252,8 @@ public class DiskStoreImpl implements DiskStore {
// NOTE - do NOT use DM.cacheTimeMillis here. See bug #49920
long timestamp = System.currentTimeMillis();
- PersistentMemberID id = new PersistentMemberID(getDiskStoreID(), memberId.getInetAddress(),
+ return new PersistentMemberID(getDiskStoreID(), memberId.getInetAddress(),
firstDir.getAbsolutePath(), memberId.getName(), timestamp, (short) 0);
- return id;
}
public PersistentID getPersistentID() {
@@ -3534,12 +3546,12 @@ public class DiskStoreImpl implements DiskStore {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("dr=").append(region.getDiskRegion().getId());
- sb.append(" versionOnly=" + this.versionOnly);
+ sb.append(" versionOnly=").append(this.versionOnly);
if (this.versionOnly) {
- sb.append(" versionTag=" + this.tag);
+ sb.append(" versionTag=").append(this.tag);
}
if (de != null) {
- sb.append(" key=" + de.getKey());
+ sb.append(" key=").append(de.getKey());
} else {
sb.append(" <END CLEAR>");
}
@@ -3698,18 +3710,8 @@ public class DiskStoreImpl implements DiskStore {
enums.add((EnumInfo) i);
}
}
- Collections.sort(types, new Comparator<PdxType>() {
- @Override
- public int compare(PdxType o1, PdxType o2) {
- return o1.getClassName().compareTo(o2.getClassName());
- }
- });
- Collections.sort(enums, new Comparator<EnumInfo>() {
- @Override
- public int compare(EnumInfo o1, EnumInfo o2) {
- return o1.compareTo(o2);
- }
- });
+ types.sort(Comparator.comparing(PdxType::getClassName));
+ enums.sort(EnumInfo::compareTo);
printStream.println("PDX Types:");
for (PdxType type : types) {
@@ -4132,7 +4134,7 @@ public class DiskStoreImpl implements DiskStore {
}
// Get an appropriate lock object for each set of oplogs.
- Object childLock = childOplog == null ? new Object() : childOplog.lock;;
+ Object childLock = childOplog.lock;;
// TODO - We really should move this lock into the disk store, but
// until then we need to do this magic to make sure we're actually
@@ -4152,7 +4154,7 @@ public class DiskStoreImpl implements DiskStore {
// Create the directories for this disk store
for (int i = 0; i < directories.length; i++) {
File dir = getBackupDir(targetDir, i);
- if (!FileUtil.mkdirs(dir)) {
+ if (!dir.mkdirs()) {
throw new IOException("Could not create directory " + dir);
}
restoreScript.addFile(directories[i].getDir(), dir);
@@ -4364,7 +4366,7 @@ public class DiskStoreImpl implements DiskStore {
try {
DiskStoreImpl dsi = createForOffline(dsName, dsDirs, false);
dsi.dumpInfo(printStream, regName);
- if (listPdxTypes != null && listPdxTypes.booleanValue()) {
+ if (listPdxTypes != null && listPdxTypes) {
dsi.dumpPdxTypes(printStream);
}
} finally {
@@ -4554,7 +4556,7 @@ public class DiskStoreImpl implements DiskStore {
boolean result = false;
Boolean tmp = backgroundTaskThread.get();
if (tmp != null) {
- result = tmp.booleanValue();
+ result = tmp;
}
return result;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
index 270c833..f5aec51 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
@@ -14,14 +14,34 @@
*/
package org.apache.geode.internal.cache;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
+import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.ObjectIterator;
+import org.apache.commons.io.FileUtils;
import org.apache.geode.CancelException;
import org.apache.geode.DataSerializer;
import org.apache.geode.SerializationException;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.CacheClosedException;
+import org.apache.geode.cache.CacheWriterException;
+import org.apache.geode.cache.DiskAccessException;
+import org.apache.geode.cache.EntryDestroyedException;
+import org.apache.geode.cache.EntryEvent;
+import org.apache.geode.cache.EntryNotFoundException;
+import org.apache.geode.cache.RegionDestroyedException;
+import org.apache.geode.cache.TimeoutException;
+import org.apache.geode.cache.UnsupportedVersionException;
import org.apache.geode.distributed.OplogCancelledException;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.*;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.ByteArrayDataInput;
+import org.apache.geode.internal.HeapDataOutputStream;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.InternalStatisticsDisabledException;
+import org.apache.geode.internal.Sendable;
+import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.DiskEntry.Helper.Flushable;
import org.apache.geode.internal.cache.DiskEntry.Helper.ValueWrapper;
import org.apache.geode.internal.cache.DiskInitFile.DiskRegionFlag;
@@ -30,8 +50,19 @@ import org.apache.geode.internal.cache.DiskStoreImpl.OplogEntryIdSet;
import org.apache.geode.internal.cache.DistributedRegion.DiskPosition;
import org.apache.geode.internal.cache.lru.EnableLRU;
import org.apache.geode.internal.cache.lru.NewLRUClockHand;
-import org.apache.geode.internal.cache.persistence.*;
-import org.apache.geode.internal.cache.versions.*;
+import org.apache.geode.internal.cache.persistence.BytesAndBits;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.internal.cache.persistence.DiskRegionView;
+import org.apache.geode.internal.cache.persistence.DiskStoreID;
+import org.apache.geode.internal.cache.persistence.UninterruptibleFileChannel;
+import org.apache.geode.internal.cache.persistence.UninterruptibleRandomAccessFile;
+import org.apache.geode.internal.cache.versions.CompactVersionHolder;
+import org.apache.geode.internal.cache.versions.RegionVersionHolder;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.internal.cache.versions.VersionHolder;
+import org.apache.geode.internal.cache.versions.VersionSource;
+import org.apache.geode.internal.cache.versions.VersionStamp;
+import org.apache.geode.internal.cache.versions.VersionTag;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
@@ -47,20 +78,35 @@ import org.apache.geode.internal.util.BlobHelper;
import org.apache.geode.internal.util.IOUtils;
import org.apache.geode.internal.util.TransformUtils;
import org.apache.geode.pdx.internal.PdxWriterImpl;
-
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
-import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.objects.ObjectIterator;
-
import org.apache.logging.log4j.Logger;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.io.SyncFailedException;
import java.nio.ByteBuffer;
import java.nio.channels.ClosedChannelException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.Map.Entry;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -1176,7 +1222,7 @@ public final class Oplog implements CompactableOplog, Flushable {
* @return a map of baslineline oplog files to copy. May be empty if total current set for this
* oplog does not match the baseline.
*/
- Map<File, File> mapBaseline(List<File> baselineOplogFiles) {
+ Map<File, File> mapBaseline(Collection<File> baselineOplogFiles) {
// Map of baseline oplog file name to oplog file
Map<String, File> baselineOplogMap =
TransformUtils.transformAndMap(baselineOplogFiles, TransformUtils.fileNameTransformer);
@@ -5759,13 +5805,13 @@ public final class Oplog implements CompactableOplog, Flushable {
public void copyTo(File targetDir) throws IOException {
if (this.crf.f != null) { // fixes bug 43951
- FileUtil.copy(this.crf.f, targetDir);
+ FileUtils.copyFileToDirectory(this.crf.f, targetDir);
}
- FileUtil.copy(this.drf.f, targetDir);
+ FileUtils.copyFileToDirectory(this.drf.f, targetDir);
// this krf existence check fixes 45089
if (getParent().getDiskInitFile().hasKrf(this.oplogId)) {
- FileUtil.copy(this.getKrfFile(), targetDir);
+ FileUtils.copyFileToDirectory(this.getKrfFile(), targetDir);
}
}
@@ -5788,7 +5834,7 @@ public final class Oplog implements CompactableOplog, Flushable {
return;
if (!olf.f.exists())
return;
- assert olf.RAFClosed == true;
+ assert olf.RAFClosed;
if (!olf.RAFClosed || olf.raf != null) {
try {
olf.raf.close();
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java
index a713941..036c740 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PersistentOplogSet.java
@@ -15,6 +15,20 @@
package org.apache.geode.internal.cache;
import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
+import org.apache.geode.cache.DiskAccessException;
+import org.apache.geode.internal.cache.DiskEntry.Helper.ValueWrapper;
+import org.apache.geode.internal.cache.DiskStoreImpl.OplogEntryIdSet;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.internal.cache.persistence.DiskRegionView;
+import org.apache.geode.internal.cache.persistence.DiskStoreFilter;
+import org.apache.geode.internal.cache.persistence.OplogType;
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.geode.internal.logging.log4j.LogMarker;
+import org.apache.geode.internal.sequencelog.EntryLogger;
+import org.apache.logging.log4j.Logger;
import java.io.File;
import java.io.FilenameFilter;
@@ -32,23 +46,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.logging.log4j.Logger;
-
-import org.apache.geode.cache.DiskAccessException;
-import org.apache.geode.internal.FileUtil;
-import org.apache.geode.internal.cache.DiskEntry.Helper.ValueWrapper;
-import org.apache.geode.internal.cache.DiskStoreImpl.OplogEntryIdSet;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.persistence.DiskRegionView;
-import org.apache.geode.internal.cache.persistence.DiskStoreFilter;
-import org.apache.geode.internal.cache.persistence.OplogType;
-import org.apache.geode.internal.cache.versions.RegionVersionVector;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.internal.logging.log4j.LocalizedMessage;
-import org.apache.geode.internal.logging.log4j.LogMarker;
-import org.apache.geode.internal.sequencelog.EntryLogger;
-
public class PersistentOplogSet implements OplogSet {
private static final Logger logger = LogService.getLogger();
@@ -212,10 +209,11 @@ public class PersistentOplogSet implements OplogSet {
Map<File, DirectoryHolder> backupFiles = new HashMap<File, DirectoryHolder>();
FilenameFilter backupFileFilter = getFileNameFilter(partialFileName);
for (DirectoryHolder dh : parent.directories) {
- File dir = dh.getDir();
- File[] backupList = FileUtil.listFiles(dir, backupFileFilter);
- for (File f : backupList) {
- backupFiles.put(f, dh);
+ File[] backupList = dh.getDir().listFiles(backupFileFilter);
+ if (backupList != null) {
+ for (File f : backupList) {
+ backupFiles.put(f, dh);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupManager.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupManager.java
index e4e5467..d052551 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupManager.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/BackupManager.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.internal.cache.persistence;
+import org.apache.commons.io.FileUtils;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.persistence.PersistentID;
import org.apache.geode.distributed.DistributedSystem;
@@ -21,7 +22,6 @@ import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.MembershipListener;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.JarClassLoader;
import org.apache.geode.internal.JarDeployer;
import org.apache.geode.internal.cache.DiskStoreImpl;
@@ -30,10 +30,18 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import java.io.File;
import java.io.FileOutputStream;
+import java.io.FilenameFilter;
import java.io.IOException;
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
import java.util.concurrent.CountDownLatch;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* This class manages the state an logic to backup a single cache.
@@ -108,20 +116,19 @@ public class BackupManager implements MembershipListener {
* Find the first matching DiskStoreId directory for this member.
*/
for (DiskStoreImpl diskStore : cache.listDiskStoresIncludingRegionOwned()) {
- baselineDir = FileUtil.find(baselineParentDir, ".*" + diskStore.getBackupDirName() + "$");
- if (null != baselineDir) {
- break;
- }
- }
+ File[] matchingFiles = baselineParentDir.listFiles(new FilenameFilter() {
+ Pattern pattern = Pattern.compile(".*" + diskStore.getBackupDirName() + "$");
- /*
- * We found it? Good. Set this member's baseline to the backed up disk store's member dir (two
- * levels up).
- */
- if (null != baselineDir) {
- baselineDir = baselineDir.getParentFile().getParentFile();
+ public boolean accept(File dir, String name) {
+ Matcher m = pattern.matcher(name);
+ return m.find();
+ }
+ });
+ // We found it? Good. Set this member's baseline to the backed up disk store's member dir (two
+ // levels up).
+ if (null != matchingFiles && matchingFiles.length > 0)
+ baselineDir = matchingFiles[0].getParentFile().getParentFile();
}
-
return baselineDir;
}
@@ -233,19 +240,19 @@ public class BackupManager implements MembershipListener {
private void backupConfigFiles(RestoreScript restoreScript, File backupDir) throws IOException {
File configBackupDir = new File(backupDir, CONFIG);
- FileUtil.mkdirs(configBackupDir);
+ configBackupDir.mkdirs();
URL url = cache.getCacheXmlURL();
if (url != null) {
File cacheXMLBackup =
new File(configBackupDir, DistributionConfig.DEFAULT_CACHE_XML_FILE.getName());
- FileUtil.copy(url, cacheXMLBackup);
+ FileUtils.copyFile(new File(cache.getCacheXmlURL().getFile()), cacheXMLBackup);
}
- URL propertyURL = DistributedSystem.getPropertyFileURL();
+ URL propertyURL = DistributedSystem.getPropertiesFileURL();
if (propertyURL != null) {
File propertyBackup =
new File(configBackupDir, DistributionConfig.GEMFIRE_PREFIX + "properties");
- FileUtil.copy(propertyURL, propertyBackup);
+ FileUtils.copyFile(new File(DistributedSystem.getPropertiesFile()), propertyBackup);
}
// TODO sbawaska: should the gfsecurity.properties file be backed up?
@@ -261,7 +268,11 @@ public class BackupManager implements MembershipListener {
if (original.exists()) {
original = original.getAbsoluteFile();
File dest = new File(userBackupDir, original.getName());
- FileUtil.copy(original, dest);
+ if (original.isDirectory()) {
+ FileUtils.copyDirectory(original, dest);
+ } else {
+ FileUtils.copyFile(original, dest);
+ }
restoreScript.addExistenceTest(original);
restoreScript.addFile(original, dest);
}
@@ -296,7 +307,11 @@ public class BackupManager implements MembershipListener {
for (JarClassLoader loader : jarList) {
File source = new File(loader.getFileCanonicalPath());
File dest = new File(userBackupDir, source.getName());
- FileUtil.copy(source, dest);
+ if (source.isDirectory()) {
+ FileUtils.copyDirectory(source, dest);
+ } else {
+ FileUtils.copyFile(source, dest);
+ }
restoreScript.addFile(source, dest);
}
}
@@ -325,7 +340,7 @@ public class BackupManager implements MembershipListener {
throw new IOException("Backup directory " + backupDir.getAbsolutePath() + " already exists.");
}
- if (!FileUtil.mkdirs(backupDir)) {
+ if (!backupDir.mkdirs()) {
throw new IOException("Could not create directory: " + backupDir);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/RestoreScript.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/RestoreScript.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/RestoreScript.java
index 86f880e..3076e04 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/RestoreScript.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/RestoreScript.java
@@ -23,8 +23,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.geode.internal.FileUtil;
-
/**
* This class is used to automatically generate a restore script for a backup. It keeps a list of
* files that were backed up, and a list of files that we should test for to avoid overriding when
@@ -100,7 +98,7 @@ public class RestoreScript {
for (Map.Entry<File, File> entry : backedUpFiles.entrySet()) {
File backup = entry.getKey();
boolean backupHasFiles = backup.isDirectory() && backup.list().length != 0;
- backup = FileUtil.removeParent(outputDir, backup);
+ backup = outputDir.toPath().relativize(backup.toPath()).toFile();
File original = entry.getValue();
if (original.isDirectory()) {
osGenerator.writeCopyDirectoryContents(writer, backup, original, backupHasFiles);
@@ -136,7 +134,7 @@ public class RestoreScript {
private boolean isWindows() {
String os = System.getProperty("os.name");
if (os != null) {
- if (os.indexOf("Windows") != -1) {
+ if (os.contains("Windows")) {
return true;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/main/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandler.java b/geode-core/src/main/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandler.java
index 11d10af..f814aeb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/io/MainWithChildrenRollingFileHandler.java
@@ -15,11 +15,9 @@
package org.apache.geode.internal.io;
import org.apache.geode.i18n.LogWriterI18n;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.i18n.LocalizedStrings;
import java.io.File;
-import java.io.FilenameFilter;
import java.util.Arrays;
import java.util.Comparator;
import java.util.regex.Pattern;
@@ -42,7 +40,7 @@ public class MainWithChildrenRollingFileHandler implements RollingFileHandler {
File dir = getParentFile(file.getAbsoluteFile());
int endIdx1 = file.getName().indexOf('-');
int endIdx2 = file.getName().lastIndexOf('.');
- String baseName = file.getName();
+ String baseName;
if (endIdx1 != -1) {
baseName = file.getName().substring(0, endIdx1);
} else {
@@ -222,26 +220,13 @@ public class MainWithChildrenRollingFileHandler implements RollingFileHandler {
}
private File[] findChildren(final File dir, final Pattern pattern) {
- return FileUtil.listFiles(dir, new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- return pattern.matcher(name).matches();
- }
- });
+ return dir.listFiles((dir1, name) -> pattern.matcher(name).matches());
}
private File[] findChildrenExcept(final File dir, final Pattern pattern, final File exception) {
final String exceptionName = (exception == null) ? null : exception.getName();
- return FileUtil.listFiles(dir, new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- if (name.equals(exceptionName)) {
- return false;
- } else {
- return pattern.matcher(name).matches();
- }
- }
- });
+ return dir
+ .listFiles((dir1, name) -> !name.equals(exceptionName) && pattern.matcher(name).matches());
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/main/java/org/apache/geode/internal/logging/MergeLogFiles.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/logging/MergeLogFiles.java b/geode-core/src/main/java/org/apache/geode/internal/logging/MergeLogFiles.java
index 7bb94ef..27f2116 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/logging/MergeLogFiles.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/logging/MergeLogFiles.java
@@ -14,6 +14,10 @@
*/
package org.apache.geode.internal.logging;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.internal.Assert;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -37,11 +41,6 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.regex.Pattern;
import java.util.zip.GZIPInputStream;
-import org.apache.geode.SystemFailure;
-import org.apache.geode.internal.Assert;
-import org.apache.geode.internal.FileUtil;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-
/**
* This program merges entries from multiple GemFire log files (those written using a
* {@link org.apache.geode.i18n.LogWriterI18n} together, sorting them by their timestamp. Note that
@@ -188,17 +187,19 @@ public class MergeLogFiles {
* @param dirName directory to search
* @return all of the .log files found (Files)
*/
- static ArrayList getLogFiles(String dirName) {
- ArrayList result = new ArrayList();
+ static ArrayList<File> getLogFiles(String dirName) {
+ ArrayList<File> result = new ArrayList<>();
File dir = new File(dirName);
- File names[] = FileUtil.listFiles(dir);
- for (int i = 0; i < names.length; i++) {
- String n = names[i].getAbsolutePath();
- if (n.endsWith(".log") || n.endsWith(".log.gz")) {
- result.add(names[i]);
- }
- } // for
+ File names[] = dir.listFiles();
+ if (names != null) {
+ for (final File name : names) {
+ String n = name.getAbsolutePath();
+ if (n.endsWith(".log") || n.endsWith(".log.gz")) {
+ result.add(name);
+ }
+ } // for
+ }
return result;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
index f881d38..c633a47 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest.java
@@ -15,6 +15,15 @@
package org.apache.geode.cache.client;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.runners.MethodSorters.NAME_ASCENDING;
+
+import org.apache.commons.io.FileUtils;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.RegionService;
import org.apache.geode.cache.client.internal.ProxyCache;
@@ -24,7 +33,6 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.membership.gms.GMSMember;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.HeapDataOutputStream;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.VersionedDataInputStream;
@@ -50,11 +58,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.junit.runners.MethodSorters.NAME_ASCENDING;
-
/**
* Unit test for the ClientCacheFactory class
*
@@ -125,7 +128,7 @@ public class ClientCacheFactoryJUnitTest {
this.tmpFile.deleteOnExit();
URL url = ClientCacheFactoryJUnitTest.class
.getResource("ClientCacheFactoryJUnitTest_single_pool.xml");;
- FileUtil.copy(url, this.tmpFile);
+ FileUtils.copyFile(new File(url.getFile()), this.tmpFile);
this.cc = new ClientCacheFactory().set(CACHE_XML_FILE, this.tmpFile.getAbsolutePath()).create();
GemFireCacheImpl gfc = (GemFireCacheImpl) this.cc;
assertEquals(true, gfc.isClient());
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java b/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java
index 2d6921b..f53faed 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/QueryTestUtils.java
@@ -14,15 +14,9 @@
*/
package org.apache.geode.cache.query;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import org.apache.commons.io.FileUtils;
import org.apache.geode.LogWriter;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -38,6 +32,13 @@ import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
/**
* Utility class for testing supported queries
*/
@@ -1763,12 +1764,11 @@ public class QueryTestUtils implements Serializable {
Object[] result = new Object[qarr.length];
String query = null;
int j = 0;
- for (int i = 0; i < qarr.length; i++) {
- query = queries.get(qarr[i]);
- if (query.indexOf("distinct") == -1)
- query = query.replaceFirst("select", "select distinct");
- else if (query.indexOf("DISTINCT") == -1)
+ for (final String aQarr : qarr) {
+ query = queries.get(aQarr);
+ if (!query.toLowerCase().contains("distinct")) {
query = query.replaceFirst("select", "select distinct");
+ }
// hydra.getLogWriter().info("\nExecuting query: " + query);
try {
@@ -1799,7 +1799,7 @@ public class QueryTestUtils implements Serializable {
public static void closeCacheInVM(VM vm) {
vm.invoke(() -> {
- getInstance().cache.close();
+ cache.close();
});
}
@@ -1822,7 +1822,7 @@ public class QueryTestUtils implements Serializable {
public static File createTestRootDiskStore(String testName) throws IOException {
File diskDir = new File(testName).getAbsoluteFile();
- org.apache.geode.internal.FileUtil.delete(diskDir);
+ FileUtils.deleteDirectory(diskDir);
diskDir.mkdir();
diskDir.deleteOnExit();
return diskDir;
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
index 66c4ecf..9bd20a6 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/dunit/QueryIndexUsingXMLDUnitTest.java
@@ -14,18 +14,9 @@
*/
package org.apache.geode.cache.query.dunit;
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Properties;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.junit.Assert.fail;
+import org.apache.commons.io.FileUtils;
import org.apache.geode.LogWriter;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheExistsException;
@@ -44,7 +35,6 @@ import org.apache.geode.cache.query.internal.index.PartitionedIndex;
import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.PartitionedRegion;
@@ -62,6 +52,15 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.util.test.TestUtil;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Properties;
@Category(DistributedTest.class)
public class QueryIndexUsingXMLDUnitTest extends JUnit4CacheTestCase {
@@ -70,7 +69,7 @@ public class QueryIndexUsingXMLDUnitTest extends JUnit4CacheTestCase {
static private final int WAIT_DEFAULT = (60 * 1000);
- public static final long MAX_TIME = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT).intValue();
+ public static final long MAX_TIME = Integer.getInteger(WAIT_PROPERTY, WAIT_DEFAULT);
final String name = "PartionedPortfolios";
final String repRegName = "Portfolios";
@@ -120,7 +119,9 @@ public class QueryIndexUsingXMLDUnitTest extends JUnit4CacheTestCase {
// avoid creating a new cache just to get the diskstore name
Invoke.invokeInEveryVM(resetTestHook());
disconnectFromDS();
- FileUtil.delete(new File(GemFireCacheImpl.DEFAULT_DS_NAME).getAbsoluteFile());
+ File deleteMe = new File(GemFireCacheImpl.DEFAULT_DS_NAME).getAbsoluteFile();
+ if (deleteMe.exists())
+ FileUtils.forceDelete(deleteMe);
}
/**
@@ -882,7 +883,7 @@ public class QueryIndexUsingXMLDUnitTest extends JUnit4CacheTestCase {
// remove the disk store.
File diskDir = new File(diskStoreName).getAbsoluteFile();
try {
- org.apache.geode.internal.FileUtil.delete(diskDir);
+ FileUtils.deleteDirectory(diskDir);
} catch (Exception ex) {
fail("Failed to delete the disDir");
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
index f126146..620ab17 100755
--- a/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/query/functional/IndexCreationJUnitTest.java
@@ -24,23 +24,17 @@
*/
package org.apache.geode.cache.query.functional;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Set;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_TIME_STATISTICS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLING_ENABLED;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.apache.commons.io.FileUtils;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -55,7 +49,6 @@ import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryInvalidException;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
-import org.apache.geode.cache.query.Utils;
import org.apache.geode.cache.query.data.ComparableWrapper;
import org.apache.geode.cache.query.data.Portfolio;
import org.apache.geode.cache.query.internal.DefaultQueryService;
@@ -71,9 +64,21 @@ import org.apache.geode.cache.query.types.ObjectType;
import org.apache.geode.cache.query.types.StructType;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Set;
@Category(IntegrationTest.class)
public class IndexCreationJUnitTest {
@@ -815,7 +820,7 @@ public class IndexCreationJUnitTest {
.execute();
assertEquals("OQL index results did not match", 1, results.size());
ds.disconnect();
- FileUtil.delete(file);
+ FileUtils.deleteDirectory(file);
}
}
@@ -845,7 +850,7 @@ public class IndexCreationJUnitTest {
.newQuery("<trace>SELECT * FROM " + localRegion.getFullPath() + " Where ID > 0").execute();
assertEquals("OQL index results did not match", 99, results.size());
ds.disconnect();
- FileUtil.delete(file);
+ FileUtils.deleteDirectory(file);
}
@Test
@@ -876,7 +881,7 @@ public class IndexCreationJUnitTest {
.execute();
assertEquals("OQL index results did not match", 50, results.size());
ds.disconnect();
- FileUtil.delete(file);
+ FileUtils.deleteDirectory(file);
}
@Test
@@ -954,7 +959,7 @@ public class IndexCreationJUnitTest {
.execute();
assertEquals("OQL index results did not match", 1, results.size());
ds.disconnect();
- FileUtil.delete(file);
+ FileUtils.deleteDirectory(file);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherIntegrationTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherIntegrationTestCase.java b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherIntegrationTestCase.java
index 0115193..09fa09e 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherIntegrationTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherIntegrationTestCase.java
@@ -14,9 +14,11 @@
*/
package org.apache.geode.distributed;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertTrue;
+
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.process.PidUnavailableException;
@@ -31,16 +33,18 @@ import org.junit.Rule;
import org.junit.contrib.java.lang.system.RestoreSystemProperties;
import org.junit.rules.TestName;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
import java.net.ServerSocket;
+import java.nio.file.Files;
import java.util.List;
import java.util.Properties;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicBoolean;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertTrue;
-
/**
* @since GemFire 8.0
*/
@@ -105,7 +109,7 @@ public abstract class AbstractLauncherIntegrationTestCase {
return true;
}
try {
- FileUtil.delete(file);
+ Files.delete(file.toPath());
} catch (IOException e) {
}
return !file.exists();
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/FileUtilJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/FileUtilJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/FileUtilJUnitTest.java
deleted file mode 100644
index 942059e..0000000
--- a/geode-core/src/test/java/org/apache/geode/internal/FileUtilJUnitTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.internal;
-
-import static org.junit.Assert.*;
-
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.DataOutput;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.test.junit.categories.IntegrationTest;
-
-@Category(IntegrationTest.class)
-public class FileUtilJUnitTest {
-
- @Test
- public void testCopyFile() throws IOException {
- File source = File.createTempFile("FileUtilJUnitTest", null);
- File dest = File.createTempFile("FileUtilJUnitTest", null);
- try {
- FileOutputStream fos = new FileOutputStream(source);
- DataOutput daos = new DataOutputStream(fos);
- try {
- for (long i = 0; i < FileUtil.MAX_TRANSFER_SIZE * 2.5 / 8; i++) {
- daos.writeLong(i);
- }
- } finally {
- fos.close();
- }
- FileUtil.copy(source, dest);
-
- FileInputStream fis = new FileInputStream(dest);
- DataInput dis = new DataInputStream(fis);
- try {
- for (long i = 0; i < FileUtil.MAX_TRANSFER_SIZE * 2.5 / 8; i++) {
- assertEquals(i, dis.readLong());
- }
- assertEquals(-1, fis.read());
- } finally {
- fis.close();
- }
- } finally {
- source.delete();
- dest.delete();
- }
- }
-
- @Test
- public void testStripOffExtension() {
- String fileName = "filename";
- assertEquals("filename", FileUtil.stripOffExtension(fileName));
- fileName = "filename.txt";
- assertEquals("filename", FileUtil.stripOffExtension(fileName));
- fileName = "filename.txt.txt";
- assertEquals("filename.txt", FileUtil.stripOffExtension(fileName));
- fileName = "filename.txt.log";
- assertEquals("filename.txt", FileUtil.stripOffExtension(fileName));
- fileName = "/dir/dir/dir/dir/filename.txt.log";
- assertEquals("/dir/dir/dir/dir/filename.txt", FileUtil.stripOffExtension(fileName));
- }
-
- @Test
- public void testDeleteFile() throws IOException {
- File file = File.createTempFile("FileUtilJUnitTest", null);
- assertTrue(file.exists());
- FileUtil.delete(file);
- assertFalse(file.exists());
- }
-
- @Test
- public void testDeleteDir() throws IOException {
- File dir = new File("testDirName");
- dir.mkdir();
- File file = File.createTempFile("testFile", null, dir);
- assertTrue(dir.exists());
- assertTrue(file.exists());
- FileUtil.delete(dir);
- assertFalse(file.exists());
- assertFalse(dir.exists());
- }
-}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/JarDeployerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/JarDeployerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/JarDeployerDUnitTest.java
index 22f66a3..a365899 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/JarDeployerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/JarDeployerDUnitTest.java
@@ -42,10 +42,12 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.RandomAccessFile;
import java.nio.channels.FileLock;
+import java.nio.file.Files;
import java.util.List;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Pattern;
/**
* Unit tests for the JarDeployer class
@@ -515,9 +517,7 @@ public class JarDeployerDUnitTest extends JUnit4CacheTestCase {
}
FileLock acquireSharedLock(final File file) throws IOException {
- @SuppressWarnings("resource")
- FileLock fileLock = new FileInputStream(file).getChannel().lock(0, 1, true);
- return fileLock;
+ return new FileInputStream(file).getChannel().lock(0, 1, true);
}
void releaseLock(final FileLock fileLock, final File lockFile) throws IOException {
@@ -544,32 +544,28 @@ public class JarDeployerDUnitTest extends JUnit4CacheTestCase {
}
// Open the file then loop comparing each byte
- InputStream inStream = new FileInputStream(file);
int index = 0;
- try {
+ try (InputStream inStream = new FileInputStream(file)) {
for (; index < bytes.length; index++) {
if (((byte) inStream.read()) != bytes[index])
break;
}
- } finally {
- inStream.close();
}
// If we didn't get to the end then something was different
- if (index < bytes.length)
- return false;
-
- return true;
+ return index >= bytes.length;
}
private void deleteSavedJarFiles() throws IOException {
- FileUtil.deleteMatching(new File("."),
- "^" + JarDeployer.JAR_PREFIX + "JarDeployerDUnit.*#\\d++$");
- FileUtil.delete(new File("JarDeployerDUnit"));
+ Pattern pattern = Pattern.compile("^" + JarDeployer.JAR_PREFIX + "JarDeployerDUnit.*#\\d++$");
+ File[] files = new File(".").listFiles((dir1, name) -> pattern.matcher(name).matches());
+ if (files != null) {
+ for (File file : files) {
+ Files.delete(file.toPath());
+ }
+ }
}
-
-
void writeJarBytesToFile(File jarFile, byte[] jarBytes) throws IOException {
final OutputStream outStream = new FileOutputStream(jarFile);
outStream.write(jarBytes);
[2/3] geode git commit: GEODE-2457: Replace
org.apache.geode.internal.FileUtil with org.apache.commons.io.FileUtils
Posted by kd...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/JarDeployerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/JarDeployerIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/JarDeployerIntegrationTest.java
index 3852dee..71daecc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/JarDeployerIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/JarDeployerIntegrationTest.java
@@ -107,7 +107,7 @@ public class JarDeployerIntegrationTest {
@Test
public void testDeployToInvalidDirectory() throws IOException, ClassNotFoundException {
final File alternateDir = new File(temporaryFolder.getRoot(), "JarDeployerDUnit");
- FileUtil.delete(alternateDir);
+ alternateDir.delete();
final JarDeployer jarDeployer = new JarDeployer(alternateDir);
final CyclicBarrier barrier = new CyclicBarrier(2);
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java
index 00bb6fb..435655d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldDUnitTest.java
@@ -14,18 +14,12 @@
*/
package org.apache.geode.internal;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -46,6 +40,16 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Collection;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.CopyOnWriteArrayList;
@Category(DistributedTest.class)
public class PdxDeleteFieldDUnitTest extends JUnit4CacheTestCase {
@@ -186,7 +190,7 @@ public class PdxDeleteFieldDUnitTest extends JUnit4CacheTestCase {
public void preTearDownCacheTestCase() throws Exception {
for (String path : this.filesToBeDeleted) {
try {
- FileUtil.delete(new File(path));
+ Files.delete(new File(path).toPath());
} catch (IOException e) {
LogWriterUtils.getLogWriter().error("Unable to delete file", e);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
index 1d18ed1..affa7e3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/PdxDeleteFieldJUnitTest.java
@@ -14,13 +14,32 @@
*/
package org.apache.geode.internal;
-import org.apache.geode.cache.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.DiskStoreFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache.query.internal.DefaultQuery;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.util.BlobHelper;
-import org.apache.geode.pdx.*;
-import org.apache.geode.pdx.internal.*;
+import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.pdx.PdxInstanceFactory;
+import org.apache.geode.pdx.PdxReader;
+import org.apache.geode.pdx.PdxSerializable;
+import org.apache.geode.pdx.PdxWriter;
+import org.apache.geode.pdx.internal.PdxField;
+import org.apache.geode.pdx.internal.PdxInstanceImpl;
+import org.apache.geode.pdx.internal.PdxType;
+import org.apache.geode.pdx.internal.PdxUnreadData;
+import org.apache.geode.pdx.internal.TypeRegistry;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -29,11 +48,6 @@ import java.io.File;
import java.util.Collection;
import java.util.Properties;
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-
@Category(IntegrationTest.class)
public class PdxDeleteFieldJUnitTest {
@@ -96,7 +110,7 @@ public class PdxDeleteFieldJUnitTest {
}
}
} finally {
- FileUtil.delete(f);
+ FileUtils.deleteDirectory(f);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java
index 4057069..b05285a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameDUnitTest.java
@@ -14,18 +14,12 @@
*/
package org.apache.geode.internal;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.List;
-import java.util.Properties;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -47,6 +41,16 @@ import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Collection;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.CopyOnWriteArrayList;
@Category(DistributedTest.class)
public class PdxRenameDUnitTest extends JUnit4CacheTestCase {
@@ -195,7 +199,7 @@ public class PdxRenameDUnitTest extends JUnit4CacheTestCase {
public void preTearDownCacheTestCase() throws Exception {
for (String path : this.filesToBeDeleted) {
try {
- FileUtil.delete(new File(path));
+ Files.delete(new File(path).toPath());
} catch (IOException e) {
LogWriterUtils.getLogWriter().error("Unable to delete file", e);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java
index cc393a2..561e8df 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/PdxRenameJUnitTest.java
@@ -14,7 +14,17 @@
*/
package org.apache.geode.internal;
-import org.apache.geode.cache.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.DiskStoreFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.pdx.PdxReader;
import org.apache.geode.pdx.PdxSerializable;
@@ -30,10 +40,6 @@ import java.util.Collection;
import java.util.Properties;
import java.util.regex.Pattern;
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.junit.Assert.assertEquals;
-
@Category(IntegrationTest.class)
public class PdxRenameJUnitTest {
@Test
@@ -67,7 +73,7 @@ public class PdxRenameJUnitTest {
}
}
} finally {
- FileUtil.delete(f);
+ FileUtils.deleteDirectory(f);
}
}
@@ -118,7 +124,7 @@ public class PdxRenameJUnitTest {
}
}
} finally {
- FileUtil.delete(f);
+ FileUtils.deleteDirectory(f);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/cache/BackupDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BackupDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BackupDUnitTest.java
index 10931e1..f2cee71 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BackupDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BackupDUnitTest.java
@@ -14,33 +14,13 @@
*/
package org.apache.geode.internal.cache;
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.apache.geode.GemFireIOException;
+import org.apache.commons.io.FileUtils;
import org.apache.geode.admin.BackupStatus;
-import org.apache.geode.admin.internal.FinishBackupRequest;
import org.apache.geode.admin.internal.PrepareBackupRequest;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
@@ -58,7 +38,6 @@ import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.distributed.internal.DistributionMessageObserver;
import org.apache.geode.distributed.internal.ReplyMessage;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.admin.remote.AdminFailureResponse;
import org.apache.geode.internal.cache.partitioned.PersistentPartitionedRegionTestBase;
import org.apache.geode.test.dunit.Assert;
@@ -71,6 +50,26 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.Serializable;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Pattern;
@Category(DistributedTest.class)
public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
@@ -80,7 +79,7 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
@Override
public final void preTearDownCacheTestCase() throws Exception {
StringBuilder failures = new StringBuilder();
- FileUtil.delete(getBackupDir(), failures);
+ delete(getBackupDir(), failures);
if (failures.length() > 0) {
LogWriterUtils.getLogWriter().error(failures.toString());
}
@@ -108,9 +107,9 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
assertEquals(2, status.getBackedUpDiskStores().size());
assertEquals(Collections.emptySet(), status.getOfflineDiskStores());
-
- List<File> mytexts = FileUtil.findAll(getBackupDir(), ".*my.txt.*");
- assertEquals(2, mytexts.size());
+ Pattern pattern = Pattern.compile(".*my.txt.*");
+ Collection<File> files = FileUtils.listFiles(getBackupDir(), new String[] {"txt"}, true);
+ assertEquals(4, files.size());
deleteOldUserUserFile(vm0);
deleteOldUserUserFile(vm1);
validateBackupComplete();
@@ -153,8 +152,6 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
/**
* Test of bug 42419
- *
- * @throws Throwable
*/
@Test
public void testBackupFromMemberWithDiskStore() throws Throwable {
@@ -177,7 +174,6 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
}
assertEquals(Collections.emptySet(), status.getOfflineDiskStores());
-
validateBackupComplete();
closeCache(vm0);
@@ -218,8 +214,6 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
/**
* Test for bug 42419
- *
- * @throws Throwable
*/
@Test
public void testBackupWhileBucketIsCreated() throws Throwable {
@@ -228,7 +222,6 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
VM vm1 = host.getVM(1);
final VM vm2 = host.getVM(2);
-
LogWriterUtils.getLogWriter().info("Creating region in VM0");
createPersistentRegion(vm0);
@@ -239,7 +232,6 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
LogWriterUtils.getLogWriter().info("Creating region in VM1");
createPersistentRegion(vm1);
-
final AtomicReference<BackupStatus> statusRef = new AtomicReference<BackupStatus>();
Thread thread1 = new Thread() {
public void run() {
@@ -259,12 +251,10 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
thread1.join();
thread2.join();
-
BackupStatus status = statusRef.get();
assertEquals(2, status.getBackedUpDiskStores().size());
assertEquals(Collections.emptySet(), status.getOfflineDiskStores());
-
validateBackupComplete();
createData(vm0, 0, 5, "C", "region1");
@@ -416,7 +406,6 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
* Test for bug 42420. Invoke a backup when a bucket is in the middle of being moved.
*
* @param observer - a message observer that triggers at the backup at the correct time.
- * @throws Throwable
*/
public void backupWhileBucketIsMoved(final DistributionMessageObserver observer)
throws Throwable {
@@ -467,7 +456,6 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
}
});
-
validateBackupComplete();
createData(vm0, 0, 5, "C", "region1");
@@ -510,8 +498,6 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
/**
* Make sure we don't report members without persistent data as backed up.
- *
- * @throws Throwable
*/
@Test
public void testBackupOverflow() throws Throwable {
@@ -533,7 +519,6 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
assertEquals(2, status.getBackedUpDiskStores().values().iterator().next().size());
assertEquals(Collections.emptySet(), status.getOfflineDiskStores());
-
validateBackupComplete();
}
@@ -558,14 +543,11 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
closeCache(vm2);
-
BackupStatus status = backup(vm3);
assertEquals(2, status.getBackedUpDiskStores().size());
assertEquals(2, status.getOfflineDiskStores().size());
}
-
-
// TODO
// Test default disk store.
// Test backing up and recovering while a bucket move is in progress.
@@ -574,8 +556,10 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
private void validateBackupComplete() {
File backupDir = getBackupDir();
- File incompleteBackup = FileUtil.find(backupDir, ".*INCOMPLETE.*");
- assertNull(incompleteBackup);
+ Pattern pattern = Pattern.compile(".*INCOMPLETE.*");
+ File[] files = backupDir.listFiles((dir1, name) -> pattern.matcher(name).matches());
+ assertNotNull(files);
+ assertTrue(files.length == 0);
}
protected void createPersistentRegion(VM vm) throws Throwable {
@@ -594,7 +578,7 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
public void run() {
final int pid = vm.getPid();
try {
- FileUtil.delete(new File("userbackup_" + pid));
+ FileUtils.deleteDirectory(new File("userbackup_" + pid));
} catch (IOException e) {
fail(e.getMessage());
}
@@ -674,7 +658,6 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
dsf.setMaxOplogSize(1);
DiskStore ds = dsf.create(getUniqueName());
-
RegionFactory rf = new RegionFactory();
rf.setDiskStoreName(ds.getName());
rf.setDiskSynchronous(true);
@@ -704,7 +687,6 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
dsf.setMaxOplogSize(1);
DiskStore ds = dsf.create(getUniqueName());
-
RegionFactory rf = new RegionFactory();
rf.setDiskStoreName(ds.getName());
rf.setDiskSynchronous(true);
@@ -802,4 +784,31 @@ public class BackupDUnitTest extends PersistentPartitionedRegionTestBase {
}
+ /**
+ * Recursively delete a file or directory. A description of any files or directories that can not
+ * be deleted will be added to failures if failures is non-null. This method tries to delete as
+ * much as possible.
+ */
+ public static void delete(File file, StringBuilder failures) {
+ if (!file.exists())
+ return;
+
+ if (file.isDirectory()) {
+ File[] fileList = file.listFiles();
+ if (fileList != null) {
+ for (File child : fileList) {
+ delete(child, failures);
+ }
+ }
+ }
+
+ try {
+ Files.delete(file.toPath());
+ } catch (IOException e) {
+ if (failures != null) {
+ failures.append("Could not delete ").append(file).append(" due to ").append(e.getMessage())
+ .append('\n');
+ }
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/cache/BackupJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BackupJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BackupJUnitTest.java
index a89c0d1..6d04773 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BackupJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BackupJUnitTest.java
@@ -14,9 +14,28 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.cache.*;
+import static junit.framework.TestCase.assertNotNull;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.filefilter.DirectoryFileFilter;
+import org.apache.commons.io.filefilter.RegexFileFilter;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.DiskStore;
+import org.apache.geode.cache.DiskStoreFactory;
+import org.apache.geode.cache.DiskWriteAttributesFactory;
+import org.apache.geode.cache.EvictionAction;
+import org.apache.geode.cache.EvictionAttributes;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionFactory;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.cache.persistence.BackupManager;
import org.apache.geode.internal.cache.persistence.RestoreScript;
import org.apache.geode.test.junit.categories.IntegrationTest;
@@ -25,13 +44,19 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.net.URISyntaxException;
import java.net.URL;
-import java.util.*;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Properties;
+import java.util.Random;
/**
*
@@ -92,15 +117,15 @@ public class BackupJUnitTest {
@After
public void tearDown() throws Exception {
cache.close();
- FileUtil.delete(backupDir);
- FileUtil.delete(diskDirs[0]);
- FileUtil.delete(diskDirs[1]);
+ FileUtils.deleteDirectory(backupDir);
+ FileUtils.deleteDirectory(diskDirs[0]);
+ FileUtils.deleteDirectory(diskDirs[1]);
}
private void destroyDiskDirs() throws IOException {
- FileUtil.delete(diskDirs[0]);
+ FileUtils.deleteDirectory(diskDirs[0]);
diskDirs[0].mkdir();
- FileUtil.delete(diskDirs[1]);
+ FileUtils.deleteDirectory(diskDirs[1]);
diskDirs[1].mkdir();
}
@@ -300,7 +325,10 @@ public class BackupJUnitTest {
BackupManager backup = cache.startBackup(cache.getDistributedSystem().getDistributedMember());
backup.prepareBackup();
backup.finishBackup(backupDir, null, false);
- File cacheXmlBackup = FileUtil.find(backupDir, ".*config.cache.xml");
+ Collection<File> fileCollection = FileUtils.listFiles(backupDir,
+ new RegexFileFilter("cache.xml"), DirectoryFileFilter.DIRECTORY);
+ assertEquals(1, fileCollection.size());
+ File cacheXmlBackup = fileCollection.iterator().next();
assertTrue(cacheXmlBackup.exists());
byte[] expectedBytes = getBytes(cacheXmlFile);
byte[] backupBytes = getBytes(cacheXmlBackup);
@@ -345,7 +373,9 @@ public class BackupJUnitTest {
}
private void restoreBackup(boolean expectFailure) throws IOException, InterruptedException {
- List<File> restoreScripts = FileUtil.findAll(backupDir, ".*restore.*");
+ Collection<File> restoreScripts = FileUtils.listFiles(backupDir,
+ new RegexFileFilter(".*restore.*"), DirectoryFileFilter.DIRECTORY);
+ assertNotNull(restoreScripts);
assertEquals("Restore scripts " + restoreScripts, 1, restoreScripts.size());
for (File script : restoreScripts) {
execute(script, expectFailure);
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java
index 6955dc8..44036c0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionAsyncRecoveryJUnitTest.java
@@ -14,7 +14,18 @@
*/
package org.apache.geode.internal.cache;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.Region;
+import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.io.File;
import java.io.IOException;
@@ -23,15 +34,6 @@ import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.cache.DataPolicy;
-import org.apache.geode.cache.Region;
-import org.apache.geode.internal.FileUtil;
-import org.apache.geode.test.junit.categories.FlakyTest;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-
@Category(IntegrationTest.class)
public class DiskRegionAsyncRecoveryJUnitTest extends DiskRegionTestingBase {
@@ -492,15 +494,15 @@ public class DiskRegionAsyncRecoveryJUnitTest extends DiskRegionTestingBase {
File tmpDir = new File(dirs[0].getParent(), "backupDir");
tmpDir.mkdirs();
for (File file : dirs) {
- FileUtil.copy(file, new File(tmpDir, file.getName()));
+ FileUtils.copyDirectory(file, new File(tmpDir, file.getName()));
}
}
private void restoreDisk() throws IOException {
File tmpDir = new File(dirs[0].getParent(), "backupDir");
for (File file : dirs) {
- FileUtil.delete(file);
- FileUtil.copy(new File(tmpDir, file.getName()), file);
+ FileUtils.deleteDirectory(file);
+ FileUtils.copyDirectory(new File(tmpDir, file.getName()), file);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionTestingBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionTestingBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionTestingBase.java
index 55cabe7..5333726 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionTestingBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/DiskRegionTestingBase.java
@@ -17,19 +17,15 @@
*/
package org.apache.geode.internal.cache;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Properties;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.rules.TestName;
+import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_TIME_STATISTICS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_ARCHIVE_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLING_ENABLED;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.apache.geode.LogWriter;
import org.apache.geode.cache.Cache;
@@ -40,9 +36,19 @@ import org.apache.geode.cache.DiskStoreFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionDestroyedException;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.cache.LocalRegion.NonTXEntry;
import org.apache.geode.internal.cache.versions.VersionTag;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Properties;
/**
* All disk region unit tests extend this base class , common method to be used in all tests are
@@ -204,7 +210,7 @@ public abstract class DiskRegionTestingBase {
while (cnt < 3) {
try {
cnt++;
- FileUtil.delete(files[j]);
+ Files.delete(files[j].toPath());
break;
} catch (IOException e) {
ioe = e;
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/cache/IncrementalBackupDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/IncrementalBackupDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/IncrementalBackupDUnitTest.java
index 9c459a9..0cc003e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/IncrementalBackupDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/IncrementalBackupDUnitTest.java
@@ -14,24 +14,15 @@
*/
package org.apache.geode.internal.cache;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.filefilter.DirectoryFileFilter;
+import org.apache.commons.io.filefilter.RegexFileFilter;
import org.apache.geode.admin.AdminDistributedSystem;
import org.apache.geode.admin.AdminDistributedSystemFactory;
import org.apache.geode.admin.AdminException;
@@ -47,7 +38,6 @@ import org.apache.geode.cache.persistence.PersistentID;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.ClassBuilder;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.JarClassLoader;
import org.apache.geode.internal.JarDeployer;
import org.apache.geode.internal.cache.persistence.BackupManager;
@@ -62,6 +52,22 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
/**
* Tests for the incremental backup feature.
@@ -105,7 +111,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
};
protected RegionFactory<Integer, String> getRegionFactory(Cache cache) {
- return cache.<Integer, String>createRegionFactory(RegionShortcut.PARTITION_PERSISTENT);
+ return cache.createRegionFactory(RegionShortcut.PARTITION_PERSISTENT);
}
/**
@@ -376,7 +382,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
}
});
- final Set<PersistentID> missingMembers = new HashSet<PersistentID>();
+ final Set<PersistentID> missingMembers = new HashSet<>();
Wait.waitForCriterion(new WaitCriterion() {
@Override
public boolean done() {
@@ -415,7 +421,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
public void run() {
Collection<DiskStoreImpl> backupInProgress =
((GemFireCacheImpl) getCache()).listDiskStores();
- List<DiskStoreImpl> backupCompleteList = new LinkedList<DiskStoreImpl>();
+ List<DiskStoreImpl> backupCompleteList = new LinkedList<>();
while (backupCompleteList.size() < backupInProgress.size()) {
for (DiskStoreImpl diskStore : backupInProgress) {
@@ -497,7 +503,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
File[] memberDirs = dateDirs[0].listFiles(new FileFilter() {
@Override
public boolean accept(File file) {
- return (file.isDirectory() && (file.getName().indexOf(memberId) != -1));
+ return (file.isDirectory() && (file.getName().contains(memberId)));
}
});
@@ -578,9 +584,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
}
}).start();
- int result = process.waitFor();
-
- return result;
+ return process.waitFor();
}
/**
@@ -593,7 +597,8 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
* The restore script will not restore if there is an if file in the copy to directory. Remove
* these files first.
*/
- List<File> ifFiles = FileUtil.findAll(memberDir, ".*\\.if$");
+ Collection<File> ifFiles = FileUtils.listFiles(memberDir, new RegexFileFilter(".*\\.if$"),
+ DirectoryFileFilter.DIRECTORY);
for (File file : ifFiles) {
file.delete();
}
@@ -601,7 +606,8 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/*
* Remove all operation logs.
*/
- List<File> oplogs = FileUtil.findAll(memberDir, OPLOG_REGEX);
+ Collection<File> oplogs = FileUtils.listFiles(memberDir, new RegexFileFilter(OPLOG_REGEX),
+ DirectoryFileFilter.DIRECTORY);
for (File file : oplogs) {
file.delete();
}
@@ -688,9 +694,9 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
*/
@Override
public final void preTearDownCacheTestCase() throws Exception {
- FileUtil.delete(getIncremental2Dir());
- FileUtil.delete(getIncrementalDir());
- FileUtil.delete(getBaselineDir());
+ FileUtils.deleteDirectory(getIncremental2Dir());
+ FileUtils.deleteDirectory(getIncrementalDir());
+ FileUtils.deleteDirectory(getBaselineDir());
}
/**
@@ -709,7 +715,8 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
assertNotNull(memberDir);
// Find all of the member's oplogs in the disk directory (*.crf,*.krf,*.drf)
- List<File> memberOplogFiles = FileUtil.findAll(memberDir, OPLOG_REGEX);
+ Collection<File> memberOplogFiles = FileUtils.listFiles(memberDir,
+ new RegexFileFilter(OPLOG_REGEX), DirectoryFileFilter.DIRECTORY);
assertFalse(memberOplogFiles.isEmpty());
// Perform a full backup and wait for it to finish
@@ -717,11 +724,12 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
waitForBackup(Host.getHost(0).getVM(1));
// Find all of the member's oplogs in the baseline (*.crf,*.krf,*.drf)
- List<File> memberBaselineOplogs =
- FileUtil.findAll(getBackupDirForMember(getBaselineDir(), memberId), OPLOG_REGEX);
+ Collection<File> memberBaselineOplogs =
+ FileUtils.listFiles(getBackupDirForMember(getBaselineDir(), memberId),
+ new RegexFileFilter(OPLOG_REGEX), DirectoryFileFilter.DIRECTORY);
assertFalse(memberBaselineOplogs.isEmpty());
- List<String> memberBaselineOplogNames = new LinkedList<String>();
+ List<String> memberBaselineOplogNames = new LinkedList<>();
TransformUtils.transform(memberBaselineOplogs, memberBaselineOplogNames,
TransformUtils.fileNameTransformer);
@@ -731,11 +739,12 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
waitForBackup(Host.getHost(0).getVM(1));
// Find all of the member's oplogs in the incremental (*.crf,*.krf,*.drf)
- List<File> memberIncrementalOplogs =
- FileUtil.findAll(getBackupDirForMember(getIncrementalDir(), memberId), OPLOG_REGEX);
+ Collection<File> memberIncrementalOplogs =
+ FileUtils.listFiles(getBackupDirForMember(getIncrementalDir(), memberId),
+ new RegexFileFilter(OPLOG_REGEX), DirectoryFileFilter.DIRECTORY);
assertFalse(memberIncrementalOplogs.isEmpty());
- List<String> memberIncrementalOplogNames = new LinkedList<String>();
+ List<String> memberIncrementalOplogNames = new LinkedList<>();
TransformUtils.transform(memberIncrementalOplogs, memberIncrementalOplogNames,
TransformUtils.fileNameTransformer);
@@ -755,11 +764,12 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
assertBackupStatus(performIncremental2());
waitForBackup(Host.getHost(0).getVM(1));
- List<File> memberIncremental2Oplogs =
- FileUtil.findAll(getBackupDirForMember(getIncremental2Dir(), memberId), OPLOG_REGEX);
+ Collection<File> memberIncremental2Oplogs =
+ FileUtils.listFiles(getBackupDirForMember(getIncremental2Dir(), memberId),
+ new RegexFileFilter(OPLOG_REGEX), DirectoryFileFilter.DIRECTORY);
assertFalse(memberIncremental2Oplogs.isEmpty());
- List<String> memberIncremental2OplogNames = new LinkedList<String>();
+ List<String> memberIncremental2OplogNames = new LinkedList<>();
TransformUtils.transform(memberIncremental2Oplogs, memberIncremental2OplogNames,
TransformUtils.fileNameTransformer);
@@ -792,9 +802,10 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/*
* Collect all of the restored operation logs.
*/
- List<File> restoredOplogs = FileUtil.findAll(new File(id.getDirectory()), OPLOG_REGEX);
+ Collection<File> restoredOplogs = FileUtils.listFiles(new File(id.getDirectory()),
+ new RegexFileFilter(OPLOG_REGEX), DirectoryFileFilter.DIRECTORY);
assertFalse(restoredOplogs.isEmpty());
- List<String> restoredOplogNames = new LinkedList<String>();
+ List<String> restoredOplogNames = new LinkedList<>();
TransformUtils.transform(restoredOplogs, restoredOplogNames,
TransformUtils.fileNameTransformer);
@@ -854,8 +865,9 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
// Find all of the member's oplogs in the missing member's diskstore directory structure
// (*.crf,*.krf,*.drf)
- List<File> missingMemberOplogFiles =
- FileUtil.findAll(new File(missingMember.getDirectory()), OPLOG_REGEX);
+ Collection<File> missingMemberOplogFiles =
+ FileUtils.listFiles(new File(missingMember.getDirectory()),
+ new RegexFileFilter(OPLOG_REGEX), DirectoryFileFilter.DIRECTORY);
assertFalse(missingMemberOplogFiles.isEmpty());
/*
@@ -866,7 +878,7 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/*
* After reconnecting make sure the other members agree that the missing member is back online.
*/
- final Set<PersistentID> missingMembers = new HashSet<PersistentID>();
+ final Set<PersistentID> missingMembers = new HashSet<>();
Wait.waitForCriterion(new WaitCriterion() {
@Override
public boolean done() {
@@ -897,16 +909,17 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
// Get list of backed up oplog files in the incremental backup for the missing member
File incrementalMemberDir = getBackupDirForMember(getIncrementalDir(), memberId);
- List<File> backupOplogFiles = FileUtil.findAll(incrementalMemberDir, OPLOG_REGEX);
+ Collection<File> backupOplogFiles = FileUtils.listFiles(incrementalMemberDir,
+ new RegexFileFilter(OPLOG_REGEX), DirectoryFileFilter.DIRECTORY);
assertFalse(backupOplogFiles.isEmpty());
// Transform missing member oplogs to just their file names.
- List<String> missingMemberOplogNames = new LinkedList<String>();
+ List<String> missingMemberOplogNames = new LinkedList<>();
TransformUtils.transform(missingMemberOplogFiles, missingMemberOplogNames,
TransformUtils.fileNameTransformer);
// Transform missing member's incremental backup oplogs to just their file names.
- List<String> backupOplogNames = new LinkedList<String>();
+ List<String> backupOplogNames = new LinkedList<>();
TransformUtils.transform(backupOplogFiles, backupOplogNames,
TransformUtils.fileNameTransformer);
@@ -932,11 +945,12 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/*
* Find all of the member's oplogs in the baseline (*.crf,*.krf,*.drf)
*/
- List<File> memberBaselineOplogs =
- FileUtil.findAll(getBackupDirForMember(getBaselineDir(), memberId), OPLOG_REGEX);
+ Collection<File> memberBaselineOplogs =
+ FileUtils.listFiles(getBackupDirForMember(getBaselineDir(), memberId),
+ new RegexFileFilter(OPLOG_REGEX), DirectoryFileFilter.DIRECTORY);
assertFalse(memberBaselineOplogs.isEmpty());
- List<String> memberBaselineOplogNames = new LinkedList<String>();
+ List<String> memberBaselineOplogNames = new LinkedList<>();
TransformUtils.transform(memberBaselineOplogs, memberBaselineOplogNames,
TransformUtils.fileNameTransformer);
@@ -952,11 +966,12 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/*
* Find all of the member's oplogs in the incremental (*.crf,*.krf,*.drf)
*/
- List<File> memberIncrementalOplogs =
- FileUtil.findAll(getBackupDirForMember(getIncrementalDir(), memberId), OPLOG_REGEX);
+ Collection<File> memberIncrementalOplogs =
+ FileUtils.listFiles(getBackupDirForMember(getIncrementalDir(), memberId),
+ new RegexFileFilter(OPLOG_REGEX), DirectoryFileFilter.DIRECTORY);
assertFalse(memberIncrementalOplogs.isEmpty());
- List<String> memberIncrementalOplogNames = new LinkedList<String>();
+ List<String> memberIncrementalOplogNames = new LinkedList<>();
TransformUtils.transform(memberIncrementalOplogs, memberIncrementalOplogNames,
TransformUtils.fileNameTransformer);
@@ -984,11 +999,12 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/*
* Find all of the member's oplogs in the baseline (*.crf,*.krf,*.drf)
*/
- List<File> memberBaselineOplogs =
- FileUtil.findAll(getBackupDirForMember(getBaselineDir(), memberId), OPLOG_REGEX);
+ Collection<File> memberBaselineOplogs =
+ FileUtils.listFiles(getBackupDirForMember(getBaselineDir(), memberId),
+ new RegexFileFilter(OPLOG_REGEX), DirectoryFileFilter.DIRECTORY);
assertFalse(memberBaselineOplogs.isEmpty());
- List<String> memberBaselineOplogNames = new LinkedList<String>();
+ List<String> memberBaselineOplogNames = new LinkedList<>();
TransformUtils.transform(memberBaselineOplogs, memberBaselineOplogNames,
TransformUtils.fileNameTransformer);
@@ -1021,17 +1037,18 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
* Do an incremental after deleting the baseline. It should discover that the baseline is gone
* and backup all of the operation logs that are in the baseline.
*/
- FileUtil.delete(getBaselineDir());
+ FileUtils.deleteDirectory(getBaselineDir());
Host.getHost(0).getVM(1).invoke(callable);
/*
* Find all of the member's oplogs in the incremental (*.crf,*.krf,*.drf)
*/
- List<File> memberIncrementalOplogs =
- FileUtil.findAll(getBackupDirForMember(getIncrementalDir(), memberId), OPLOG_REGEX);
+ Collection<File> memberIncrementalOplogs =
+ FileUtils.listFiles(getBackupDirForMember(getIncrementalDir(), memberId),
+ new RegexFileFilter(OPLOG_REGEX), DirectoryFileFilter.DIRECTORY);
assertFalse(memberIncrementalOplogs.isEmpty());
- List<String> memberIncrementalOplogNames = new LinkedList<String>();
+ List<String> memberIncrementalOplogNames = new LinkedList<>();
TransformUtils.transform(memberIncrementalOplogs, memberIncrementalOplogNames,
TransformUtils.fileNameTransformer);
@@ -1078,8 +1095,9 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/*
* Make sure the user deployed jar is part of the backup.
*/
- List<File> memberDeployedJarFiles =
- FileUtil.findAll(getBackupDirForMember(getBaselineDir(), getMemberId(vm0)), jarNameRegex);
+ Collection<File> memberDeployedJarFiles =
+ FileUtils.listFiles(getBackupDirForMember(getBaselineDir(), getMemberId(vm0)),
+ new RegexFileFilter(jarNameRegex), DirectoryFileFilter.DIRECTORY);
assertFalse(memberDeployedJarFiles.isEmpty());
// Shut down our member so we can perform a restore
@@ -1103,7 +1121,8 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/*
* Cleanup "dummy" jar from file system.
*/
- FileUtil.deleteMatching(new File(vmDir), "^" + JarDeployer.JAR_PREFIX + jarName + ".*#\\d++$");
+ Pattern pattern = Pattern.compile("^" + JarDeployer.JAR_PREFIX + jarName + ".*#\\d++$");
+ deleteMatching(new File("."), pattern);
// Execute the restore
performRestore(new File(id.getDirectory()), backupDir);
@@ -1111,13 +1130,14 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/*
* Make sure the user deployed jar is part of the restore.
*/
- List<File> restoredJars = FileUtil.findAll(new File(vmDir), jarNameRegex);
+ Collection<File> restoredJars = FileUtils.listFiles(new File(vmDir),
+ new RegexFileFilter(jarNameRegex), DirectoryFileFilter.DIRECTORY);
assertFalse(restoredJars.isEmpty());
- List<String> restoredJarNames = new LinkedList<String>();
+ List<String> restoredJarNames = new LinkedList<>();
TransformUtils.transform(memberDeployedJarFiles, restoredJarNames,
TransformUtils.fileNameTransformer);
for (String name : restoredJarNames) {
- assertTrue(name.indexOf(jarName) != -1);
+ assertTrue(name.contains(jarName));
}
// Restart the member
@@ -1142,6 +1162,15 @@ public class IncrementalBackupDUnitTest extends JUnit4CacheTestCase {
/*
* Cleanup "dummy" jar from file system.
*/
- FileUtil.deleteMatching(new File(vmDir), "^" + JarDeployer.JAR_PREFIX + jarName + ".*#\\d++$");
+ pattern = Pattern.compile("^" + JarDeployer.JAR_PREFIX + jarName + ".*#\\d++$");
+ deleteMatching(new File(vmDir), pattern);
+ }
+
+ private void deleteMatching(File dir, final Pattern pattern) throws IOException {
+ Collection<File> files =
+ FileUtils.listFiles(dir, new RegexFileFilter(pattern), DirectoryFileFilter.DIRECTORY);
+ for (File file : files) {
+ Files.delete(file.toPath());
+ }
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
index 138f3ac..65833c4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/OplogRVVJUnitTest.java
@@ -14,13 +14,17 @@
*/
package org.apache.geode.internal.cache;
-import java.io.File;
-import java.net.UnknownHostException;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
+import static org.junit.Assert.assertEquals;
+import org.apache.commons.io.FileUtils;
+import org.apache.geode.StatisticsFactory;
+import org.apache.geode.i18n.LogWriterI18n;
+import org.apache.geode.internal.cache.DiskInitFile.DiskRegionFlag;
+import org.apache.geode.internal.cache.DiskStoreImpl.OplogEntryIdSet;
+import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
+import org.apache.geode.internal.cache.persistence.DiskStoreID;
+import org.apache.geode.internal.cache.versions.DiskRegionVersionVector;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.lib.legacy.ClassImposteriser;
@@ -31,15 +35,13 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import org.apache.geode.StatisticsFactory;
-import org.apache.geode.i18n.LogWriterI18n;
-import org.apache.geode.internal.FileUtil;
-import org.apache.geode.internal.cache.DiskInitFile.DiskRegionFlag;
-import org.apache.geode.internal.cache.DiskStoreImpl.OplogEntryIdSet;
-import org.apache.geode.internal.cache.persistence.DiskRecoveryStore;
-import org.apache.geode.internal.cache.persistence.DiskStoreID;
-import org.apache.geode.internal.cache.versions.DiskRegionVersionVector;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import java.io.File;
+import java.net.UnknownHostException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
@Category(IntegrationTest.class)
public class OplogRVVJUnitTest {
@@ -174,10 +176,12 @@ public class OplogRVVJUnitTest {
});
oplog = new Oplog(1, oplogSet);
- File drfFile = FileUtil.find(testDirectory, ".*.drf");
- File crfFile = FileUtil.find(testDirectory, ".*.crf");
- oplog.addRecoveredFile(drfFile, dirHolder);
- oplog.addRecoveredFile(crfFile, dirHolder);
+ Collection<File> drfFiles = FileUtils.listFiles(testDirectory, new String[] {"drf"}, true);
+ assertEquals(1, drfFiles.size());
+ Collection<File> crfFiles = FileUtils.listFiles(testDirectory, new String[] {"crf"}, true);
+ assertEquals(1, crfFiles.size());
+ oplog.addRecoveredFile(drfFiles.iterator().next(), dirHolder);
+ oplog.addRecoveredFile(crfFiles.iterator().next(), dirHolder);
OplogEntryIdSet deletedIds = new OplogEntryIdSet();
oplog.recoverDrf(deletedIds, false, true);
oplog.recoverCrf(deletedIds, true, true, false, Collections.singleton(oplog), true);
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java
index 2529639..e433771 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionStatsJUnitTest.java
@@ -22,17 +22,7 @@ package org.apache.geode.internal.cache;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Random;
-import java.util.Set;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
+import org.apache.commons.io.FileUtils;
import org.apache.geode.LogWriter;
import org.apache.geode.Statistics;
import org.apache.geode.cache.AttributesFactory;
@@ -43,8 +33,17 @@ import org.apache.geode.cache.EvictionAttributes;
import org.apache.geode.cache.PartitionAttributesFactory;
import org.apache.geode.cache.PartitionedRegionStorageException;
import org.apache.geode.cache.RegionExistsException;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Random;
+import java.util.Set;
/**
*
@@ -62,7 +61,7 @@ public class PartitionedRegionStatsJUnitTest {
@After
public void tearDown() throws IOException {
PartitionedRegionTestHelper.closeCache();
- FileUtil.delete(DISK_DIR);
+ FileUtils.deleteDirectory(DISK_DIR);
}
private PartitionedRegion createPR(String name, int lmax, int redundancy) {
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java
index 478f5e3..bfdf1c0 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PersistentPartitionedRegionJUnitTest.java
@@ -14,9 +14,24 @@
*/
package org.apache.geode.internal.cache;
-import org.apache.geode.cache.*;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.EntryNotFoundException;
+import org.apache.geode.cache.EvictionAction;
+import org.apache.geode.cache.EvictionAttributes;
+import org.apache.geode.cache.ExpirationAction;
+import org.apache.geode.cache.ExpirationAttributes;
+import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.util.ObjectSizer;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -27,10 +42,6 @@ import java.io.File;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
@Category(IntegrationTest.class)
public class PersistentPartitionedRegionJUnitTest {
@@ -48,7 +59,7 @@ public class PersistentPartitionedRegionJUnitTest {
if (cache != null && !cache.isClosed()) {
cache.close();
}
- FileUtil.delete(dir);
+ FileUtils.deleteDirectory(dir);
}
@Test
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
index 47520bc..8748df6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
@@ -14,39 +14,19 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import org.junit.experimental.categories.Category;
-import org.mockito.ArgumentCaptor;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.core.Appender;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.Logger;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
import static org.awaitility.Awaitility.await;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.times;
-
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.commons.io.FileUtils;
import org.apache.geode.admin.internal.AdminDistributedSystemImpl;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -64,7 +44,6 @@ import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.DistributionMessage;
import org.apache.geode.distributed.internal.DistributionMessageObserver;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.cache.ColocationLogger;
import org.apache.geode.internal.cache.InitialImageOperation.RequestImageMessage;
import org.apache.geode.internal.cache.PartitionedRegion;
@@ -73,16 +52,34 @@ import org.apache.geode.internal.cache.control.InternalResourceManager;
import org.apache.geode.internal.cache.control.InternalResourceManager.ResourceObserver;
import org.apache.geode.test.dunit.Assert;
import org.apache.geode.test.dunit.AsyncInvocation;
+import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.RMIException;
-import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.SerializableCallable;
import org.apache.geode.test.dunit.SerializableRunnable;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.Logger;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.mockito.ArgumentCaptor;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
@Category(DistributedTest.class)
public class PersistentColocatedPartitionedRegionDUnitTest
@@ -105,7 +102,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest
@Override
public final void preTearDownCacheTestCase() throws Exception {
- FileUtil.delete(getBackupDir());
+ FileUtils.deleteDirectory(getBackupDir());
}
@Test
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
index 09893be..ccdd38d 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionTestBase.java
@@ -14,20 +14,11 @@
*/
package org.apache.geode.internal.cache.partitioned;
-import static org.apache.geode.test.dunit.Assert.*;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.InetAddress;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
+import static org.apache.geode.test.dunit.Assert.assertEquals;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.filefilter.DirectoryFileFilter;
+import org.apache.commons.io.filefilter.RegexFileFilter;
import org.apache.geode.admin.AdminDistributedSystem;
import org.apache.geode.admin.AdminDistributedSystemFactory;
import org.apache.geode.admin.AdminException;
@@ -45,7 +36,6 @@ import org.apache.geode.cache.partition.PartitionRegionHelper;
import org.apache.geode.cache.partition.PartitionRegionInfo;
import org.apache.geode.cache.persistence.PersistentID;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.cache.DiskRegion;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.PartitionedRegion;
@@ -65,6 +55,18 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.util.Collection;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
public abstract class PersistentPartitionedRegionTestBase extends JUnit4CacheTestCase {
public static String PR_REGION_NAME = "region";
@@ -774,7 +776,8 @@ public abstract class PersistentPartitionedRegionTestBase extends JUnit4CacheTes
}
protected void restoreBackup(int expectedNumScripts) throws IOException, InterruptedException {
- List<File> restoreScripts = FileUtil.findAll(getBackupDir(), ".*restore.*");
+ Collection<File> restoreScripts = FileUtils.listFiles(getBackupDir(),
+ new RegexFileFilter(".*restore.*"), DirectoryFileFilter.DIRECTORY);
assertEquals("Restore scripts " + restoreScripts, expectedNumScripts, restoreScripts.size());
for (File script : restoreScripts) {
execute(script);
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
index d8aa379..5d4096e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java
@@ -14,23 +14,15 @@
*/
package org.apache.geode.internal.cache.partitioned.fixed;
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.Set;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.Cache;
@@ -48,7 +40,6 @@ import org.apache.geode.cache.partition.PartitionRegionHelper;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.cache.FixedPartitionAttributesImpl;
import org.apache.geode.internal.cache.HARegion;
import org.apache.geode.internal.cache.PartitionRegionConfig;
@@ -70,6 +61,19 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.Set;
/**
* This is the base class to do operations
@@ -1285,7 +1289,7 @@ public class FixedPartitioningTestBase extends JUnit4DistributedTestCase {
}
public static void cleanDiskDirs() throws IOException {
- FileUtil.delete(getDiskDir());
+ FileUtils.deleteDirectory(getDiskDir());
}
public static void closeCache() {
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/BackupInspectorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/BackupInspectorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/BackupInspectorJUnitTest.java
index 1da360e..5fd3585 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/BackupInspectorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/BackupInspectorJUnitTest.java
@@ -14,22 +14,22 @@
*/
package org.apache.geode.internal.cache.persistence;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Set;
-
-import org.junit.After;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.TemporaryFolder;
-import org.apache.geode.internal.FileUtil;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Set;
/**
* TODO: fails when running integrationTest from gradle command-line on Windows 7
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentReplicatedTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentReplicatedTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentReplicatedTestBase.java
index c76292e..4c82742 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentReplicatedTestBase.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/PersistentReplicatedTestBase.java
@@ -14,13 +14,9 @@
*/
package org.apache.geode.internal.cache.persistence;
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Set;
+import static org.junit.Assert.fail;
+import org.apache.commons.io.FileUtils;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.DiskStore;
@@ -28,7 +24,6 @@ import org.apache.geode.cache.DiskStoreFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.Scope;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.test.dunit.AsyncInvocation;
import org.apache.geode.test.dunit.Invoke;
@@ -38,6 +33,11 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+import java.util.Set;
+
public abstract class PersistentReplicatedTestBase extends JUnit4CacheTestCase {
protected static final int MAX_WAIT = 30 * 1000;
@@ -51,7 +51,7 @@ public abstract class PersistentReplicatedTestBase extends JUnit4CacheTestCase {
new Object[] {getUniqueName()});
setRegionName(getUniqueName());
diskDir = new File("diskDir-" + getName()).getAbsoluteFile();
- org.apache.geode.internal.FileUtil.delete(diskDir);
+ FileUtils.deleteDirectory(diskDir);
diskDir.mkdir();
diskDir.deleteOnExit();
}
@@ -62,7 +62,7 @@ public abstract class PersistentReplicatedTestBase extends JUnit4CacheTestCase {
@Override
public final void postTearDownCacheTestCase() throws Exception {
- org.apache.geode.internal.FileUtil.delete(diskDir);
+ FileUtils.deleteDirectory(diskDir);
postTearDownPersistentReplicatedTestBase();
}
@@ -216,16 +216,16 @@ public abstract class PersistentReplicatedTestBase extends JUnit4CacheTestCase {
protected void backupDir(VM vm) throws IOException {
File dirForVM = getDiskDirForVM(vm);
File backFile = new File(dirForVM.getParent(), dirForVM.getName() + ".bk");
- FileUtil.copy(dirForVM, backFile);
+ FileUtils.copyDirectory(dirForVM, backFile);
}
protected void restoreBackup(VM vm) throws IOException {
File dirForVM = getDiskDirForVM(vm);
File backFile = new File(dirForVM.getParent(), dirForVM.getName() + ".bk");
if (!backFile.renameTo(dirForVM)) {
- FileUtil.delete(dirForVM);
- FileUtil.copy(backFile, dirForVM);
- FileUtil.delete(backFile);
+ FileUtils.deleteDirectory(dirForVM);
+ FileUtils.copyDirectory(backFile, dirForVM);
+ FileUtils.deleteDirectory(backFile);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
index 5106935..54c6d94 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgrade2DUnitTest.java
@@ -19,6 +19,7 @@ import static org.apache.geode.test.dunit.Assert.assertFalse;
import static org.apache.geode.test.dunit.Assert.assertTrue;
import static org.apache.geode.test.dunit.Assert.fail;
+import org.apache.commons.io.FileUtils;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
@@ -48,7 +49,6 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.DiskInitFile;
import org.apache.geode.internal.cache.GemFireCacheImpl;
@@ -149,7 +149,7 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase {
File pwd = new File(".");
for (File entry : pwd.listFiles()) {
try {
- FileUtil.delete(entry);
+ FileUtils.deleteDirectory(entry);
} catch (Exception e) {
System.out.println("Could not delete " + entry + ": " + e.getMessage());
}
@@ -1527,7 +1527,7 @@ public class RollingUpgrade2DUnitTest extends JUnit4DistributedTestCase {
public void deleteDiskStores() throws Exception {
try {
- FileUtil.delete(new File(diskDir).getAbsoluteFile());
+ FileUtils.deleteDirectory(new File(diskDir).getAbsoluteFile());
} catch (IOException e) {
throw new Error("Error deleting files", e);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
index 54b51de..0940ea6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/rollingupgrade/RollingUpgradeDUnitTest.java
@@ -14,11 +14,11 @@
*/
package org.apache.geode.internal.cache.rollingupgrade;
+import org.apache.commons.io.FileUtils;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.cache30.CacheSerializableRunnable;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.FileUtil;
import org.apache.geode.internal.Version;
import org.apache.geode.test.dunit.DistributedTestUtils;
import org.apache.geode.test.dunit.Host;
@@ -28,7 +28,6 @@ import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.NetworkUtils;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.dunit.standalone.DUnitLauncher;
import org.apache.geode.test.dunit.standalone.VersionManager;
import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
import org.apache.geode.test.junit.categories.DistributedTest;
@@ -98,7 +97,7 @@ public class RollingUpgradeDUnitTest extends JUnit4DistributedTestCase {
File pwd = new File(".");
for (File entry : pwd.listFiles()) {
try {
- FileUtil.delete(entry);
+ FileUtils.deleteDirectory(entry);
} catch (Exception e) {
System.out.println("Could not delete " + entry + ": " + e.getMessage());
}
@@ -688,7 +687,7 @@ public class RollingUpgradeDUnitTest extends JUnit4DistributedTestCase {
public void deleteDiskStores() throws Exception {
try {
- FileUtil.delete(new File(diskDir).getAbsoluteFile());
+ FileUtils.deleteDirectory(new File(diskDir).getAbsoluteFile());
} catch (IOException e) {
throw new Error("Error deleting files", e);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4J2PerformanceTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4J2PerformanceTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4J2PerformanceTest.java
index 0bd50ab..24cb6d8 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4J2PerformanceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/Log4J2PerformanceTest.java
@@ -14,16 +14,13 @@
*/
package org.apache.geode.internal.logging.log4j;
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URL;
+import static org.junit.Assert.assertTrue;
import org.apache.commons.io.FileUtils;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.logging.LoggingPerformanceTestCase;
+import org.apache.geode.internal.util.IOUtils;
+import org.apache.geode.test.junit.categories.PerformanceTest;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -32,11 +29,12 @@ import org.junit.After;
import org.junit.Ignore;
import org.junit.experimental.categories.Category;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.FileUtil;
-import org.apache.geode.internal.logging.LoggingPerformanceTestCase;
-import org.apache.geode.internal.util.IOUtils;
-import org.apache.geode.test.junit.categories.PerformanceTest;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URL;
@Category(PerformanceTest.class)
@Ignore("Tests have no assertions")
@@ -101,7 +99,8 @@ public class Log4J2PerformanceTest extends LoggingPerformanceTestCase {
this.logFile = new File(this.configDirectory, DistributionConfig.GEMFIRE_PREFIX + "log");
final String logFilePath = IOUtils.tryGetCanonicalPathElseGetAbsolutePath(logFile);
- final String logFileName = FileUtil.stripOffExtension(logFilePath);
+ final String logFileName =
+ logFilePath.substring(0, logFilePath.lastIndexOf(File.separatorChar));
setPropertySubstitutionValues(logFileName, DEFAULT_LOG_FILE_SIZE_LIMIT,
DEFAULT_LOG_FILE_COUNT_LIMIT);
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterLoggerPerformanceTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterLoggerPerformanceTest.java b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterLoggerPerformanceTest.java
index d4f36d3..31bdd95 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterLoggerPerformanceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/logging/log4j/LogWriterLoggerPerformanceTest.java
@@ -14,16 +14,13 @@
*/
package org.apache.geode.internal.logging.log4j;
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URL;
+import static org.junit.Assert.assertTrue;
import org.apache.commons.io.FileUtils;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.logging.LoggingPerformanceTestCase;
+import org.apache.geode.internal.util.IOUtils;
+import org.apache.geode.test.junit.categories.PerformanceTest;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.config.ConfigurationFactory;
@@ -31,11 +28,12 @@ import org.junit.After;
import org.junit.Ignore;
import org.junit.experimental.categories.Category;
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.internal.FileUtil;
-import org.apache.geode.internal.logging.LoggingPerformanceTestCase;
-import org.apache.geode.internal.util.IOUtils;
-import org.apache.geode.test.junit.categories.PerformanceTest;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.URL;
@Category(PerformanceTest.class)
@Ignore("Tests have no assertions")
@@ -100,7 +98,8 @@ public class LogWriterLoggerPerformanceTest extends LoggingPerformanceTestCase {
this.logFile = new File(this.configDirectory, DistributionConfig.GEMFIRE_PREFIX + "log");
final String logFilePath = IOUtils.tryGetCanonicalPathElseGetAbsolutePath(logFile);
- final String logFileName = FileUtil.stripOffExtension(logFilePath);
+ final String logFileName =
+ logFilePath.substring(0, logFilePath.lastIndexOf(File.separatorChar));
setPropertySubstitutionValues(logFileName, DEFAULT_LOG_FILE_SIZE_LIMIT,
DEFAULT_LOG_FILE_COUNT_LIMIT);
http://git-wip-us.apache.org/repos/asf/geode/blob/29246ab7/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
index d98c5d2..a9bcab1 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/net/SSLSocketIntegrationTest.java
@@ -14,13 +14,31 @@
*/
package org.apache.geode.internal.net;
-import static org.awaitility.Awaitility.*;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.internal.security.SecurableCommunicationChannel.*;
-import static org.assertj.core.api.Assertions.*;
-
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_CIPHERS;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_ENABLED;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_PROTOCOLS;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_REQUIRE_AUTHENTICATION;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.internal.security.SecurableCommunicationChannel.CLUSTER;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.awaitility.Awaitility.await;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.DistributionConfigImpl;
+import org.apache.geode.internal.security.SecurableCommunicationChannel;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
import org.awaitility.Awaitility;
-import com.sun.tools.hat.internal.model.StackTrace;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.ErrorCollector;
+import org.junit.rules.TemporaryFolder;
+import org.junit.rules.TestName;
import java.io.File;
import java.io.IOException;
@@ -37,23 +55,6 @@ import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import org.apache.geode.internal.security.SecurableCommunicationChannel;
-import org.apache.geode.test.junit.categories.MembershipTest;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.ErrorCollector;
-import org.junit.rules.TemporaryFolder;
-import org.junit.rules.TestName;
-
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.distributed.internal.DistributionConfigImpl;
-import org.apache.geode.internal.FileUtil;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-
/**
* Integration tests for SocketCreatorFactory with SSL.
* <p>
@@ -226,7 +227,7 @@ public class SSLSocketIntegrationTest {
assertThat(resource).isNotNull();
File file = this.temporaryFolder.newFile(name.replaceFirst(".*/", ""));
- FileUtil.copy(resource, file);
+ FileUtils.copyFile(new File(resource.getFile()), file);
return file;
}