rebased with master

This commit is contained in:
Ernir Erlingsson
2016-03-08 23:05:10 +01:00
parent 9af3ce123a
commit 10764d727b
12 changed files with 43 additions and 35 deletions

View File

@@ -23,13 +23,13 @@ public class DataModule {
}
@Provides
MetadataParser provideMetaDataParser() {
return new MetadataParserImpl();
MetadataParser provideMetaDataParser(BdfReaderFactory bdfReaderFactory) {
return new MetadataParserImpl(bdfReaderFactory);
}
@Provides
MetadataEncoder provideMetaDataEncoider() {
return new MetadataEncoderImpl();
MetadataEncoder provideMetaDataEncoider(BdfWriterFactory bdfWriterFactory) {
return new MetadataEncoderImpl(bdfWriterFactory);
}
}

View File

@@ -1,7 +1,5 @@
package org.briarproject.data;
import com.google.inject.Inject;
import org.briarproject.api.Bytes;
import org.briarproject.api.FormatException;
import org.briarproject.api.data.BdfDictionary;
@@ -16,6 +14,8 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import javax.inject.Inject;
import static org.briarproject.api.data.BdfDictionary.NULL_VALUE;
import static org.briarproject.api.db.Metadata.REMOVE;

View File

@@ -1,7 +1,5 @@
package org.briarproject.data;
import com.google.inject.Inject;
import org.briarproject.api.FormatException;
import org.briarproject.api.data.BdfDictionary;
import org.briarproject.api.data.BdfReader;
@@ -13,6 +11,8 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.Map.Entry;
import javax.inject.Inject;
import static org.briarproject.api.data.BdfDictionary.NULL_VALUE;
import static org.briarproject.api.db.Metadata.REMOVE;