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-io.git
The following commit(s) were added to refs/heads/master by this push:
new e25c9e9 - Use final. - Simpler boolean tests. - Fix test.
e25c9e9 is described below
commit e25c9e9df09db6bd802c4f3a1d4a7e663a6a58c2
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Sat May 22 09:08:00 2021 -0400
- Use final.
- Simpler boolean tests.
- Fix test.
---
src/main/java/org/apache/commons/io/FileCleaningTracker.java | 2 +-
src/main/java/org/apache/commons/io/FileDeleteStrategy.java | 4 ++--
.../org/apache/commons/io/monitor/FileAlterationMonitor.java | 2 +-
.../org/apache/commons/io/output/FileWriterWithEncoding.java | 2 +-
.../java/org/apache/commons/io/output/LockableFileWriter.java | 2 +-
.../commons/io/monitor/FileAlterationMonitorTestCase.java | 11 ++++++-----
6 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/FileCleaningTracker.java
b/src/main/java/org/apache/commons/io/FileCleaningTracker.java
index 623b387..af76c90 100644
--- a/src/main/java/org/apache/commons/io/FileCleaningTracker.java
+++ b/src/main/java/org/apache/commons/io/FileCleaningTracker.java
@@ -215,7 +215,7 @@ public class FileCleaningTracker {
@Override
public void run() {
// thread exits when exitWhenFinished is true and there are no
more tracked objects
- while (exitWhenFinished == false || !trackers.isEmpty()) {
+ while (!exitWhenFinished || !trackers.isEmpty()) {
try {
// Wait for a tracker to remove.
final Tracker tracker = (Tracker) q.remove(); // cannot
return null
diff --git a/src/main/java/org/apache/commons/io/FileDeleteStrategy.java
b/src/main/java/org/apache/commons/io/FileDeleteStrategy.java
index 1817066..7a07278 100644
--- a/src/main/java/org/apache/commons/io/FileDeleteStrategy.java
+++ b/src/main/java/org/apache/commons/io/FileDeleteStrategy.java
@@ -98,7 +98,7 @@ public class FileDeleteStrategy {
* @throws IOException if an error occurs during file deletion
*/
public void delete(final File fileToDelete) throws IOException {
- if (fileToDelete.exists() && doDelete(fileToDelete) == false) {
+ if (fileToDelete.exists() && !doDelete(fileToDelete)) {
throw new IOException("Deletion failed: " + fileToDelete);
}
}
@@ -115,7 +115,7 @@ public class FileDeleteStrategy {
* @return true if the file was deleted, or there was no such file
*/
public boolean deleteQuietly(final File fileToDelete) {
- if (fileToDelete == null || fileToDelete.exists() == false) {
+ if (fileToDelete == null || !fileToDelete.exists()) {
return true;
}
try {
diff --git
a/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java
b/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java
index 8da0f63..9e129b8 100644
--- a/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java
+++ b/src/main/java/org/apache/commons/io/monitor/FileAlterationMonitor.java
@@ -183,7 +183,7 @@ public final class FileAlterationMonitor implements
Runnable {
* @since 2.1
*/
public synchronized void stop(final long stopInterval) throws Exception {
- if (running == false) {
+ if (!running) {
throw new IllegalStateException("Monitor is not running");
}
running = false;
diff --git
a/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java
b/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java
index 80bbc2b..7b3df9b 100644
--- a/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java
+++ b/src/main/java/org/apache/commons/io/output/FileWriterWithEncoding.java
@@ -241,7 +241,7 @@ public class FileWriterWithEncoding extends Writer {
} catch (final IOException e) {
ex.addSuppressed(e);
}
- if (fileExistedAlready == false) {
+ if (!fileExistedAlready) {
FileUtils.deleteQuietly(file);
}
throw ex;
diff --git a/src/main/java/org/apache/commons/io/output/LockableFileWriter.java
b/src/main/java/org/apache/commons/io/output/LockableFileWriter.java
index 252e970..418424d 100644
--- a/src/main/java/org/apache/commons/io/output/LockableFileWriter.java
+++ b/src/main/java/org/apache/commons/io/output/LockableFileWriter.java
@@ -270,7 +270,7 @@ public class LockableFileWriter extends Writer {
} catch (final IOException | RuntimeException ex) {
FileUtils.deleteQuietly(lockFile);
- if (fileExistedAlready == false) {
+ if (!fileExistedAlready) {
FileUtils.deleteQuietly(file);
}
throw ex;
diff --git
a/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
b/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
index 6f1e4a3..686f5a4 100644
---
a/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
+++
b/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java
@@ -56,23 +56,24 @@ public class FileAlterationMonitorTestCase extends
AbstractMonitorTestCase {
@Test
public void testCollectionConstructorShouldDoNothingWithNullCollection() {
- Collection<FileAlterationObserver> observers = null;
+ final Collection<FileAlterationObserver> observers = null;
final FileAlterationMonitor monitor = new FileAlterationMonitor(0,
observers);
assertFalse(monitor.getObservers().iterator().hasNext());
}
@Test
public void testCollectionConstructorShouldDoNothingWithNullObservers() {
- Collection<FileAlterationObserver> observers = new ArrayList<>(5);
+ final Collection<FileAlterationObserver> observers = new
ArrayList<>(5);
final FileAlterationMonitor monitor = new FileAlterationMonitor(0,
observers);
assertFalse(monitor.getObservers().iterator().hasNext());
}
@Test
public void testCollectionConstructor() {
- Collection<FileAlterationObserver> observers = Arrays.asList(new
FileAlterationObserver("foo"));
- FileAlterationMonitor monitor = new FileAlterationMonitor(0,
observers);
- Iterator<FileAlterationObserver> iterator =
monitor.getObservers().iterator();
+ observer = new FileAlterationObserver("foo");
+ final Collection<FileAlterationObserver> observers =
Arrays.asList(observer);
+ final FileAlterationMonitor monitor = new FileAlterationMonitor(0,
observers);
+ final Iterator<FileAlterationObserver> iterator =
monitor.getObservers().iterator();
assertEquals(observer, iterator.next());
}
