Browse Source

Using Runnable instead of Consumer for InMemoryWritableFile's reference to InMemoryFile's delete function [ci skip]

Sebastian Stenzel 9 years ago
parent
commit
ed0540e78f

+ 2 - 1
main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryFile.java

@@ -97,7 +97,8 @@ class InMemoryFile extends InMemoryNode implements File {
 		this.content = content;
 	}
 
-	private void delete(Void param) {
+	@Override
+	public void delete() {
 		content = ByteBuffer.allocate(INITIAL_SIZE);
 		content.flip();
 		final InMemoryFolder parent = parent().get();

+ 4 - 5
main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryWritableFile.java

@@ -24,14 +24,13 @@ public class InMemoryWritableFile implements WritableFile {
 	private final Consumer<Instant> creationTimeSetter;
 	private final Supplier<ByteBuffer> contentGetter;
 	private final Consumer<ByteBuffer> contentSetter;
-	private final Consumer<Void> deleter;
+	private final Runnable deleter;
 	private final WriteLock writeLock;
 
 	private boolean open = true;
 	private volatile int position = 0;
 
-	public InMemoryWritableFile(Consumer<Instant> lastModifiedSetter, Consumer<Instant> creationTimeSetter, Supplier<ByteBuffer> contentGetter, Consumer<ByteBuffer> contentSetter, Consumer<Void> deleter,
-			WriteLock writeLock) {
+	public InMemoryWritableFile(Consumer<Instant> lastModifiedSetter, Consumer<Instant> creationTimeSetter, Supplier<ByteBuffer> contentGetter, Consumer<ByteBuffer> contentSetter, Runnable deleter, WriteLock writeLock) {
 		this.lastModifiedSetter = lastModifiedSetter;
 		this.contentGetter = contentGetter;
 		this.contentSetter = contentSetter;
@@ -52,7 +51,7 @@ public class InMemoryWritableFile implements WritableFile {
 			destination.contentSetter.accept(this.contentGetter.get());
 			destination.contentGetter.get().rewind();
 		}
-		deleter.accept(null);
+		deleter.run();
 	}
 
 	@Override
@@ -62,7 +61,7 @@ public class InMemoryWritableFile implements WritableFile {
 
 	@Override
 	public void delete() throws UncheckedIOException {
-		deleter.accept(null);
+		deleter.run();
 		open = false;
 	}