Moved author classes to identity package.

briar-core/src/org/briarproject/identity/AuthorFactoryImpl.java

@@ -0,0 +1,57 @@
+package org.briarproject.identity;
+
+import org.briarproject.api.crypto.CryptoComponent;
+import org.briarproject.api.data.BdfWriter;
+import org.briarproject.api.data.BdfWriterFactory;
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorFactory;
+import org.briarproject.api.identity.AuthorId;
+import org.briarproject.api.identity.LocalAuthor;
+import org.briarproject.api.system.Clock;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import javax.inject.Inject;
+
+import static org.briarproject.api.db.StorageStatus.ADDING;
+
+class AuthorFactoryImpl implements AuthorFactory {
+
+	private final CryptoComponent crypto;
+	private final BdfWriterFactory bdfWriterFactory;
+	private final Clock clock;
+
+	@Inject
+	AuthorFactoryImpl(CryptoComponent crypto, BdfWriterFactory bdfWriterFactory,
+			Clock clock) {
+		this.crypto = crypto;
+		this.bdfWriterFactory = bdfWriterFactory;
+		this.clock = clock;
+	}
+
+	public Author createAuthor(String name, byte[] publicKey) {
+		return new Author(getId(name, publicKey), name, publicKey);
+	}
+
+	public LocalAuthor createLocalAuthor(String name, byte[] publicKey,
+			byte[] privateKey) {
+		return new LocalAuthor(getId(name, publicKey), name, publicKey,
+				privateKey, clock.currentTimeMillis(), ADDING);
+	}
+
+	private AuthorId getId(String name, byte[] publicKey) {
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		BdfWriter w = bdfWriterFactory.createWriter(out);
+		try {
+			w.writeListStart();
+			w.writeString(name);
+			w.writeRaw(publicKey);
+			w.writeListEnd();
+		} catch (IOException e) {
+			// Shouldn't happen with ByteArrayOutputStream
+			throw new RuntimeException(e);
+		}
+		return new AuthorId(crypto.hash(AuthorId.LABEL, out.toByteArray()));
+	}
+}

briar-core/src/org/briarproject/identity/AuthorReader.java

@@ -0,0 +1,30 @@
+package org.briarproject.identity;
+
+import org.briarproject.api.FormatException;
+import org.briarproject.api.data.BdfReader;
+import org.briarproject.api.data.ObjectReader;
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorFactory;
+
+import java.io.IOException;
+
+import static org.briarproject.api.identity.AuthorConstants.MAX_AUTHOR_NAME_LENGTH;
+import static org.briarproject.api.identity.AuthorConstants.MAX_PUBLIC_KEY_LENGTH;
+
+class AuthorReader implements ObjectReader<Author> {
+
+	private final AuthorFactory authorFactory;
+
+	AuthorReader(AuthorFactory authorFactory) {
+		this.authorFactory = authorFactory;
+	}
+
+	public Author readObject(BdfReader r) throws IOException {
+		r.readListStart();
+		String name = r.readString(MAX_AUTHOR_NAME_LENGTH);
+		if (name.length() == 0) throw new FormatException();
+		byte[] publicKey = r.readRaw(MAX_PUBLIC_KEY_LENGTH);
+		r.readListEnd();
+		return authorFactory.createAuthor(name, publicKey);
+	}
+}

briar-core/src/org/briarproject/identity/IdentityModule.java

@@ -1,13 +1,24 @@
 package org.briarproject.identity;
 
 import com.google.inject.AbstractModule;
+import com.google.inject.Provides;
 
+import org.briarproject.api.data.ObjectReader;
+import org.briarproject.api.identity.Author;
+import org.briarproject.api.identity.AuthorFactory;
 import org.briarproject.api.identity.IdentityManager;
 
 public class IdentityModule extends AbstractModule {
 
 	@Override
 	protected void configure() {
+		bind(AuthorFactory.class).to(
+				org.briarproject.identity.AuthorFactoryImpl.class);
 		bind(IdentityManager.class).to(IdentityManagerImpl.class);
 	}
+
+	@Provides
+	ObjectReader<Author> getAuthorReader(AuthorFactory authorFactory) {
+		return new org.briarproject.identity.AuthorReader(authorFactory);
+	}
 }