From 3a48be059305eeaa57948669d28a597b912185da Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Sun, 23 Sep 2007 11:18:02 +0000
Subject: [PATCH] refactor: get rid of static method
FileysOparationsFactory.getReadOperations()
SVN: 1814
---
.../filesystem/FileSysOparationsFactory.java | 45 +++++++++----------
.../remote/CopyActivityMonitorTest.java | 21 ++++++++-
2 files changed, 41 insertions(+), 25 deletions(-)
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/FileSysOparationsFactory.java b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/FileSysOparationsFactory.java
index cfb8656e614..6ee1677ea24 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/FileSysOparationsFactory.java
+++ b/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()
diff --git a/datamover/sourceTest/java/ch/systemsx/cisd/datamover/filesystem/remote/CopyActivityMonitorTest.java b/datamover/sourceTest/java/ch/systemsx/cisd/datamover/filesystem/remote/CopyActivityMonitorTest.java
index c2ec243407e..bf4a1150087 100644
--- a/datamover/sourceTest/java/ch/systemsx/cisd/datamover/filesystem/remote/CopyActivityMonitorTest.java
+++ b/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)
--
GitLab