X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2Fsource%2FFileSource.java;h=01216cd0c910d12416679451e362786903f2d7a9;hb=3a12209e82233cd79677a0d847321f41b41aa9a5;hp=9aff8d401289cb9ed4644c83265b7e626a8acbb2;hpb=cbeadf6d9eea57ab98cacd60e2419dd3c18bef89;p=sonitus.git

diff --git a/src/main/java/net/pterodactylus/sonitus/data/source/FileSource.java b/src/main/java/net/pterodactylus/sonitus/data/source/FileSource.java
index 9aff8d4..01216cd 100644
--- a/src/main/java/net/pterodactylus/sonitus/data/source/FileSource.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/source/FileSource.java
@@ -27,21 +27,22 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import net.pterodactylus.sonitus.data.AbstractControlledComponent;
+import net.pterodactylus.sonitus.data.AbstractFilter;
 import net.pterodactylus.sonitus.data.Controller;
+import net.pterodactylus.sonitus.data.DataPacket;
+import net.pterodactylus.sonitus.data.Filter;
 import net.pterodactylus.sonitus.data.Metadata;
-import net.pterodactylus.sonitus.data.Source;
 import net.pterodactylus.sonitus.io.IdentifyingInputStream;
 
 import com.google.common.base.Optional;
 
 /**
- * A {@link net.pterodactylus.sonitus.data.Source} that is read from the local
- * file system.
+ * A {@link Filter} that reads a file from the local file system and does not
+ * expect any input.
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class FileSource extends AbstractControlledComponent implements Source {
+public class FileSource extends AbstractFilter {
 
 	/** The path of the file. */
 	private final String path;
@@ -73,7 +74,7 @@ public class FileSource extends AbstractControlledComponent implements Source {
 	}
 
 	//
-	// CONTROLLED METHODS
+	// FILTER METHODS
 	//
 
 	@Override
@@ -81,18 +82,14 @@ public class FileSource extends AbstractControlledComponent implements Source {
 		return Collections.emptyList();
 	}
 
-	//
-	// SOURCE METHODS
-	//
-
 	@Override
-	public byte[] get(int bufferSize) throws IOException {
+	public DataPacket get(int bufferSize) throws IOException {
 		byte[] buffer = new byte[bufferSize];
 		int read = fileInputStream.read(buffer);
 		if (read == -1) {
 			throw new EOFException();
 		}
-		return Arrays.copyOf(buffer, read);
+		return new DataPacket(metadata(), Arrays.copyOf(buffer, read));
 	}
 
 	//