Renamed serial component to data, moved consumers to briar-core.

briar-api/src/org/briarproject/api/data/Consumer.java

@@ -1,4 +1,4 @@
-package org.briarproject.api.serial;
+package org.briarproject.api.data;
 
 import java.io.IOException;
 

briar-api/src/org/briarproject/api/data/DataConstants.java

@@ -1,8 +1,8 @@
-package org.briarproject.api.serial;
+package org.briarproject.api.data;
 
 import org.briarproject.api.UniqueId;
 
-public interface SerialConstants {
+public interface DataConstants {
 
 	int LIST_START_LENGTH = 1;
 

briar-api/src/org/briarproject/api/data/ObjectReader.java

@@ -1,4 +1,4 @@
-package org.briarproject.api.serial;
+package org.briarproject.api.data;
 
 import java.io.IOException;
 

briar-api/src/org/briarproject/api/data/Reader.java

@@ -1,4 +1,4 @@
-package org.briarproject.api.serial;
+package org.briarproject.api.data;
 
 import java.io.IOException;
 

briar-api/src/org/briarproject/api/data/ReaderFactory.java

@@ -1,4 +1,4 @@
-package org.briarproject.api.serial;
+package org.briarproject.api.data;
 
 import java.io.InputStream;
 

briar-api/src/org/briarproject/api/data/Writer.java

@@ -1,4 +1,4 @@
-package org.briarproject.api.serial;
+package org.briarproject.api.data;
 
 import java.io.IOException;
 import java.util.Collection;

briar-api/src/org/briarproject/api/data/WriterFactory.java

@@ -1,4 +1,4 @@
-package org.briarproject.api.serial;
+package org.briarproject.api.data;
 
 import java.io.OutputStream;
 

briar-api/src/org/briarproject/api/serial/CopyingConsumer.java

@@ -1,22 +0,0 @@
-package org.briarproject.api.serial;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-/** A consumer that makes a copy of the bytes consumed. */
-public class CopyingConsumer implements Consumer {
-
-	private final ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-	public byte[] getCopy() {
-		return out.toByteArray();
-	}
-
-	public void write(byte b) throws IOException {
-		out.write(b);
-	}
-
-	public void write(byte[] b, int off, int len) throws IOException {
-		out.write(b, off, len);
-	}
-}

briar-api/src/org/briarproject/api/serial/CountingConsumer.java

@@ -1,33 +0,0 @@
-package org.briarproject.api.serial;
-
-import java.io.IOException;
-
-import org.briarproject.api.FormatException;
-
-/**
- * A consumer that counts the number of bytes consumed and throws a
- * FormatException if the count exceeds a given limit.
- */
-public class CountingConsumer implements Consumer {
-
-	private final long limit;
-	private long count = 0;
-
-	public CountingConsumer(long limit) {
-		this.limit = limit;
-	}
-
-	public long getCount() {
-		return count;
-	}
-
-	public void write(byte b) throws IOException {
-		count++;
-		if(count > limit) throw new FormatException();
-	}
-
-	public void write(byte[] b, int off, int len) throws IOException {
-		count += len;
-		if(count > limit) throw new FormatException();
-	}
-}

briar-api/src/org/briarproject/api/serial/DigestingConsumer.java

@@ -1,21 +0,0 @@
-package org.briarproject.api.serial;
-
-import org.briarproject.api.crypto.MessageDigest;
-
-/** A consumer that passes its input through a message digest. */
-public class DigestingConsumer implements Consumer {
-
-	private final MessageDigest messageDigest;
-
-	public DigestingConsumer(MessageDigest messageDigest) {
-		this.messageDigest = messageDigest;
-	}
-
-	public void write(byte b) {
-		messageDigest.update(b);
-	}
-
-	public void write(byte[] b, int off, int len) {
-		messageDigest.update(b, off, len);
-	}
-}

briar-api/src/org/briarproject/api/serial/SigningConsumer.java

@@ -1,21 +0,0 @@
-package org.briarproject.api.serial;
-
-import org.briarproject.api.crypto.Signature;
-
-/** A consumer that passes its input through a signature. */
-public class SigningConsumer implements Consumer {
-
-	private final Signature signature;
-
-	public SigningConsumer(Signature signature) {
-		this.signature = signature;
-	}
-
-	public void write(byte b) {
-		signature.update(b);
-	}
-
-	public void write(byte[] b, int off, int len) {
-		signature.update(b, off, len);
-	}
-}