refactor: get rid of static method FileysOparationsFactory.getReadOperations()

SVN: 1814

datamover/source/java/ch/systemsx/cisd/datamover/filesystem/FileSysOparationsFactory.java

@@ -54,6 +54,8 @@ public class FileSysOparationsFactory implements IFileSysOperationsFactory
 
     public FileSysOparationsFactory(IFileSysParameters parameters)
     {
+        assert parameters != null;
+        
         this.parameters = parameters;
     }
 
@@ -72,36 +74,31 @@ public class FileSysOparationsFactory implements IFileSysOperationsFactory
             };
     }
 
-    public static IReadPathOperations getReadOperations()
+    public IReadPathOperations getReadAccessor()
     {
         return new IReadPathOperations()
-            {
-
-                public boolean exists(File file)
-                {
-                    return file.exists();
-                }
+        {
 
-                public long lastChanged(File path)
-                {
-                    return FileUtilities.lastChanged(path);
-                }
+            public boolean exists(File file)
+            {
+                return file.exists();
+            }
 
-                public File[] listFiles(File directory, FileFilter filter, ISimpleLogger loggerOrNull)
-                {
-                    return FileUtilities.listFiles(directory, filter, loggerOrNull);
-                }
+            public long lastChanged(File path)
+            {
+                return FileUtilities.lastChanged(path);
+            }
 
-                public File[] listFiles(File directory, ISimpleLogger loggerOrNull)
-                {
-                    return FileUtilities.listFiles(directory, FileUtilities.ACCEPT_ALL_FILTER, loggerOrNull);
-                }
-            };
-    }
+            public File[] listFiles(File directory, FileFilter filter, ISimpleLogger loggerOrNull)
+            {
+                return FileUtilities.listFiles(directory, filter, loggerOrNull);
+            }
 
-    public IReadPathOperations getReadAccessor()
-    {
-        return getReadOperations();
+            public File[] listFiles(File directory, ISimpleLogger loggerOrNull)
+            {
+                return FileUtilities.listFiles(directory, FileUtilities.ACCEPT_ALL_FILTER, loggerOrNull);
+            }
+        };
     }
 
     public IPathImmutableCopier getImmutableCopier()

datamover/sourceTest/java/ch/systemsx/cisd/datamover/filesystem/remote/CopyActivityMonitorTest.java

@@ -34,6 +34,7 @@ import ch.systemsx.cisd.common.utilities.ITerminable;
 import ch.systemsx.cisd.common.utilities.StoringUncaughtExceptionHandler;
 import ch.systemsx.cisd.datamover.filesystem.FileSysOparationsFactory;
 import ch.systemsx.cisd.datamover.filesystem.intf.IReadPathOperations;
+import ch.systemsx.cisd.datamover.intf.IFileSysParameters;
 import ch.systemsx.cisd.datamover.intf.ITimingParameters;
 
 /**
@@ -89,7 +90,25 @@ public class CopyActivityMonitorTest
 
         public ReadOperationsOriginalImpl()
         {
-            this.impl = FileSysOparationsFactory.getReadOperations();
+            final IFileSysParameters dummyFileSysParameters = new IFileSysParameters()
+            {
+                public String getHardLinkExecutable()
+                {
+                    return null;
+                }
+
+                public String getRsyncExecutable()
+                {
+                    return null;
+                }
+
+                public String getSshExecutable()
+                {
+                    return null;
+                }
+                
+            };
+            this.impl = new FileSysOparationsFactory(dummyFileSysParameters).getReadAccessor();
         }
 
         public long lastChanged(File path)