This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
The following commit(s) were added to refs/heads/master by this push: new 001a273 Use the scale in the var name. 001a273 is described below commit 001a2739af03119a805f8cb94699e402ac542f1c Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Tue Feb 2 17:57:54 2021 -0500 Use the scale in the var name. --- .../commons/vfs2/provider/ram/RamFileData.java | 8 ++++---- .../commons/vfs2/filter/AgeFileFilterTest.java | 22 +++++++++++----------- .../vfs2/impl/test/DefaultFileMonitorTest.java | 6 +++--- .../commons/vfs2/perf/FileNamePerformance.java | 18 +++++++++--------- .../commons/vfs2/test/LastModifiedTests.java | 12 ++++++------ 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileData.java b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileData.java index 0aa8b2b..b68a343 100644 --- a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileData.java +++ b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ram/RamFileData.java @@ -55,7 +55,7 @@ class RamFileData implements Serializable { /** * Last modified time */ - private long lastModified; + private long lastModifiedMillis; /** * Children @@ -95,14 +95,14 @@ class RamFileData implements Serializable { * @return Returns the lastModified. */ long getLastModified() { - return lastModified; + return lastModifiedMillis; } /** * @param lastModified The lastModified to set. */ void setLastModified(final long lastModified) { - this.lastModified = lastModified; + this.lastModifiedMillis = lastModified; } /** @@ -130,7 +130,7 @@ class RamFileData implements Serializable { } void updateLastModified() { - this.lastModified = System.currentTimeMillis(); + this.lastModifiedMillis = System.currentTimeMillis(); } /** diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AgeFileFilterTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AgeFileFilterTest.java index 99c9ec7..ecb396c 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AgeFileFilterTest.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/filter/AgeFileFilterTest.java @@ -38,11 +38,11 @@ public class AgeFileFilterTest extends BaseFilterTest { private static final long DAY_MILLIS = 24 * 60 * 60 * 1000; - private static final long NOW = System.currentTimeMillis(); + private static final long NOW_MILLIS = System.currentTimeMillis(); - private static final long TWO_DAYS_AGO = NOW - (2 * DAY_MILLIS); + private static final long TWO_DAYS_AGO_MILLIS = NOW_MILLIS - (2 * DAY_MILLIS); - private static final long TWO_DAYS_LATER = NOW + (2 * DAY_MILLIS); + private static final long TWO_DAYS_LATER_MILLIS = NOW_MILLIS + (2 * DAY_MILLIS); private static File testDir; @@ -69,19 +69,19 @@ public class AgeFileFilterTest extends BaseFilterTest { // Set the file's time stamp two days back oldFile = new File(testDir, "old.txt"); FileUtils.touch(oldFile); - oldFile.setLastModified(TWO_DAYS_AGO); + oldFile.setLastModified(TWO_DAYS_AGO_MILLIS); oldFileInfo = createFileSelectInfo(oldFile); // Reference file currentFile = new File(testDir, "current.txt"); FileUtils.touch(currentFile); - currentFile.setLastModified(NOW); + currentFile.setLastModified(NOW_MILLIS); currentFileInfo = createFileSelectInfo(currentFile); // Set the file's time stamp two days into the future newFile = new File(testDir, "new.txt"); FileUtils.touch(newFile); - newFile.setLastModified(TWO_DAYS_LATER); + newFile.setLastModified(TWO_DAYS_LATER_MILLIS); newFileInfo = createFileSelectInfo(newFile); // Zip the test directory @@ -167,7 +167,7 @@ public class AgeFileFilterTest extends BaseFilterTest { @Test public void testAgeFileFilterLong() throws FileSystemException { - final AgeFileFilter testee = new AgeFileFilter(NOW); + final AgeFileFilter testee = new AgeFileFilter(NOW_MILLIS); Assert.assertTrue(testee.accept(oldFileInfo)); Assert.assertTrue(testee.accept(currentFileInfo)); Assert.assertFalse(testee.accept(newFileInfo)); @@ -179,12 +179,12 @@ public class AgeFileFilterTest extends BaseFilterTest { AgeFileFilter testee; - testee = new AgeFileFilter(NOW, true); + testee = new AgeFileFilter(NOW_MILLIS, true); Assert.assertTrue(testee.accept(oldFileInfo)); Assert.assertTrue(testee.accept(currentFileInfo)); Assert.assertFalse(testee.accept(newFileInfo)); - testee = new AgeFileFilter(NOW, false); + testee = new AgeFileFilter(NOW_MILLIS, false); Assert.assertFalse(testee.accept(oldFileInfo)); Assert.assertFalse(testee.accept(currentFileInfo)); Assert.assertTrue(testee.accept(newFileInfo)); @@ -192,11 +192,11 @@ public class AgeFileFilterTest extends BaseFilterTest { // Same test with ZIP file FileObject[] files; - files = zipFileObj.findFiles(new FileFilterSelector(new AgeFileFilter(NOW, true))); + files = zipFileObj.findFiles(new FileFilterSelector(new AgeFileFilter(NOW_MILLIS, true))); assertContains(files, oldFile.getName(), currentFile.getName()); Assert.assertEquals(2, files.length); - files = zipFileObj.findFiles(new FileFilterSelector(new AgeFileFilter(NOW, false))); + files = zipFileObj.findFiles(new FileFilterSelector(new AgeFileFilter(NOW_MILLIS, false))); assertContains(files, newFile.getName()); Assert.assertEquals(1, files.length); diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileMonitorTest.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileMonitorTest.java index ae900c3..f5dc453 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileMonitorTest.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/impl/test/DefaultFileMonitorTest.java @@ -129,9 +129,9 @@ public class DefaultFileMonitorTest { // Need a long delay to insure the new timestamp doesn't truncate to be the same as // the current timestammp. Java only guarantees the timestamp will be to 1 second. Thread.sleep(DELAY_MILLIS * 10); - final long value = System.currentTimeMillis(); - final boolean rc = testFile.setLastModified(value); - assertTrue("setLastModified succeeded", rc); + final long valueMillis = System.currentTimeMillis(); + final boolean rcMillis = testFile.setLastModified(valueMillis); + assertTrue("setLastModified succeeded", rcMillis); Thread.sleep(DELAY_MILLIS * 5); assertTrue("No event occurred", changeStatus != null); assertEquals("Incorrect event", Status.CHANGED, changeStatus); diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/perf/FileNamePerformance.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/perf/FileNamePerformance.java index 6c7be04..2960975 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/perf/FileNamePerformance.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/perf/FileNamePerformance.java @@ -45,14 +45,14 @@ public class FileNamePerformance { "smb://HOME\\vfsusr:vfs%2f%25\\te:st@10.0.1.54/vfsusr/many/path/elements/with%25esc/any%25where/to/file.txt"); } - final long start = System.currentTimeMillis(); + final long startMillis = System.currentTimeMillis(); for (int i = 0; i < NUOF_RESOLVES; i++) { mgr.resolveFile( "smb://HOME\\vfsusr:vfs%2f%25\\te:st@10.0.1.54/vfsusr/many/path/elements/with%25esc/any%25where/to/file.txt"); } - final long end = System.currentTimeMillis(); + final long endMillis = System.currentTimeMillis(); - System.err.println("time to resolve " + NUOF_RESOLVES + " files: " + (end - start) + "ms"); + System.err.println("time to resolve " + NUOF_RESOLVES + " files: " + (endMillis - startMillis) + " milliseconds"); } private static void testChildren(final FileObject root) throws FileSystemException { @@ -61,13 +61,13 @@ public class FileNamePerformance { root.resolveFile("/many/path/elements/with%25esc/any%25where/to/file.txt"); } - final long start = System.currentTimeMillis(); + final long startMillis = System.currentTimeMillis(); for (int i = 0; i < NUOF_RESOLVES; i++) { root.resolveFile("/many/path/elements/with%25esc/any%25where/to/file.txt"); } - final long end = System.currentTimeMillis(); + final long endMillis = System.currentTimeMillis(); - System.err.println("time to resolve " + NUOF_RESOLVES + " children: " + (end - start) + "ms"); + System.err.println("time to resolve " + NUOF_RESOLVES + " children: " + (endMillis - startMillis) + " milliseconds"); } private static void testNames(final FileSystemManager mgr, final FileName rootName) throws FileSystemException { @@ -76,12 +76,12 @@ public class FileNamePerformance { mgr.resolveName(rootName, "/many/path/elements/with%25esc/any%25where/to/file.txt"); } - final long start = System.currentTimeMillis(); + final long startMillis = System.currentTimeMillis(); for (int i = 0; i < NUOF_RESOLVES; i++) { mgr.resolveName(rootName, "/many/path/elements/with%25esc/any%25where/to/file.txt"); } - final long end = System.currentTimeMillis(); + final long endMillis = System.currentTimeMillis(); - System.err.println("time to resolve " + NUOF_RESOLVES + " names: " + (end - start) + "ms"); + System.err.println("time to resolve " + NUOF_RESOLVES + " names: " + (endMillis - startMillis) + " milliseconds"); } } diff --git a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/LastModifiedTests.java b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/LastModifiedTests.java index 3e684df..b096301 100644 --- a/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/LastModifiedTests.java +++ b/commons-vfs2/src/test/java/org/apache/commons/vfs2/test/LastModifiedTests.java @@ -95,16 +95,16 @@ public class LastModifiedTests extends AbstractProviderTestCase { */ @Test public void testSetLastModifiedFolder() throws FileSystemException { - final long yesterday = System.currentTimeMillis() - 24 * 60 * 60 * 1000; + final long yesterdayMillis = System.currentTimeMillis() - 24 * 60 * 60 * 1000; if (getReadFolder().getFileSystem().hasCapability(Capability.SET_LAST_MODIFIED_FOLDER)) { // Try a folder final FileObject folder = getReadFolder().resolveFile("dir1"); - folder.getContent().setLastModifiedTime(yesterday); + folder.getContent().setLastModifiedTime(yesterdayMillis); final long lastModTimeAccuracy = (long) folder.getFileSystem().getLastModTimeAccuracy(); // folder.refresh(); TODO: does not work with SSH VFS-563 final long lastModifiedTime = folder.getContent().getLastModifiedTime(); - assertDelta("set/getLastModified on Folder", yesterday, lastModifiedTime, lastModTimeAccuracy); + assertDelta("set/getLastModified on Folder", yesterdayMillis, lastModifiedTime, lastModTimeAccuracy); } } @@ -115,16 +115,16 @@ public class LastModifiedTests extends AbstractProviderTestCase { */ @Test public void testSetLastModifiedFile() throws FileSystemException { - final long yesterday = System.currentTimeMillis() - 24 * 60 * 60 * 1000; + final long yesterdayMillis = System.currentTimeMillis() - 24 * 60 * 60 * 1000; if (getReadFolder().getFileSystem().hasCapability(Capability.SET_LAST_MODIFIED_FILE)) { // Try a file final FileObject file = getReadFolder().resolveFile("file1.txt"); - file.getContent().setLastModifiedTime(yesterday); + file.getContent().setLastModifiedTime(yesterdayMillis); final long lastModTimeAccuracy = (long) file.getFileSystem().getLastModTimeAccuracy(); // folder.refresh(); TODO: does not work with SSH VFS-563 final long lastModifiedTime = file.getContent().getLastModifiedTime(); - assertDelta("set/getLastModified on File", yesterday, lastModifiedTime, lastModTimeAccuracy); + assertDelta("set/getLastModified on File", yesterdayMillis, lastModifiedTime, lastModTimeAccuracy); } } }