fixup errors/code polish
This commit is contained in:
parent
bcb49807e0
commit
8412e9ee9c
@ -3,7 +3,6 @@ package dorkbox.network;
|
|||||||
|
|
||||||
|
|
||||||
import static org.junit.Assert.fail;
|
import static org.junit.Assert.fail;
|
||||||
import hive.common.Listener;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
@ -11,6 +10,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.util.SerializationManager;
|
import dorkbox.network.util.SerializationManager;
|
||||||
import dorkbox.network.util.exceptions.InitializationException;
|
import dorkbox.network.util.exceptions.InitializationException;
|
||||||
import dorkbox.network.util.exceptions.SecurityException;
|
import dorkbox.network.util.exceptions.SecurityException;
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
package dorkbox.network;
|
package dorkbox.network;
|
||||||
|
|
||||||
|
|
||||||
import hive.common.Listener;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Timer;
|
import java.util.Timer;
|
||||||
@ -11,6 +10,7 @@ import java.util.TimerTask;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.util.exceptions.InitializationException;
|
import dorkbox.network.util.exceptions.InitializationException;
|
||||||
import dorkbox.network.util.exceptions.SecurityException;
|
import dorkbox.network.util.exceptions.SecurityException;
|
||||||
|
|
||||||
|
@ -3,13 +3,13 @@ package dorkbox.network;
|
|||||||
|
|
||||||
|
|
||||||
import static org.junit.Assert.fail;
|
import static org.junit.Assert.fail;
|
||||||
import hive.common.Listener;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.util.exceptions.InitializationException;
|
import dorkbox.network.util.exceptions.InitializationException;
|
||||||
import dorkbox.network.util.exceptions.SecurityException;
|
import dorkbox.network.util.exceptions.SecurityException;
|
||||||
|
|
||||||
|
@ -3,7 +3,6 @@ package dorkbox.network;
|
|||||||
|
|
||||||
|
|
||||||
import static org.junit.Assert.fail;
|
import static org.junit.Assert.fail;
|
||||||
import hive.common.Listener;
|
|
||||||
|
|
||||||
import java.io.ByteArrayInputStream;
|
import java.io.ByteArrayInputStream;
|
||||||
import java.io.ByteArrayOutputStream;
|
import java.io.ByteArrayOutputStream;
|
||||||
@ -14,6 +13,7 @@ import org.junit.Test;
|
|||||||
|
|
||||||
import dorkbox.network.PingPongTest.TYPE;
|
import dorkbox.network.PingPongTest.TYPE;
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.connection.idle.IdleBridge;
|
import dorkbox.network.connection.idle.IdleBridge;
|
||||||
import dorkbox.network.connection.idle.InputStreamSender;
|
import dorkbox.network.connection.idle.InputStreamSender;
|
||||||
import dorkbox.network.util.SerializationManager;
|
import dorkbox.network.util.SerializationManager;
|
||||||
|
@ -3,7 +3,6 @@ package dorkbox.network;
|
|||||||
|
|
||||||
|
|
||||||
import static org.junit.Assert.fail;
|
import static org.junit.Assert.fail;
|
||||||
import hive.common.Listener;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.security.SecureRandom;
|
import java.security.SecureRandom;
|
||||||
@ -12,6 +11,7 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.util.SerializationManager;
|
import dorkbox.network.util.SerializationManager;
|
||||||
import dorkbox.network.util.exceptions.InitializationException;
|
import dorkbox.network.util.exceptions.InitializationException;
|
||||||
import dorkbox.network.util.exceptions.SecurityException;
|
import dorkbox.network.util.exceptions.SecurityException;
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
package dorkbox.network;
|
package dorkbox.network;
|
||||||
|
|
||||||
import static org.junit.Assert.fail;
|
import static org.junit.Assert.fail;
|
||||||
import hive.common.Listener;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
@ -10,6 +9,7 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.util.exceptions.InitializationException;
|
import dorkbox.network.util.exceptions.InitializationException;
|
||||||
import dorkbox.network.util.exceptions.SecurityException;
|
import dorkbox.network.util.exceptions.SecurityException;
|
||||||
|
|
||||||
|
@ -3,7 +3,6 @@ package dorkbox.network;
|
|||||||
|
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
import hive.common.Listener;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@ -15,7 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.ListenerRaw;
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.util.exceptions.InitializationException;
|
import dorkbox.network.util.exceptions.InitializationException;
|
||||||
import dorkbox.network.util.exceptions.SecurityException;
|
import dorkbox.network.util.exceptions.SecurityException;
|
||||||
|
|
||||||
@ -95,7 +94,7 @@ public class MultipleThreadTest extends BaseTest {
|
|||||||
client.getSerialization().register(String[].class);
|
client.getSerialization().register(String[].class);
|
||||||
client.getSerialization().register(DataClass.class);
|
client.getSerialization().register(DataClass.class);
|
||||||
addEndPoint(client);
|
addEndPoint(client);
|
||||||
client.listeners().add(new ListenerRaw<Connection, DataClass>() {
|
client.listeners().add(new Listener<DataClass>() {
|
||||||
AtomicInteger received = new AtomicInteger(1);
|
AtomicInteger received = new AtomicInteger(1);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -2,7 +2,6 @@ package dorkbox.network;
|
|||||||
|
|
||||||
|
|
||||||
import static org.junit.Assert.fail;
|
import static org.junit.Assert.fail;
|
||||||
import hive.common.Listener;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
@ -11,6 +10,7 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.util.SerializationManager;
|
import dorkbox.network.util.SerializationManager;
|
||||||
import dorkbox.network.util.exceptions.InitializationException;
|
import dorkbox.network.util.exceptions.InitializationException;
|
||||||
import dorkbox.network.util.exceptions.SecurityException;
|
import dorkbox.network.util.exceptions.SecurityException;
|
||||||
|
@ -3,7 +3,6 @@ package dorkbox.network;
|
|||||||
|
|
||||||
|
|
||||||
import static org.junit.Assert.fail;
|
import static org.junit.Assert.fail;
|
||||||
import hive.common.Listener;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
@ -14,6 +13,7 @@ import org.junit.Test;
|
|||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.EndPoint;
|
import dorkbox.network.connection.EndPoint;
|
||||||
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.util.SerializationManager;
|
import dorkbox.network.util.SerializationManager;
|
||||||
import dorkbox.network.util.exceptions.InitializationException;
|
import dorkbox.network.util.exceptions.InitializationException;
|
||||||
import dorkbox.network.util.exceptions.SecurityException;
|
import dorkbox.network.util.exceptions.SecurityException;
|
||||||
|
@ -3,7 +3,6 @@ package dorkbox.network;
|
|||||||
|
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
import hive.common.Listener;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Timer;
|
import java.util.Timer;
|
||||||
@ -13,6 +12,7 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.util.exceptions.InitializationException;
|
import dorkbox.network.util.exceptions.InitializationException;
|
||||||
import dorkbox.network.util.exceptions.SecurityException;
|
import dorkbox.network.util.exceptions.SecurityException;
|
||||||
|
|
||||||
|
@ -3,7 +3,6 @@ package dorkbox.network;
|
|||||||
|
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
import hive.common.Listener;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
@ -11,6 +10,7 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.util.exceptions.InitializationException;
|
import dorkbox.network.util.exceptions.InitializationException;
|
||||||
import dorkbox.network.util.exceptions.SecurityException;
|
import dorkbox.network.util.exceptions.SecurityException;
|
||||||
|
|
||||||
|
@ -3,7 +3,6 @@ package dorkbox.network;
|
|||||||
|
|
||||||
|
|
||||||
import static org.junit.Assert.fail;
|
import static org.junit.Assert.fail;
|
||||||
import hive.common.Listener;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
@ -14,6 +13,7 @@ import org.junit.Test;
|
|||||||
|
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.EndPoint;
|
import dorkbox.network.connection.EndPoint;
|
||||||
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.util.exceptions.InitializationException;
|
import dorkbox.network.util.exceptions.InitializationException;
|
||||||
import dorkbox.network.util.exceptions.SecurityException;
|
import dorkbox.network.util.exceptions.SecurityException;
|
||||||
|
|
||||||
|
@ -7,12 +7,12 @@ import java.io.IOException;
|
|||||||
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import dorkbox.network.BaseTest;
|
||||||
import dorkbox.network.Client;
|
import dorkbox.network.Client;
|
||||||
import dorkbox.network.ConnectionOptions;
|
import dorkbox.network.ConnectionOptions;
|
||||||
import dorkbox.network.BaseTest;
|
|
||||||
import dorkbox.network.Server;
|
import dorkbox.network.Server;
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
import dorkbox.network.connection.ListenerRaw;
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.util.SerializationManager;
|
import dorkbox.network.util.SerializationManager;
|
||||||
import dorkbox.network.util.exceptions.InitializationException;
|
import dorkbox.network.util.exceptions.InitializationException;
|
||||||
import dorkbox.network.util.exceptions.SecurityException;
|
import dorkbox.network.util.exceptions.SecurityException;
|
||||||
@ -48,15 +48,15 @@ public class RmiSendObjectTest extends BaseTest {
|
|||||||
serverTestObject.otherObject = new OtherObjectImpl();
|
serverTestObject.otherObject = new OtherObjectImpl();
|
||||||
|
|
||||||
// Both objects must be registered with the ObjectSpace.
|
// Both objects must be registered with the ObjectSpace.
|
||||||
serverRMI = server.getRmiBridge();
|
this.serverRMI = server.getRmiBridge();
|
||||||
serverRMI.register(42, serverTestObject);
|
this.serverRMI.register(42, serverTestObject);
|
||||||
serverRMI.register(777, serverTestObject.getOtherObject());
|
this.serverRMI.register(777, serverTestObject.getOtherObject());
|
||||||
|
|
||||||
server.listeners().add(new ListenerRaw<Connection, OtherObjectImpl>() {
|
server.listeners().add(new Listener<OtherObjectImpl>() {
|
||||||
@Override
|
@Override
|
||||||
public void connected(final Connection connection) {
|
public void connected(final Connection connection) {
|
||||||
// Allow the connection to access objects in the ObjectSpace.
|
// Allow the connection to access objects in the ObjectSpace.
|
||||||
serverRMI.addConnection(connection);
|
RmiSendObjectTest.this.serverRMI.addConnection(connection);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -74,7 +74,7 @@ public class RmiSendObjectTest extends BaseTest {
|
|||||||
register(client.getSerialization());
|
register(client.getSerialization());
|
||||||
|
|
||||||
addEndPoint(client);
|
addEndPoint(client);
|
||||||
client.listeners().add(new ListenerRaw<Connection, Object>() {
|
client.listeners().add(new Listener<Object>() {
|
||||||
@Override
|
@Override
|
||||||
public void connected(final Connection connection) {
|
public void connected(final Connection connection) {
|
||||||
new Thread(new Runnable() {
|
new Thread(new Runnable() {
|
||||||
@ -126,7 +126,7 @@ public class RmiSendObjectTest extends BaseTest {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public OtherObject getOtherObject() {
|
public OtherObject getOtherObject() {
|
||||||
return otherObject;
|
return this.otherObject;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4,7 +4,6 @@ package dorkbox.network.rmi;
|
|||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import static org.junit.Assert.assertEquals;
|
||||||
import static org.junit.Assert.assertTrue;
|
import static org.junit.Assert.assertTrue;
|
||||||
import hive.common.Listener;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
@ -15,6 +14,7 @@ import dorkbox.network.Client;
|
|||||||
import dorkbox.network.ConnectionOptions;
|
import dorkbox.network.ConnectionOptions;
|
||||||
import dorkbox.network.Server;
|
import dorkbox.network.Server;
|
||||||
import dorkbox.network.connection.Connection;
|
import dorkbox.network.connection.Connection;
|
||||||
|
import dorkbox.network.connection.Listener;
|
||||||
import dorkbox.network.util.SerializationManager;
|
import dorkbox.network.util.SerializationManager;
|
||||||
import dorkbox.network.util.exceptions.InitializationException;
|
import dorkbox.network.util.exceptions.InitializationException;
|
||||||
import dorkbox.network.util.exceptions.SecurityException;
|
import dorkbox.network.util.exceptions.SecurityException;
|
||||||
|
Loading…
Reference in New Issue
Block a user