From 9e35e96ce4d31f741c10db27666009fcc9ff481c Mon Sep 17 00:00:00 2001 From: akwizgran <michael@briarproject.org> Date: Wed, 15 May 2013 12:35:00 +0100 Subject: [PATCH] Removed unnecessary calls to default super constructors. --- briar-api/src/net/sf/briar/api/TransportConfig.java | 4 +--- briar-api/src/net/sf/briar/api/TransportProperties.java | 4 +--- briar-api/src/net/sf/briar/api/db/DbException.java | 4 +--- briar-tests/src/net/sf/briar/BriarTestCase.java | 1 - briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java | 1 - briar-tests/src/net/sf/briar/crypto/CounterModeTest.java | 1 - briar-tests/src/net/sf/briar/crypto/KeyDerivationTest.java | 1 - briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java | 1 - briar-tests/src/net/sf/briar/db/H2DatabaseTest.java | 1 - .../src/net/sf/briar/messaging/PacketReaderImplTest.java | 1 - .../src/net/sf/briar/messaging/PacketWriterImplTest.java | 1 - .../messaging/simplex/OutgoingSimplexConnectionTest.java | 1 - .../messaging/simplex/SimplexMessagingIntegrationTest.java | 1 - .../net/sf/briar/transport/ConnectionRegistryImplTest.java | 1 - .../net/sf/briar/transport/IncomingEncryptionLayerTest.java | 1 - .../net/sf/briar/transport/OutgoingEncryptionLayerTest.java | 1 - .../src/net/sf/briar/transport/TransportIntegrationTest.java | 1 - 17 files changed, 3 insertions(+), 23 deletions(-) diff --git a/briar-api/src/net/sf/briar/api/TransportConfig.java b/briar-api/src/net/sf/briar/api/TransportConfig.java index da2c8bbc0f..45e5ce09c7 100644 --- a/briar-api/src/net/sf/briar/api/TransportConfig.java +++ b/briar-api/src/net/sf/briar/api/TransportConfig.java @@ -11,7 +11,5 @@ public class TransportConfig extends Hashtable<String, String> { super(c); } - public TransportConfig() { - super(); - } + public TransportConfig() {} } diff --git a/briar-api/src/net/sf/briar/api/TransportProperties.java b/briar-api/src/net/sf/briar/api/TransportProperties.java index df87c7d3aa..cdce2af433 100644 --- a/briar-api/src/net/sf/briar/api/TransportProperties.java +++ b/briar-api/src/net/sf/briar/api/TransportProperties.java @@ -11,7 +11,5 @@ public class TransportProperties extends Hashtable<String, String> { super(p); } - public TransportProperties() { - super(); - } + public TransportProperties() {} } diff --git a/briar-api/src/net/sf/briar/api/db/DbException.java b/briar-api/src/net/sf/briar/api/db/DbException.java index 3ad5030a9e..0a200a6355 100644 --- a/briar-api/src/net/sf/briar/api/db/DbException.java +++ b/briar-api/src/net/sf/briar/api/db/DbException.java @@ -4,9 +4,7 @@ public class DbException extends Exception { private static final long serialVersionUID = 3706581789209939441L; - public DbException() { - super(); - } + public DbException() {} public DbException(Throwable t) { super(t); diff --git a/briar-tests/src/net/sf/briar/BriarTestCase.java b/briar-tests/src/net/sf/briar/BriarTestCase.java index 171b620cde..c2635e1172 100644 --- a/briar-tests/src/net/sf/briar/BriarTestCase.java +++ b/briar-tests/src/net/sf/briar/BriarTestCase.java @@ -7,7 +7,6 @@ import junit.framework.TestCase; public abstract class BriarTestCase extends TestCase { public BriarTestCase() { - super(); // Ensure exceptions thrown on worker threads cause tests to fail UncaughtExceptionHandler fail = new UncaughtExceptionHandler() { public void uncaughtException(Thread thread, Throwable throwable) { diff --git a/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java b/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java index 7d87dd82d7..2eaed41474 100644 --- a/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java +++ b/briar-tests/src/net/sf/briar/ProtocolIntegrationTest.java @@ -77,7 +77,6 @@ public class ProtocolIntegrationTest extends BriarTestCase { private final TransportProperties transportProperties; public ProtocolIntegrationTest() throws Exception { - super(); Injector i = Guice.createInjector(new TestDatabaseModule(), new TestLifecycleModule(), new TestUiModule(), new ClockModule(), new CryptoModule(), new DatabaseModule(), diff --git a/briar-tests/src/net/sf/briar/crypto/CounterModeTest.java b/briar-tests/src/net/sf/briar/crypto/CounterModeTest.java index 96cde20014..d6c16f4666 100644 --- a/briar-tests/src/net/sf/briar/crypto/CounterModeTest.java +++ b/briar-tests/src/net/sf/briar/crypto/CounterModeTest.java @@ -29,7 +29,6 @@ public class CounterModeTest extends BriarTestCase { private final SecretKeySpec key; public CounterModeTest() { - super(); Security.addProvider(new BouncyCastleProvider()); random = new SecureRandom(); keyBytes = new byte[KEY_SIZE_BYTES]; diff --git a/briar-tests/src/net/sf/briar/crypto/KeyDerivationTest.java b/briar-tests/src/net/sf/briar/crypto/KeyDerivationTest.java index b05f536a45..f3c568cec8 100644 --- a/briar-tests/src/net/sf/briar/crypto/KeyDerivationTest.java +++ b/briar-tests/src/net/sf/briar/crypto/KeyDerivationTest.java @@ -17,7 +17,6 @@ public class KeyDerivationTest extends BriarTestCase { private final byte[] secret; public KeyDerivationTest() { - super(); crypto = new CryptoComponentImpl(); secret = new byte[32]; new Random().nextBytes(secret); diff --git a/briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java b/briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java index 02e69ad48b..3df36ac682 100644 --- a/briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java +++ b/briar-tests/src/net/sf/briar/db/DatabaseComponentTest.java @@ -79,7 +79,6 @@ public abstract class DatabaseComponentTest extends BriarTestCase { protected final TemporarySecret temporarySecret; public DatabaseComponentTest() { - super(); groupId = new GroupId(TestUtils.getRandomId()); restrictedGroupId = new GroupId(TestUtils.getRandomId()); group = new Group(groupId, "Group name", null); diff --git a/briar-tests/src/net/sf/briar/db/H2DatabaseTest.java b/briar-tests/src/net/sf/briar/db/H2DatabaseTest.java index 632f0cb72e..0757dfa103 100644 --- a/briar-tests/src/net/sf/briar/db/H2DatabaseTest.java +++ b/briar-tests/src/net/sf/briar/db/H2DatabaseTest.java @@ -69,7 +69,6 @@ public class H2DatabaseTest extends BriarTestCase { private final ContactId contactId; public H2DatabaseTest() throws Exception { - super(); groupId = new GroupId(TestUtils.getRandomId()); group = new Group(groupId, "Group name", null); authorId = new AuthorId(TestUtils.getRandomId()); diff --git a/briar-tests/src/net/sf/briar/messaging/PacketReaderImplTest.java b/briar-tests/src/net/sf/briar/messaging/PacketReaderImplTest.java index c32db9c0c9..92a3c7ce2f 100644 --- a/briar-tests/src/net/sf/briar/messaging/PacketReaderImplTest.java +++ b/briar-tests/src/net/sf/briar/messaging/PacketReaderImplTest.java @@ -33,7 +33,6 @@ public class PacketReaderImplTest extends BriarTestCase { private final WriterFactory writerFactory; public PacketReaderImplTest() throws Exception { - super(); Injector i = Guice.createInjector(new SerialModule()); serial = i.getInstance(SerialComponent.class); readerFactory = i.getInstance(ReaderFactory.class); diff --git a/briar-tests/src/net/sf/briar/messaging/PacketWriterImplTest.java b/briar-tests/src/net/sf/briar/messaging/PacketWriterImplTest.java index 2ca4e40be0..c59587185f 100644 --- a/briar-tests/src/net/sf/briar/messaging/PacketWriterImplTest.java +++ b/briar-tests/src/net/sf/briar/messaging/PacketWriterImplTest.java @@ -33,7 +33,6 @@ public class PacketWriterImplTest extends BriarTestCase { private final WriterFactory writerFactory; public PacketWriterImplTest() { - super(); Injector i = Guice.createInjector(new TestDatabaseModule(), new TestLifecycleModule(), new ClockModule(), new CryptoModule(), new DatabaseModule(), new MessagingModule(), diff --git a/briar-tests/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnectionTest.java b/briar-tests/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnectionTest.java index 6dbf36984c..3021e53923 100644 --- a/briar-tests/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnectionTest.java +++ b/briar-tests/src/net/sf/briar/messaging/simplex/OutgoingSimplexConnectionTest.java @@ -57,7 +57,6 @@ public class OutgoingSimplexConnectionTest extends BriarTestCase { private final byte[] secret; public OutgoingSimplexConnectionTest() { - super(); context = new Mockery(); db = context.mock(DatabaseComponent.class); Module testModule = new AbstractModule() { diff --git a/briar-tests/src/net/sf/briar/messaging/simplex/SimplexMessagingIntegrationTest.java b/briar-tests/src/net/sf/briar/messaging/simplex/SimplexMessagingIntegrationTest.java index fab66c510b..9904799063 100644 --- a/briar-tests/src/net/sf/briar/messaging/simplex/SimplexMessagingIntegrationTest.java +++ b/briar-tests/src/net/sf/briar/messaging/simplex/SimplexMessagingIntegrationTest.java @@ -63,7 +63,6 @@ public class SimplexMessagingIntegrationTest extends BriarTestCase { private Injector alice, bob; public SimplexMessagingIntegrationTest() throws Exception { - super(); transportId = new TransportId(TestUtils.getRandomId()); // Create matching secrets for Alice and Bob initialSecret = new byte[32]; diff --git a/briar-tests/src/net/sf/briar/transport/ConnectionRegistryImplTest.java b/briar-tests/src/net/sf/briar/transport/ConnectionRegistryImplTest.java index 1e118bf7da..647d586a6f 100644 --- a/briar-tests/src/net/sf/briar/transport/ConnectionRegistryImplTest.java +++ b/briar-tests/src/net/sf/briar/transport/ConnectionRegistryImplTest.java @@ -17,7 +17,6 @@ public class ConnectionRegistryImplTest extends BriarTestCase { private final TransportId transportId, transportId1; public ConnectionRegistryImplTest() { - super(); contactId = new ContactId(1); contactId1 = new ContactId(2); transportId = new TransportId(TestUtils.getRandomId()); diff --git a/briar-tests/src/net/sf/briar/transport/IncomingEncryptionLayerTest.java b/briar-tests/src/net/sf/briar/transport/IncomingEncryptionLayerTest.java index 952862e88b..af3edcc464 100644 --- a/briar-tests/src/net/sf/briar/transport/IncomingEncryptionLayerTest.java +++ b/briar-tests/src/net/sf/briar/transport/IncomingEncryptionLayerTest.java @@ -34,7 +34,6 @@ public class IncomingEncryptionLayerTest extends BriarTestCase { private final ErasableKey frameKey; public IncomingEncryptionLayerTest() { - super(); Injector i = Guice.createInjector(new CryptoModule(), new TestLifecycleModule()); crypto = i.getInstance(CryptoComponent.class); diff --git a/briar-tests/src/net/sf/briar/transport/OutgoingEncryptionLayerTest.java b/briar-tests/src/net/sf/briar/transport/OutgoingEncryptionLayerTest.java index 94797d389c..648c3c0da2 100644 --- a/briar-tests/src/net/sf/briar/transport/OutgoingEncryptionLayerTest.java +++ b/briar-tests/src/net/sf/briar/transport/OutgoingEncryptionLayerTest.java @@ -34,7 +34,6 @@ public class OutgoingEncryptionLayerTest extends BriarTestCase { private final byte[] tag; public OutgoingEncryptionLayerTest() { - super(); Injector i = Guice.createInjector(new CryptoModule(), new TestLifecycleModule()); crypto = i.getInstance(CryptoComponent.class); diff --git a/briar-tests/src/net/sf/briar/transport/TransportIntegrationTest.java b/briar-tests/src/net/sf/briar/transport/TransportIntegrationTest.java index 5e77a768fe..8ef8c3b5dc 100644 --- a/briar-tests/src/net/sf/briar/transport/TransportIntegrationTest.java +++ b/briar-tests/src/net/sf/briar/transport/TransportIntegrationTest.java @@ -44,7 +44,6 @@ public class TransportIntegrationTest extends BriarTestCase { private final ErasableKey frameKey; public TransportIntegrationTest() { - super(); Module testModule = new AbstractModule() { public void configure() { bind(ConnectionWriterFactory.class).to( -- GitLab