Renamed some methods, fixed SQL typo bugs in JdbcDatabase.

This commit is contained in:
akwizgran
2013-01-29 16:43:13 +00:00
parent 61a6931643
commit 7ecda94340
14 changed files with 113 additions and 121 deletions

View File

@@ -12,7 +12,6 @@ import java.util.Arrays;
import java.util.BitSet;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.Random;
import net.sf.briar.api.ContactId;
@@ -32,10 +31,7 @@ import net.sf.briar.api.protocol.ProtocolReaderFactory;
import net.sf.briar.api.protocol.ProtocolWriter;
import net.sf.briar.api.protocol.ProtocolWriterFactory;
import net.sf.briar.api.protocol.Request;
import net.sf.briar.api.protocol.Subscription;
import net.sf.briar.api.protocol.SubscriptionHole;
import net.sf.briar.api.protocol.SubscriptionUpdate;
import net.sf.briar.api.protocol.Transport;
import net.sf.briar.api.protocol.TransportId;
import net.sf.briar.api.protocol.TransportUpdate;
import net.sf.briar.api.protocol.UnverifiedMessage;

View File

@@ -17,9 +17,9 @@ import net.sf.briar.api.db.NoSuchTransportException;
import net.sf.briar.api.db.event.ContactAddedEvent;
import net.sf.briar.api.db.event.ContactRemovedEvent;
import net.sf.briar.api.db.event.DatabaseListener;
import net.sf.briar.api.db.event.LocalSubscriptionsUpdatedEvent;
import net.sf.briar.api.db.event.MessageAddedEvent;
import net.sf.briar.api.db.event.RatingChangedEvent;
import net.sf.briar.api.db.event.LocalSubscriptionsUpdatedEvent;
import net.sf.briar.api.lifecycle.ShutdownManager;
import net.sf.briar.api.protocol.Ack;
import net.sf.briar.api.protocol.AuthorId;
@@ -30,7 +30,6 @@ import net.sf.briar.api.protocol.MessageId;
import net.sf.briar.api.protocol.Offer;
import net.sf.briar.api.protocol.Request;
import net.sf.briar.api.protocol.SubscriptionUpdate;
import net.sf.briar.api.protocol.Transport;
import net.sf.briar.api.protocol.TransportId;
import net.sf.briar.api.protocol.TransportUpdate;
import net.sf.briar.api.transport.Endpoint;

View File

@@ -52,9 +52,9 @@ public class ProtocolWriterImplTest extends BriarTestCase {
b.set(12);
b.set(15);
w.writeRequest(new Request(b, 16));
// Short user tag 6, 0 as uint7, short bytes with length 2, 0xD959
// Short user tag 5, 0 as uint7, short bytes with length 2, 0xD959
byte[] output = out.toByteArray();
assertEquals("C6" + "00" + "92" + "D959",
assertEquals("C5" + "00" + "92" + "D959",
StringUtils.toHexString(output));
}
@@ -75,9 +75,9 @@ public class ProtocolWriterImplTest extends BriarTestCase {
b.set(11);
b.set(12);
w.writeRequest(new Request(b, 13));
// Short user tag 6, 3 as uint7, short bytes with length 2, 0x59D8
// Short user tag 5, 3 as uint7, short bytes with length 2, 0x59D8
byte[] output = out.toByteArray();
assertEquals("C6" + "03" + "92" + "59D8",
assertEquals("C5" + "03" + "92" + "59D8",
StringUtils.toHexString(output));
}
}

View File

@@ -21,7 +21,6 @@ import net.sf.briar.api.protocol.MessageFactory;
import net.sf.briar.api.protocol.MessageVerifier;
import net.sf.briar.api.protocol.ProtocolReaderFactory;
import net.sf.briar.api.protocol.ProtocolWriterFactory;
import net.sf.briar.api.protocol.Transport;
import net.sf.briar.api.protocol.TransportId;
import net.sf.briar.api.protocol.TransportUpdate;
import net.sf.briar.api.transport.ConnectionContext;