diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/FileStore.java b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/FileStore.java
index 598824bfb88daf3eb9297a8a29abc8a8bfdf5913..b6f92ee31e79ae9988c2844287a1ffa5cb606c6e 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/FileStore.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/intf/FileStore.java
@@ -28,7 +28,6 @@ import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.exceptions.Status;
import ch.systemsx.cisd.common.highwatermark.FileWithHighwaterMark;
import ch.systemsx.cisd.common.highwatermark.HighwaterMarkSelfTestable;
-import ch.systemsx.cisd.common.logging.ISimpleLogger;
import ch.systemsx.cisd.common.utilities.StoreItem;
import ch.systemsx.cisd.datamover.filesystem.remote.RemotePathMover;
@@ -205,67 +204,6 @@ public abstract class FileStore implements IFileStore
return builder.toHashCode();
}
- // -------------------
-
- /**
- * Checks whether this store is a directory and is fully accessible to the program.
- *
- * @param timeOutMillis The time (in milli-seconds) to wait for the target to become available
- * if it is not initially.
- * @return <code>null</code> if the <var>directory</var> is fully accessible and an error
- * message describing the problem with the <var>directory</var> otherwise.
- */
- public abstract String tryCheckDirectoryFullyAccessible(final long timeOutMillis);
-
- public abstract boolean exists(StoreItem item);
-
- /**
- * Returns the last time when there was a write access to <var>item</var>.
- *
- * @param item The {@link StoreItem} to check.
- * @param stopWhenFindYounger If > 0, the recursive search for younger file will be stopped
- * when a file or directory is found that is younger than the time specified in this
- * parameter. Supposed to be used when one does not care about the absolutely
- * youngest entry, but only, if there are entries that are "young enough".
- * @return The time (in milliseconds since the start of the epoch) when <var>resource</var> was
- * last changed.
- */
- public abstract long lastChanged(StoreItem item, long stopWhenFindYounger);
-
- /**
- * Returns the last time when there was a write access to <var>item</var>.
- *
- * @param item The {@link StoreItem} to check.
- * @param stopWhenFindYoungerRelative If > 0, the recursive search for younger file will be
- * stopped when a file or directory is found that is younger than
- * <code>System.currentTimeMillis() - stopWhenYoungerRelative</code>.
- * @return The time (in milliseconds since the start of the epoch) when <var>resource</var> was
- * last changed.
- */
- public abstract long lastChangedRelative(StoreItem item, long stopWhenFindYoungerRelative);
-
- /**
- * List files in the scanned store. Sort in order of "oldest first".
- */
- public abstract StoreItem[] tryListSortByLastModified(ISimpleLogger loggerOrNull);
-
- public abstract Status delete(StoreItem item);
-
- /**
- * @param destinationDirectory The directory to use as a destination in the copy operation. It
- * must be readable and writable. Copier will override the destination item if it
- * already exists.
- */
- public abstract IStoreCopier getCopier(FileStore destinationDirectory);
-
- // returned description should give the user the idea about file location. You should not use
- // the result for
- // something else than printing it for user. It should not be especially assumed that the result
- // is the path
- // which could be used in java.io.File constructor.
- public abstract String getLocationDescription(StoreItem item);
-
- public abstract IExtendedFileStore tryAsExtended();
//
// Helper classes
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreLocal.java b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreLocal.java
index caf40cf1f8861a24c615529f05e2e4870949ace0..cbfd8d55ebca2005a1d63610d1e6e1cfc7065c69 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreLocal.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreLocal.java
@@ -68,25 +68,21 @@ public class FileStoreLocal extends ExtendedFileStore
// ExtendedFileStore
//
- @Override
public final Status delete(final StoreItem item)
{
return remover.remove(getChildFile(item));
}
- @Override
public final boolean exists(final StoreItem item)
{
return getChildFile(item).exists();
}
- @Override
public final long lastChanged(final StoreItem item, final long stopWhenFindYounger)
{
return FileUtilities.lastChanged(getChildFile(item), true, stopWhenFindYounger);
}
- @Override
public final long lastChangedRelative(final StoreItem item,
final long stopWhenFindYoungerRelative)
{
@@ -94,7 +90,6 @@ public class FileStoreLocal extends ExtendedFileStore
stopWhenFindYoungerRelative);
}
- @Override
public final String tryCheckDirectoryFullyAccessible(final long timeOutMillis)
{
final boolean available = FileUtilities.isAvailable(getPath(), timeOutMillis);
@@ -107,7 +102,6 @@ public class FileStoreLocal extends ExtendedFileStore
return FileUtilities.checkDirectoryFullyAccessible(getPath(), getDescription());
}
- @Override
public final IStoreCopier getCopier(final FileStore destinationDirectory)
{
boolean requiresDeletion = false;
@@ -123,7 +117,6 @@ public class FileStoreLocal extends ExtendedFileStore
}
}
- @Override
public final IExtendedFileStore tryAsExtended()
{
return this;
@@ -158,13 +151,11 @@ public class FileStoreLocal extends ExtendedFileStore
return "[local fs]" + pathStr;
}
- @Override
public final String getLocationDescription(final StoreItem item)
{
return getChildFile(item).getPath();
}
- @Override
public final StoreItem[] tryListSortByLastModified(final ISimpleLogger loggerOrNull)
{
final File[] files = FileUtilities.tryListFiles(getPath(), loggerOrNull);
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreRemote.java b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreRemote.java
index 1f68aa430c5bdb1258e828ef32eb85329b16a782..019cf289268ccc891b51957ed62fa12c688018d8 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreRemote.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreRemote.java
@@ -73,45 +73,38 @@ public class FileStoreRemote extends FileStore
// FileStore
//
- @Override
public final IExtendedFileStore tryAsExtended()
{
return null;
}
- @Override
public final Status delete(final StoreItem item)
{
throw new NotImplementedException();
}
- @Override
public final boolean exists(final StoreItem item)
{
return factory.getCopier(false).existsRemotely(getPath(), tryGetHost());
}
- @Override
public final IStoreCopier getCopier(final FileStore destinationDirectory)
{
final boolean requiresDeletion = false;
return constructStoreCopier(destinationDirectory, requiresDeletion);
}
- @Override
public final long lastChanged(final StoreItem item, final long stopWhenFindYounger)
{
throw new NotImplementedException();
}
- @Override
public final long lastChangedRelative(final StoreItem item,
final long stopWhenFindYoungerRelative)
{
throw new NotImplementedException();
}
- @Override
public final String tryCheckDirectoryFullyAccessible(final long timeOutMillis)
{
throw new NotImplementedException();
@@ -124,13 +117,11 @@ public class FileStoreRemote extends FileStore
return "[remote fs]" + tryGetHost() + ":" + pathStr;
}
- @Override
public final String getLocationDescription(final StoreItem item)
{
return tryGetHost() + ":" + getChildFile(item).getPath();
}
- @Override
public final StoreItem[] tryListSortByLastModified(final ISimpleLogger loggerOrNull)
{
throw new NotImplementedException();
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreRemoteMounted.java b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreRemoteMounted.java
index bf2c386212947167af9fbc09ef9acfe722e3d9bf..6fd2afd575a8fa7d4b130c7c555e5ac2d0dde337 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreRemoteMounted.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/filesystem/store/FileStoreRemoteMounted.java
@@ -51,13 +51,11 @@ public final class FileStoreRemoteMounted extends FileStore
// FileStore
//
- @Override
public final IExtendedFileStore tryAsExtended()
{
return null;
}
- @Override
public final IStoreCopier getCopier(final FileStore destinationDirectory)
{
final boolean requiresDeletion = false;
@@ -71,44 +69,37 @@ public final class FileStoreRemoteMounted extends FileStore
return "[mounted remote fs]" + pathStr;
}
- @Override
public final String getLocationDescription(final StoreItem item)
{
return localImpl.getLocationDescription(item);
}
- @Override
public final Status delete(final StoreItem item)
{
return localImpl.delete(item);
}
- @Override
public final boolean exists(final StoreItem item)
{
return localImpl.exists(item);
}
- @Override
public final long lastChanged(final StoreItem item, final long stopWhenFindYounger)
{
return localImpl.lastChanged(item, stopWhenFindYounger);
}
- @Override
public final long lastChangedRelative(final StoreItem item,
final long stopWhenFindYoungerRelative)
{
return localImpl.lastChangedRelative(item, stopWhenFindYoungerRelative);
}
- @Override
public final String tryCheckDirectoryFullyAccessible(final long timeOutMillis)
{
return localImpl.tryCheckDirectoryFullyAccessible(timeOutMillis);
}
- @Override
public final StoreItem[] tryListSortByLastModified(final ISimpleLogger loggerOrNull)
{
return localImpl.tryListSortByLastModified(loggerOrNull);
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 b55759fb4ecb5b623493ac83faa2f0b7ea0b00c3..23afc6d3e3c4f908e5be3e7041035a3dd6936a3d 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
@@ -176,55 +176,46 @@ public class CopyActivityMonitorTest
new FileStoreLocal(fileWithHighwaterMark, "input-test", factory);
return new FileStore(fileWithHighwaterMark, null, false, "input-test", factory)
{
- @Override
public Status delete(StoreItem item)
{
return localImpl.delete(item);
}
- @Override
public boolean exists(StoreItem item)
{
return localImpl.exists(item);
}
- @Override
public long lastChanged(StoreItem item, long stopWhenFindYounger)
{
throw new UnsupportedOperationException("lastChanged");
}
- @Override
public long lastChangedRelative(StoreItem item, long stopWhenFindYoungerRelative)
{
return checker.lastChangedRelative(item, stopWhenFindYoungerRelative);
}
- @Override
public String tryCheckDirectoryFullyAccessible(long timeOutMillis)
{
return localImpl.tryCheckDirectoryFullyAccessible(timeOutMillis);
}
- @Override
public IExtendedFileStore tryAsExtended()
{
return localImpl.tryAsExtended();
}
- @Override
public IStoreCopier getCopier(FileStore destinationDirectory)
{
return localImpl.getCopier(destinationDirectory);
}
- @Override
public String getLocationDescription(StoreItem item)
{
return localImpl.getLocationDescription(item);
}
- @Override
public StoreItem[] tryListSortByLastModified(ISimpleLogger loggerOrNull)
{
return localImpl.tryListSortByLastModified(loggerOrNull);