From 22a8ad18cbc9b979e11fe71c4d2c173a3194c227 Mon Sep 17 00:00:00 2001
From: Iwein Fuld <iwein@fuld.net>
Date: Wed, 30 Dec 2009 22:23:33 +0000
Subject: [PATCH] INT-821: renamed filter based on INT-CR-7 review

---
 .../file/config/FileReadingMessageSourceFactoryBean.java    | 6 +++---
 .../{BaseLockingFilter.java => AbstractLockingFilter.java}  | 2 +-
 .../integration/file/locking/NioFileLocker.java             | 2 +-
 .../integration/file/locking/FileLockingNamespaceTests.java | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename org.springframework.integration.file/src/main/java/org/springframework/integration/file/locking/{BaseLockingFilter.java => AbstractLockingFilter.java} (91%)

diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileReadingMessageSourceFactoryBean.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileReadingMessageSourceFactoryBean.java
index 6504d3cf63..84addc57b9 100644
--- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileReadingMessageSourceFactoryBean.java
+++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/config/FileReadingMessageSourceFactoryBean.java
@@ -21,7 +21,7 @@ import org.springframework.integration.file.CompositeFileListFilter;
 import org.springframework.integration.file.DirectoryScanner;
 import org.springframework.integration.file.FileListFilter;
 import org.springframework.integration.file.FileReadingMessageSource;
-import org.springframework.integration.file.locking.BaseLockingFilter;
+import org.springframework.integration.file.locking.AbstractLockingFilter;
 
 import java.io.File;
 import java.util.Comparator;
@@ -39,7 +39,7 @@ public class FileReadingMessageSourceFactoryBean implements FactoryBean {
 
     private volatile FileListFilter filter;
 
-    private volatile BaseLockingFilter locker;
+    private volatile AbstractLockingFilter locker;
 
     private volatile Comparator<File> comparator;
 
@@ -75,7 +75,7 @@ public class FileReadingMessageSourceFactoryBean implements FactoryBean {
         this.autoCreateDirectory = autoCreateDirectory;
     }
 
-    public void setLocker(BaseLockingFilter locker) {
+    public void setLocker(AbstractLockingFilter locker) {
         this.locker = locker;
     }
 
diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/locking/BaseLockingFilter.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/locking/AbstractLockingFilter.java
similarity index 91%
rename from org.springframework.integration.file/src/main/java/org/springframework/integration/file/locking/BaseLockingFilter.java
rename to org.springframework.integration.file/src/main/java/org/springframework/integration/file/locking/AbstractLockingFilter.java
index efcb72039f..c6d0632e1d 100644
--- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/locking/BaseLockingFilter.java
+++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/locking/AbstractLockingFilter.java
@@ -28,7 +28,7 @@ import java.io.File;
  * @since 2.0
  *
  */
-public abstract class BaseLockingFilter extends AbstractFileListFilter implements FileLocker {
+public abstract class AbstractLockingFilter extends AbstractFileListFilter implements FileLocker {
 
     protected final boolean accept(File file) {
         return lock(file);
diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/locking/NioFileLocker.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/locking/NioFileLocker.java
index f874578de7..951e4fabcc 100644
--- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/locking/NioFileLocker.java
+++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/locking/NioFileLocker.java
@@ -40,7 +40,7 @@ import java.util.concurrent.ConcurrentMap;
  * @author Mark Fisher
  * @since 2.0
  */
-public class NioFileLocker extends BaseLockingFilter {
+public class NioFileLocker extends AbstractLockingFilter {
 
 	private final ConcurrentMap<File, FileLock> lockCache = new ConcurrentHashMap<File, FileLock>();
 
diff --git a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/locking/FileLockingNamespaceTests.java b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/locking/FileLockingNamespaceTests.java
index 1abbfc6b84..b97c41e6ca 100644
--- a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/locking/FileLockingNamespaceTests.java
+++ b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/locking/FileLockingNamespaceTests.java
@@ -75,7 +75,7 @@ public class FileLockingNamespaceTests {
         assertThat(accessor.getPropertyValue("filter"), is(CompositeFileListFilter.class));
     }
 
-    public static class StubLocker extends BaseLockingFilter {
+    public static class StubLocker extends AbstractLockingFilter {
         public boolean lock(File fileToLock) {
             return true;
         }