From adae56459529d89dcc1c7d70bb7fc1cdb87570d1 Mon Sep 17 00:00:00 2001 From: Peter Lawrey Date: Sun, 30 Nov 2014 22:46:22 +0200 Subject: [PATCH] Remove blank lines before } --- README.md | 2 -- .../hash/replication/AbstractReplication.java | 2 -- .../hash/replication/ReplicationHub.java | 1 - .../map/AbstractChannelReplicator.java | 7 ----- .../map/AbstractChronicleMapBuilder.java | 1 - .../chronicle/map/ChannelProvider.java | 3 --- .../chronicle/map/ChronicleMapBuilder.java | 1 - .../openhft/chronicle/map/NodeDiscovery.java | 15 ----------- .../net/openhft/chronicle/map/Replica.java | 2 -- .../chronicle/map/ReplicatedChronicleMap.java | 4 --- .../map/ReplicationHubFindByName.java | 4 --- .../chronicle/map/SerializationBuilder.java | 1 - .../chronicle/map/ShortShortMultiMap.java | 1 - .../chronicle/map/StatelessChronicleMap.java | 18 ------------- .../openhft/chronicle/map/TcpReplicator.java | 27 ------------------- .../chronicle/map/UdpChannelReplicator.java | 4 --- .../openhft/chronicle/map/UdpReplicator.java | 2 -- .../chronicle/map/VanillaChronicleMap.java | 6 ----- .../openhft/chronicle/map/BitUnitTest.java | 3 --- .../map/ByteableIntValueMarshaller.java | 1 - .../map/ByteableLongValueMarshaller.java | 1 - .../chronicle/map/CHMMetaDataTest.java | 1 - .../net/openhft/chronicle/map/CHMTest5.java | 4 --- .../chronicle/map/CHMTestIterator1.java | 2 -- .../chronicle/map/CHMUseCasesTest.java | 4 --- .../chronicle/map/ChannelReplicationTest.java | 2 -- .../map/ChronicleMapImportExportTest.java | 6 ----- .../chronicle/map/ChronicleMapTest.java | 2 -- .../chronicle/map/ConcurrentMap8Test.java | 2 -- ...tListenerTestWithTCPSocketReplication.java | 6 ----- .../openhft/chronicle/map/Issue42Test.java | 1 - .../openhft/chronicle/map/KeySizesTest.java | 1 - .../openhft/chronicle/map/MapByNameTest.java | 2 -- .../map/NodeDiscoveryBroadcasterTest.java | 6 ----- .../map/PostChannelCreationTest.java | 3 --- .../map/ReplicatedChronicleMapTest.java | 2 -- .../chronicle/map/ReplicationCheckingMap.java | 11 -------- .../openhft/chronicle/map/SerializerTest.java | 3 --- .../chronicle/map/SingleMapChannelTest.java | 2 -- .../chronicle/map/StatelessClientTest.java | 26 ------------------ .../TCPSocketReplication3VoidValueTest.java | 3 --- ...cketReplication3wayPutReturnsNullTest.java | 4 --- .../map/TCPSocketReplication3wayTest.java | 5 ---- .../map/TCPSocketReplication4WayMapTest.java | 4 --- .../TCPSocketReplicationBootStrapTest.java | 3 --- .../map/TCPSocketReplicationIntValueTest.java | 4 --- .../map/TCPSocketReplicationNativeTest.java | 4 --- ...CPSocketReplicationPostConnectionTest.java | 5 ---- .../map/TCPSocketReplicationTest.java | 5 ---- .../map/TimeBasedReplicationTest.java | 3 --- .../map/TwoMapOnDifferentServersTest.java | 1 - .../map/UDPSocketReplicationTest.java | 1 - .../map/example/ChannelReplicationTest.java | 5 ---- .../map/jrs166/map/ChronicleMapTest.java | 14 ---------- .../chronicle/map/jrs166/map/MapCheck.java | 2 -- .../jrs166/map/StatelessChronicleMapTest.java | 15 ----------- .../set/ChronicleSetBuilderTest.java | 1 - .../SetForTCPSocketReplication3wayTest.java | 4 --- 58 files changed, 275 deletions(-) diff --git a/README.md b/README.md index 12f2d5da2..92387c6f4 100644 --- a/README.md +++ b/README.md @@ -907,7 +907,6 @@ unique for each map you have. .replicatedViaChannel(hubOnServer1.createChannel(channel2)).create(); favoriteComputerServer1.put("peter", "dell"); - } // server 2 with identifier = 2 @@ -1384,7 +1383,6 @@ public class YourClass { Assert.assertEquals(map1, map2); Assert.assertTrue(!map1.isEmpty()); - } } ``` diff --git a/src/main/java/net/openhft/chronicle/hash/replication/AbstractReplication.java b/src/main/java/net/openhft/chronicle/hash/replication/AbstractReplication.java index dea360914..881fa91dd 100644 --- a/src/main/java/net/openhft/chronicle/hash/replication/AbstractReplication.java +++ b/src/main/java/net/openhft/chronicle/hash/replication/AbstractReplication.java @@ -50,7 +50,6 @@ public abstract class AbstractReplication implements Serializable { ", tcpConfig=" + tcpConfig + ", udpConfig=" + udpConfig + ", remoteNodeValidator=" + remoteNodeValidator; - } public byte identifier() { @@ -140,7 +139,6 @@ public abstract class AbstractReplication implements Serializable { public String toString() { return ", udpConfig=" + udpConfig + ", remoteNodeValidator=" + remoteNodeValidator; - } } } diff --git a/src/main/java/net/openhft/chronicle/hash/replication/ReplicationHub.java b/src/main/java/net/openhft/chronicle/hash/replication/ReplicationHub.java index f2a684ef1..611af7d7c 100644 --- a/src/main/java/net/openhft/chronicle/hash/replication/ReplicationHub.java +++ b/src/main/java/net/openhft/chronicle/hash/replication/ReplicationHub.java @@ -183,7 +183,6 @@ public final class ReplicationHub extends AbstractReplication { check(identifier); return new ReplicationHub(identifier, this); } - } } diff --git a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java index 98c7f142c..9f42563e6 100644 --- a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java +++ b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java @@ -116,11 +116,9 @@ abstract class AbstractChannelReplicator implements Closeable { } } } - } ); return openSelector(result, selectedKeys); - } return result; @@ -132,7 +130,6 @@ abstract class AbstractChannelReplicator implements Closeable { try { result = SocketChannel.open(); result.socket().setTcpNoDelay(true); - } finally { if (result != null) try { @@ -252,7 +249,6 @@ abstract class AbstractChannelReplicator implements Closeable { dumpThreadStackTrace(start); } } - } catch (InterruptedException e) { dumpThreadStackTrace(start); LOG.error("", e); @@ -360,7 +356,6 @@ abstract class AbstractChannelReplicator implements Closeable { final SelectionKey selectionKey = selectableChannel.keyFor(selector); if (selectionKey != null) selectionKey.interestOps(selectionKey.interestOps() | OP_WRITE); - } } @@ -527,7 +522,6 @@ abstract class AbstractChannelReplicator implements Closeable { } AbstractConnector.this.socketChannel = socketChannel; - } catch (Exception e) { closeQuietly(socketChannel); LOG.debug("", e); @@ -548,7 +542,6 @@ abstract class AbstractChannelReplicator implements Closeable { thread.setName(name); thread.setDaemon(true); thread.start(); - } public void setSuccessfullyConnected() { diff --git a/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java index 7727cfe8f..d3bffe682 100755 --- a/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java +++ b/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java @@ -399,7 +399,6 @@ abstract class AbstractChronicleMapBuilder identifier; - } @Override diff --git a/src/main/java/net/openhft/chronicle/map/ReplicationHubFindByName.java b/src/main/java/net/openhft/chronicle/map/ReplicationHubFindByName.java index 7f04ef7af..e03efc922 100644 --- a/src/main/java/net/openhft/chronicle/map/ReplicationHubFindByName.java +++ b/src/main/java/net/openhft/chronicle/map/ReplicationHubFindByName.java @@ -86,9 +86,7 @@ class ReplicationHubFindByName implements FindByName { } catch (IOException e) { LOG.error("", e); } - } - }; this.map = (Map) of(CharSequence.class, ChronicleMapBuilderWithChannelId.class) @@ -114,7 +112,6 @@ class ReplicationHubFindByName implements FindByName { map.put(builder.name(), builderWithChannelId); return (T) get(builder.name()).chronicleMapBuilder.create(); - } public T from(String name) throws IllegalArgumentException, @@ -149,7 +146,6 @@ class ReplicationHubFindByName implements FindByName { Thread.sleep(1); } throw new TimeoutException("timed out wait for map name=" + name); - } private ChronicleHashInstanceConfig replicatedViaChannel(String name) throws TimeoutException, InterruptedException { diff --git a/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java b/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java index f1e41bbc5..4f34d14f4 100644 --- a/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java +++ b/src/main/java/net/openhft/chronicle/map/SerializationBuilder.java @@ -249,7 +249,6 @@ final class SerializationBuilder implements Cloneable, Serializable{ public SerializationBuilder reader(BytesReader reader) { this.reader = reader; return this; - } public Object interop() { diff --git a/src/main/java/net/openhft/chronicle/map/ShortShortMultiMap.java b/src/main/java/net/openhft/chronicle/map/ShortShortMultiMap.java index 14b2b990f..911d71262 100644 --- a/src/main/java/net/openhft/chronicle/map/ShortShortMultiMap.java +++ b/src/main/java/net/openhft/chronicle/map/ShortShortMultiMap.java @@ -264,7 +264,6 @@ class ShortShortMultiMap implements MultiMap { int entry = bytes.readInt(pos); if (entry != UNSET_ENTRY) sb.append(key(entry)).append('=').append(value(entry)).append(", "); - } if (sb.length() > 2) { sb.setLength(sb.length() - 2); diff --git a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java index 670658164..2ac46aad4 100644 --- a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java @@ -222,7 +222,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon closeables.closeQuietly(); throw e; } - } return result; @@ -251,11 +250,9 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon clientChannel = AbstractChannelReplicator.openSocketChannel(closeables); clientChannel.connect(remoteAddress); doHandShaking(clientChannel); - } catch (IOException e) { closeables.closeQuietly(); } - } /** @@ -303,7 +300,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon if (LOG.isDebugEnabled()) LOG.debug("Attached to a map with a remote identifier=" + remoteIdentifier); - } public File file() { @@ -325,7 +321,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon LOG.error("", e); } } - } /** @@ -417,7 +412,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon final Set> entries = entrySet(); return that.entrySet().equals(entries); - } @Override @@ -442,7 +436,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon // get the data back from the server return blockingFetch(sizeLocation).readBoolean(); - } private static NullPointerException keyNotNullNPE() { @@ -469,7 +462,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon // get the data back from the server return readValue(sizeLocation, copies); - } public synchronized V getUsing(K key, V usingValue) { @@ -527,7 +519,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon } else // get the data back from the server return readValue(sizeLocation, copies); - } public synchronized R mapForKey(K key, @NotNull Function function) { @@ -562,10 +553,8 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon if (cause instanceof IOException && cause.getMessage().contains("Not enough available space")) { LOG.debug("resizing buffer"); resizeBuffer(buffer.capacity() + maxEntrySize, start); - } else throw e; - } } } @@ -581,7 +570,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon sendWithoutAcc(bytes, sizeLocation); else blockingFetch(sizeLocation); - } private synchronized void sendWithoutAcc(final Bytes bytes, long sizeLocation) { @@ -920,7 +908,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon public final String toString() { return getKey() + "=" + getValue(); } - } private Bytes blockingFetch(long sizeLocation) { @@ -936,7 +923,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon close(); throw e; } - } private Bytes blockingFetch0(long sizeLocation, final long transactionId, long startTime) { @@ -950,7 +936,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon close(); throw e; } - } private Bytes blockingFetchThrowable(long sizeLocation, long timeOutMs, final long transactionId, final long startTime) throws IOException { @@ -976,7 +961,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon bytes.buffer().clear(); return blockingFetch(timeoutTime, transactionId); - } catch (java.nio.channels.ClosedChannelException | ClosedConnectionException e) { checkTimeout(timeoutTime); clientChannel = lazyConnect(config.timeoutMs(), config.remoteAddress()); @@ -995,7 +979,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon close(); throw e; } - } private Bytes blockingFetch(long timeoutTime, long transactionId) throws IOException { @@ -1011,7 +994,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon long limit = bytes.position(); bytes.position(limit); resizeBuffer(requiredSize, pos); - } else bytes.limit(bytes.capacity()); diff --git a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java index dbedfa002..e4b9fd929 100644 --- a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java +++ b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java @@ -183,7 +183,6 @@ final class TcpReplicator extends AbstractChannelReplicator implements Closeable if (!isClosed) LOG.error("", e); } - } } finally { for (int i = 0; i < keys.length && keys[i] != null; i++) { @@ -191,7 +190,6 @@ final class TcpReplicator extends AbstractChannelReplicator implements Closeable } } } - } } catch (CancelledKeyException e) { if (LOG.isDebugEnabled()) @@ -266,7 +264,6 @@ final class TcpReplicator extends AbstractChannelReplicator implements Closeable if (!isClosed) closeEarlyAndQuietly(key.channel()); } - } /** @@ -282,7 +279,6 @@ final class TcpReplicator extends AbstractChannelReplicator implements Closeable final int keys = selector.selectNow(); if (keys != 0) return keys; - } return selector.select(selectorTimeout); @@ -321,7 +317,6 @@ final class TcpReplicator extends AbstractChannelReplicator implements Closeable if (LOG.isDebugEnabled()) LOG.debug("", e); } - } catch (Exception e) { if (LOG.isDebugEnabled()) LOG.debug("", e); @@ -350,7 +345,6 @@ final class TcpReplicator extends AbstractChannelReplicator implements Closeable if (LOG.isDebugEnabled()) LOG.debug("sending heartbeat"); - } } @@ -639,7 +633,6 @@ final class TcpReplicator extends AbstractChannelReplicator implements Closeable if (completed) attached.entryWriter.workCompleted(); - } else if (attached.remoteModificationIterator != null) attached.entryWriter.entriesToBuffer(attached.remoteModificationIterator, key); @@ -653,7 +646,6 @@ final class TcpReplicator extends AbstractChannelReplicator implements Closeable if (!attached.entryWriter.hasBytesToWrite() && !attached.entryWriter.isWorkIncomplete()) // TURN OP_WRITE_OFF key.interestOps(key.interestOps() & ~OP_WRITE); - } catch (IOException e) { quietClose(key, e); if (!attached.isServer) @@ -691,7 +683,6 @@ final class TcpReplicator extends AbstractChannelReplicator implements Closeable if (attached.entryWriter.isWorkIncomplete()) return; - } catch (IOException e) { if (!attached.isServer) attached.connector.connectLater(); @@ -813,7 +804,6 @@ final class TcpReplicator extends AbstractChannelReplicator implements Closeable } catch (ClosedChannelException e) { LOG.debug("", e); } - } }); @@ -876,14 +866,12 @@ final class TcpReplicator extends AbstractChannelReplicator implements Closeable if (socketChannel.isOpen()) LOG.error("", e); } - } }); selector.wakeup(); success = true; return socketChannel; - } finally { if (!success) { try { @@ -899,7 +887,6 @@ final class TcpReplicator extends AbstractChannelReplicator implements Closeable } } } - } /** @@ -943,7 +930,6 @@ final class TcpReplicator extends AbstractChannelReplicator implements Closeable if (remoteIdentifier != Byte.MIN_VALUE) TcpReplicator.this.opWriteUpdater.set(remoteIdentifier); } - } /** @@ -1029,7 +1015,6 @@ final class TcpReplicator extends AbstractChannelReplicator implements Closeable // if we have space in the buffer to write more data and we just wrote data into the // buffer then let try and write some more } - } /** @@ -1106,7 +1091,6 @@ final class TcpReplicator extends AbstractChannelReplicator implements Closeable key.interestOps(key.interestOps() & ~OP_WRITE); } } - } catch (Exception e) { LOG.error("", e); } @@ -1257,10 +1241,8 @@ final class TcpReplicator extends AbstractChannelReplicator implements Closeable } catch (Exception e) { LOG.error("", e); } - } } - } else externalizable.readExternalEntry(copies, segmentState, out); @@ -1272,7 +1254,6 @@ final class TcpReplicator extends AbstractChannelReplicator implements Closeable state = NOT_SET; sizeInBytes = 0; } - } /** @@ -1349,7 +1330,6 @@ class StatelessServerConnector { valueWriterWithSize = new WriterWithSize<>(valueSerializationBuilder); this.map = map; this.maxEntrySizeBytes = maxEntrySizeBytes; - } Work processStatelessEvent(final byte eventId, @@ -1378,7 +1358,6 @@ class StatelessServerConnector { case REMOVE_WITHOUT_ACC: return remove(reader); - } final long sizeLocation = reflectTransactionId(reader, writer); @@ -1440,9 +1419,7 @@ class StatelessServerConnector { default: throw new IllegalStateException("unsupported event=" + event); - } - } public Work mapForKey(ByteBufferBytes reader, Bytes writer, long sizeLocation) { @@ -1451,7 +1428,6 @@ class StatelessServerConnector { try { Object result = map.mapForKey(key, function); writer.writeObject(result); - } catch (Throwable e) { LOG.info("", e); return sendException(writer, sizeLocation, e); @@ -1467,7 +1443,6 @@ class StatelessServerConnector { try { Object result = map.updateForKey(key, mutator); writer.writeObject(result); - } catch (Throwable e) { LOG.info("", e); return sendException(writer, sizeLocation, e); @@ -1625,7 +1600,6 @@ class StatelessServerConnector { } writeSizeAndFlags(sizeLocation, false, writer); return null; - } private Work put(Bytes reader) { @@ -1865,7 +1839,6 @@ class StatelessServerConnector { writeHeader(out, sizeLocation, count, false); return true; } - }; } diff --git a/src/main/java/net/openhft/chronicle/map/UdpChannelReplicator.java b/src/main/java/net/openhft/chronicle/map/UdpChannelReplicator.java index e0723a2ef..03028884c 100644 --- a/src/main/java/net/openhft/chronicle/map/UdpChannelReplicator.java +++ b/src/main/java/net/openhft/chronicle/map/UdpChannelReplicator.java @@ -150,7 +150,6 @@ class UdpChannelReplicator extends AbstractChannelReplicator implements Replica. serverConnector.connectLater(); } } - } catch (Exception e) { LOG.error("", e); if (!isClosed) @@ -205,7 +204,6 @@ class UdpChannelReplicator extends AbstractChannelReplicator implements Replica. public void onChange() { // the write have to be enabled on the same thread as the selector shouldEnableOpWrite = true; - } private void enableWrites() { @@ -282,13 +280,11 @@ class UdpChannelReplicator extends AbstractChannelReplicator implements Replica. } catch (ClosedChannelException e) { LOG.error("", e); } - } }); return server; } - } } diff --git a/src/main/java/net/openhft/chronicle/map/UdpReplicator.java b/src/main/java/net/openhft/chronicle/map/UdpReplicator.java index 7a177ddb7..3aa8ef3a3 100644 --- a/src/main/java/net/openhft/chronicle/map/UdpReplicator.java +++ b/src/main/java/net/openhft/chronicle/map/UdpReplicator.java @@ -114,7 +114,6 @@ final class UdpReplicator extends UdpChannelReplicator implements Replica.Modifi externalizable.readExternalEntry(copies, segmentState, out); } - } private static class UdpSocketChannelEntryWriter implements EntryWriter { @@ -173,7 +172,6 @@ final class UdpReplicator extends UdpChannelReplicator implements Replica.Modifi out.limit((int) in.position()); return socketChannel.write(out); - } } diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java index 32a892c39..7a3e89956 100755 --- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java @@ -235,7 +235,6 @@ class VanillaChronicleMap, * called when the header is created */ void onHeaderCreated() { - } long getHeaderSize() { @@ -679,7 +678,6 @@ class VanillaChronicleMap, try (FileOutputStream out = new FileOutputStream(toFile)) { xstream.toXML(entrySet(), out); } - } @Override @@ -694,7 +692,6 @@ class VanillaChronicleMap, try (FileInputStream out = new FileInputStream(fromFile)) { xstream.fromXML(out); } - } private XStreamConverter xStreamConverter; @@ -761,7 +758,6 @@ class VanillaChronicleMap, writer.addAttribute("type", value.getClass().getCanonicalName()); marshallingContext.convertAnother(value); writer.endNode(); - } else if (EntrySet.class .isAssignableFrom(o.getClass())) { @@ -770,7 +766,6 @@ class VanillaChronicleMap, marshallingContext.convertAnother(e); writer.endNode(); } - } } @@ -838,7 +833,6 @@ class VanillaChronicleMap, throw new ConversionException(e); } } else return (E) unmarshallingContext.convertAnother(null, clazz); - } }; diff --git a/src/test/java/net/openhft/chronicle/map/BitUnitTest.java b/src/test/java/net/openhft/chronicle/map/BitUnitTest.java index 8341c13c2..fe68d394c 100644 --- a/src/test/java/net/openhft/chronicle/map/BitUnitTest.java +++ b/src/test/java/net/openhft/chronicle/map/BitUnitTest.java @@ -23,14 +23,11 @@ import junit.framework.TestCase; public class BitUnitTest extends TestCase { public void testToBits() throws Exception { - } public void testToMegaBits() throws Exception { - } public void testToGigaBits() throws Exception { - } } \ No newline at end of file diff --git a/src/test/java/net/openhft/chronicle/map/ByteableIntValueMarshaller.java b/src/test/java/net/openhft/chronicle/map/ByteableIntValueMarshaller.java index 3998e1d9d..4acbae9ac 100644 --- a/src/test/java/net/openhft/chronicle/map/ByteableIntValueMarshaller.java +++ b/src/test/java/net/openhft/chronicle/map/ByteableIntValueMarshaller.java @@ -58,7 +58,6 @@ enum ByteableIntValueMarshaller implements BytesMarshaller { } catch (Exception e) { throw new IllegalStateException(e); } - } } diff --git a/src/test/java/net/openhft/chronicle/map/ByteableLongValueMarshaller.java b/src/test/java/net/openhft/chronicle/map/ByteableLongValueMarshaller.java index b0eaf2e9f..656610e67 100644 --- a/src/test/java/net/openhft/chronicle/map/ByteableLongValueMarshaller.java +++ b/src/test/java/net/openhft/chronicle/map/ByteableLongValueMarshaller.java @@ -58,7 +58,6 @@ enum ByteableLongValueMarshaller implements BytesMarshaller { } catch (Exception e) { throw new IllegalStateException(e); } - } } diff --git a/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java b/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java index 75b05edc7..d4e787013 100644 --- a/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java +++ b/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java @@ -58,7 +58,6 @@ public class CHMMetaDataTest { map.close(); file.delete(); } - } private static class StringStringMapEventListener diff --git a/src/test/java/net/openhft/chronicle/map/CHMTest5.java b/src/test/java/net/openhft/chronicle/map/CHMTest5.java index b6fd2b907..27fb7abeb 100644 --- a/src/test/java/net/openhft/chronicle/map/CHMTest5.java +++ b/src/test/java/net/openhft/chronicle/map/CHMTest5.java @@ -89,7 +89,6 @@ public class CHMTest5 { if (!locked) { System.out.println("Unable to acquire a lock on the time array - exiting"); System.exit(0); - } try { //we've got the lock, now copy the array @@ -119,7 +118,6 @@ public class CHMTest5 { if (!locked) { System.out.println("Unable to acquire a lock on the time array - exiting"); System.exit(0); - } try { //we've got the lock, now copy the array @@ -155,7 +153,6 @@ public class CHMTest5 { if (!locked) { System.out.println("Unable to acquire a lock on the time array - exiting"); System.exit(0); - } try { data.setTimeAt(slotindex, timenow); @@ -197,7 +194,6 @@ public class CHMTest5 { if (!locked) { System.out.println("Unable to acquire a lock on the time array - exiting"); System.exit(0); - } try { if (lastUpdateTime == data.getTimeAt(slotindex)) { diff --git a/src/test/java/net/openhft/chronicle/map/CHMTestIterator1.java b/src/test/java/net/openhft/chronicle/map/CHMTestIterator1.java index 264edc73e..7bb59141b 100644 --- a/src/test/java/net/openhft/chronicle/map/CHMTestIterator1.java +++ b/src/test/java/net/openhft/chronicle/map/CHMTestIterator1.java @@ -50,11 +50,9 @@ public class CHMTestIterator1 { for (Map.Entry entry : chm.entrySet()) { entry.getKey(); entry.getValue(); - } long time = System.nanoTime() - start; System.out.println("Average iteration time was " + time / runs / 1e3 + "us, for " + runs / 1e6 + "m entries"); - } } diff --git a/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java b/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java index 02f9579bb..418ad20bb 100644 --- a/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java +++ b/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java @@ -279,7 +279,6 @@ public class CHMUseCasesTest { }); fail("Update of Integer not supported"); } catch (Exception todoMoreSpecificException) { - } assertEquals(null, map.putLater(3, 4).get()); @@ -328,7 +327,6 @@ public class CHMUseCasesTest { }); fail("Update of Long not supported"); } catch (Exception todoMoreSpecificException) { - } assertEquals(null, map.putLater(3L, 4L).get()); @@ -377,7 +375,6 @@ public class CHMUseCasesTest { }); fail("Update of Double not supported"); } catch (Exception todoMoreSpecificException) { - } assertEquals(null, map.putLater(3.0, 4.0).get()); @@ -1415,7 +1412,6 @@ public class CHMUseCasesTest { */ @Test public void testBeanBeanMap() { - } @Test diff --git a/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java b/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java index e75f095f6..cc1d5db98 100644 --- a/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java +++ b/src/test/java/net/openhft/chronicle/map/ChannelReplicationTest.java @@ -130,7 +130,6 @@ public class ChannelReplicationTest { assertTrue("map1a.empty", !map1a.isEmpty()); assertTrue("map2a.empty", !map2a.isEmpty()); - } /** @@ -147,7 +146,6 @@ public class ChannelReplicationTest { break; Thread.sleep(1); } - } } diff --git a/src/test/java/net/openhft/chronicle/map/ChronicleMapImportExportTest.java b/src/test/java/net/openhft/chronicle/map/ChronicleMapImportExportTest.java index 9db2fabbe..d48a1afdf 100644 --- a/src/test/java/net/openhft/chronicle/map/ChronicleMapImportExportTest.java +++ b/src/test/java/net/openhft/chronicle/map/ChronicleMapImportExportTest.java @@ -45,7 +45,6 @@ public class ChronicleMapImportExportTest { } finally { file.delete(); } - } @Test @@ -75,7 +74,6 @@ public class ChronicleMapImportExportTest { } finally { file.delete(); } - } @Test @@ -107,7 +105,6 @@ public class ChronicleMapImportExportTest { } finally { file.delete(); } - } @Test @@ -135,7 +132,6 @@ public class ChronicleMapImportExportTest { } finally { file.delete(); } - } @Test @@ -164,7 +160,6 @@ public class ChronicleMapImportExportTest { } finally { file.delete(); } - } @Ignore("this type of off heap reference is not currently supported") @@ -202,7 +197,6 @@ public class ChronicleMapImportExportTest { } finally { file.delete(); } - } } diff --git a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java index 33893a3e5..30e353e5d 100755 --- a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java @@ -1484,9 +1484,7 @@ public class ChronicleMapTest { try (WriteContext context = map.acquireUsingLocked("one", "")) { // do nothing } - } - } @Test diff --git a/src/test/java/net/openhft/chronicle/map/ConcurrentMap8Test.java b/src/test/java/net/openhft/chronicle/map/ConcurrentMap8Test.java index e993da2f6..03836a343 100644 --- a/src/test/java/net/openhft/chronicle/map/ConcurrentMap8Test.java +++ b/src/test/java/net/openhft/chronicle/map/ConcurrentMap8Test.java @@ -56,7 +56,6 @@ public class ConcurrentMap8Test extends JSR166TestCase { } // return new ConcurrentMap(5); - } private static ConcurrentMap newIntegerStringMap() { @@ -75,7 +74,6 @@ public class ConcurrentMap8Test extends JSR166TestCase { } catch (IOException e) { throw new IllegalStateException(e); } - } *//** diff --git a/src/test/java/net/openhft/chronicle/map/EventListenerTestWithTCPSocketReplication.java b/src/test/java/net/openhft/chronicle/map/EventListenerTestWithTCPSocketReplication.java index 2b038895b..893b96a30 100644 --- a/src/test/java/net/openhft/chronicle/map/EventListenerTestWithTCPSocketReplication.java +++ b/src/test/java/net/openhft/chronicle/map/EventListenerTestWithTCPSocketReplication.java @@ -118,7 +118,6 @@ public class EventListenerTestWithTCPSocketReplication { Assert.assertTrue("The eventListener.onPut should have been called", putWasCalled.get()); Assert.assertEquals(Integer.valueOf(5), keyRef.get()); Assert.assertEquals("EXAMPLE", valueRef.get()); - } @Test @@ -132,7 +131,6 @@ public class EventListenerTestWithTCPSocketReplication { ChronicleMapBuilder map1Builder = serverBuilder(); map1 = map1Builder.create(); - } // ---------- SERVER2 2 on the same server as ---------- @@ -150,7 +148,6 @@ public class EventListenerTestWithTCPSocketReplication { Assert.assertEquals(Integer.valueOf(5), keyRef.get()); Assert.assertEquals("EXAMPLE", valueRef.get()); Assert.assertEquals("WILL_GET_OVER-WRITTEN", replacedValueRef.get()); - } @Test @@ -162,7 +159,6 @@ public class EventListenerTestWithTCPSocketReplication { // we connect the maps via a TCP socket connection on port 8077 map1 = serverBuilder().create(); - } // ---------- SERVER2 2 on the same server as ---------- @@ -181,7 +177,6 @@ public class EventListenerTestWithTCPSocketReplication { Assert.assertEquals(Integer.valueOf(5), keyRef.get()); Assert.assertEquals("small", replacedValueRef.get()); Assert.assertEquals("EXAMPLE", valueRef.get()); - } @Test @@ -196,7 +191,6 @@ public class EventListenerTestWithTCPSocketReplication { ChronicleMapBuilder map1Builder = serverBuilder(); map1 = map1Builder.create(); - } // ---------- SERVER2 2 on the same server as ---------- diff --git a/src/test/java/net/openhft/chronicle/map/Issue42Test.java b/src/test/java/net/openhft/chronicle/map/Issue42Test.java index c9d0800ef..0bdfffb0f 100755 --- a/src/test/java/net/openhft/chronicle/map/Issue42Test.java +++ b/src/test/java/net/openhft/chronicle/map/Issue42Test.java @@ -48,6 +48,5 @@ public class Issue42Test { Assert.assertEquals(s, map.get(s)); } } - } } diff --git a/src/test/java/net/openhft/chronicle/map/KeySizesTest.java b/src/test/java/net/openhft/chronicle/map/KeySizesTest.java index b9af5ffc1..043d0fe53 100644 --- a/src/test/java/net/openhft/chronicle/map/KeySizesTest.java +++ b/src/test/java/net/openhft/chronicle/map/KeySizesTest.java @@ -50,6 +50,5 @@ public class KeySizesTest { } ((Closeable) map).close(); - } } diff --git a/src/test/java/net/openhft/chronicle/map/MapByNameTest.java b/src/test/java/net/openhft/chronicle/map/MapByNameTest.java index 10b2ab75f..6fe67ea66 100644 --- a/src/test/java/net/openhft/chronicle/map/MapByNameTest.java +++ b/src/test/java/net/openhft/chronicle/map/MapByNameTest.java @@ -81,7 +81,6 @@ public class MapByNameTest { // mapByName.add(builder); ChronicleMap myMap2 = mapByName.from("myMap"); - } public static void main(String... args) throws IOException, InterruptedException, TimeoutException { @@ -107,7 +106,6 @@ public class MapByNameTest { System.out.print(map); map.close(); - } } diff --git a/src/test/java/net/openhft/chronicle/map/NodeDiscoveryBroadcasterTest.java b/src/test/java/net/openhft/chronicle/map/NodeDiscoveryBroadcasterTest.java index 085780062..ec3b01667 100644 --- a/src/test/java/net/openhft/chronicle/map/NodeDiscoveryBroadcasterTest.java +++ b/src/test/java/net/openhft/chronicle/map/NodeDiscoveryBroadcasterTest.java @@ -104,7 +104,6 @@ public class NodeDiscoveryBroadcasterTest extends TestCase { // in this case given that there is only this node in the grid and one node joining, // it will only be the node that has the bootstrap and this node, who's data will be sent server2BytesExternalizable.writeMarshallable(udpData); - } // SERER1 @@ -120,7 +119,6 @@ public class NodeDiscoveryBroadcasterTest extends TestCase { Assert.assertTrue(server1BytesExternalizable.getRemoteNodes().identifiers().get (SERVER2_IDENTIFER)); - } // SERVER 1 @@ -142,7 +140,6 @@ public class NodeDiscoveryBroadcasterTest extends TestCase { bytesExternalizable.sendBootStrap(proposedNodes); bytesExternalizable.writeMarshallable(udpData); - } // SERVER 2 - is the node already in the cluster @@ -169,7 +166,6 @@ public class NodeDiscoveryBroadcasterTest extends TestCase { // in this case given that there is only this node in the grid and one node joining, // it will only be the node that has the bootstrap and this node, who's data will be sent server2BytesExternalizable.writeMarshallable(udpData); - } // SERVER 1 @@ -187,9 +183,7 @@ public class NodeDiscoveryBroadcasterTest extends TestCase { Assert.assertTrue(server1BytesExternalizable.proposedIdentifiersWithHost.values().contains (new DiscoveryNodeBytesMarshallable.ProposedNodes(server1AddressAndPort, (byte) PROPOSED_IDENTIFIER))); - } - } } diff --git a/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java b/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java index 614a61910..5eb183e70 100644 --- a/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java +++ b/src/test/java/net/openhft/chronicle/map/PostChannelCreationTest.java @@ -94,7 +94,6 @@ public class PostChannelCreationTest { .entries(1000) .instance().replicatedViaChannel(hubB.createChannel((short) 2)).create(); } - } @After @@ -130,7 +129,6 @@ public class PostChannelCreationTest { assertTrue("map1a.empty", !map1a.isEmpty()); assertTrue("map2a.empty", !map2a.isEmpty()); - } /** @@ -147,7 +145,6 @@ public class PostChannelCreationTest { break; Thread.sleep(1); } - } } diff --git a/src/test/java/net/openhft/chronicle/map/ReplicatedChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/ReplicatedChronicleMapTest.java index 0d5364399..6e7174d7c 100644 --- a/src/test/java/net/openhft/chronicle/map/ReplicatedChronicleMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/ReplicatedChronicleMapTest.java @@ -38,13 +38,11 @@ public class ReplicatedChronicleMapTest extends JSR166TestCase { ChronicleMap newShmIntString() throws IOException { return ChronicleMapBuilder.of(Integer.class, CharSequence.class) .create(); - } ChronicleMap newShmStringString() throws IOException { return ChronicleMapBuilder.of(CharSequence.class, CharSequence.class) .create(); - } /** diff --git a/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java b/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java index 94f72aea3..0b2a7acc8 100644 --- a/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java +++ b/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java @@ -78,7 +78,6 @@ public class ReplicationCheckingMap implements ChronicleMap { } } ); - } public R check(Call instance) { @@ -98,10 +97,8 @@ public class ReplicationCheckingMap implements ChronicleMap { } catch (InterruptedException e) { e.printStackTrace(); } - } else Thread.yield(); - } Assert.assertEquals(map1, map2); @@ -112,7 +109,6 @@ public class ReplicationCheckingMap implements ChronicleMap { Assert.assertEquals(r1.toString(), r2.toString()); return (R) r1; - } @Override @@ -125,7 +121,6 @@ public class ReplicationCheckingMap implements ChronicleMap { } } ); - } @Override @@ -138,7 +133,6 @@ public class ReplicationCheckingMap implements ChronicleMap { } } ); - } @Override @@ -151,7 +145,6 @@ public class ReplicationCheckingMap implements ChronicleMap { } } ); - } @Override @@ -164,7 +157,6 @@ public class ReplicationCheckingMap implements ChronicleMap { } } ); - } @Override @@ -198,7 +190,6 @@ public class ReplicationCheckingMap implements ChronicleMap { } } ); - } @NotNull @@ -212,7 +203,6 @@ public class ReplicationCheckingMap implements ChronicleMap { } } ); - } @NotNull @@ -226,7 +216,6 @@ public class ReplicationCheckingMap implements ChronicleMap { } } ); - } @Override diff --git a/src/test/java/net/openhft/chronicle/map/SerializerTest.java b/src/test/java/net/openhft/chronicle/map/SerializerTest.java index 988658fe4..ca7bf70a0 100644 --- a/src/test/java/net/openhft/chronicle/map/SerializerTest.java +++ b/src/test/java/net/openhft/chronicle/map/SerializerTest.java @@ -111,9 +111,7 @@ public class SerializerTest { Object actual = keyReaderWithSize.read(in, null); Assert.assertEquals(actual, key); - } - } public static class MyTestClassExternalizable implements Externalizable { @@ -229,7 +227,6 @@ public class SerializerTest { MyTestClass delegate; public MyTestClassObjectGraph() { - } MyTestClassObjectGraph(int a) { diff --git a/src/test/java/net/openhft/chronicle/map/SingleMapChannelTest.java b/src/test/java/net/openhft/chronicle/map/SingleMapChannelTest.java index 3c841203a..63526f445 100644 --- a/src/test/java/net/openhft/chronicle/map/SingleMapChannelTest.java +++ b/src/test/java/net/openhft/chronicle/map/SingleMapChannelTest.java @@ -115,7 +115,6 @@ public class SingleMapChannelTest { Assert.assertEquals("map1a=map1b", map1a, map1b); assertTrue("map1a.empty", !map1a.isEmpty()); - } /** @@ -132,7 +131,6 @@ public class SingleMapChannelTest { break; Thread.sleep(1); } - } } diff --git a/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java b/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java index 2e9b0bdad..0b9b995ab 100644 --- a/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java +++ b/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java @@ -169,7 +169,6 @@ public class StatelessClientTest { assertEquals("some value=" + next.getKey(), next.getValue()); assertEquals(SIZE, entries.size()); - } } } @@ -200,7 +199,6 @@ public class StatelessClientTest { Collection values = statelessMap.values(); assertEquals(values.size(), SIZE); - } } } @@ -230,7 +228,6 @@ public class StatelessClientTest { final Set keys = statelessMap.keySet(); assertEquals(keys.size(), payload.size()); - } } } @@ -271,11 +268,8 @@ public class StatelessClientTest { assertEquals("EXAMPLE-10", statelessMap.get(10)); assertEquals(1, statelessMap.size()); - } - } - } @Test(timeout = 10000) @@ -296,11 +290,8 @@ public class StatelessClientTest { assertEquals(Collections.singletonMap("hello", "world"), statelessMap.get("hello")); assertEquals(1, statelessMap.size()); - } - } - } @Test(timeout = 10000) @@ -328,11 +319,8 @@ public class StatelessClientTest { assertEquals(data, serverMap.get("hello")); assertEquals(1, statelessMap.size()); - } - } - } @Test(timeout = 10000) @@ -360,7 +348,6 @@ public class StatelessClientTest { assertEquals("some value=" + value, statelessMap.get(value)); assertEquals(SIZE, statelessMap.size()); - } } } @@ -391,10 +378,8 @@ public class StatelessClientTest { assertEquals("some value=" + value, statelessMap.get(value)); assertEquals(SIZE, statelessMap.size()); - } } - } @Test(timeout = 10000) @@ -412,7 +397,6 @@ public class StatelessClientTest { assertEquals("some value", statelessMap.get(1)); assertEquals(1, statelessMap.size()); - } } } @@ -437,10 +421,8 @@ public class StatelessClientTest { assertEquals(null, statelessMap.get(1)); assertEquals(0, statelessMap.size()); - } } - } @Test(timeout = 10000) @@ -463,10 +445,8 @@ public class StatelessClientTest { assertEquals(null, statelessMap.getLater(1).get()); assertEquals(0, statelessMap.size()); - } } - } @Test @@ -483,10 +463,8 @@ public class StatelessClientTest { CharSequence oldValue = statelessMap.putLater(1, "some value").get(); assertEquals("some value", statelessMap.get(1)); assertEquals(1, statelessMap.size()); - } } - } @Test(timeout = 10000) @@ -503,10 +481,8 @@ public class StatelessClientTest { statelessMap.removeLater(1).get(); assertEquals(null, statelessMap.get(1)); assertEquals(0, statelessMap.size()); - } } - } @Test(timeout = 10000) @@ -523,7 +499,6 @@ public class StatelessClientTest { .replication((byte) 2, TcpTransportAndNetworkConfig.of(8056)).create(); serverMap2 = ChronicleMapBuilder.of(Integer.class, CharSequence.class) .replication((byte) 2, TcpTransportAndNetworkConfig.of(8077)).create(); - } // stateless client @@ -549,6 +524,5 @@ public class StatelessClientTest { serverMap1.close(); serverMap2.close(); - } } \ No newline at end of file diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3VoidValueTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3VoidValueTest.java index e807e25dd..781bdccbd 100755 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3VoidValueTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3VoidValueTest.java @@ -85,7 +85,6 @@ public class TCPSocketReplication3VoidValueTest { assertEquals(map3, map2); assertTrue(!map1.isEmpty()); - } @Test @@ -107,7 +106,6 @@ public class TCPSocketReplication3VoidValueTest { assertEquals(map3, map3); assertTrue(!map1.isEmpty()); - } @Test @@ -128,7 +126,6 @@ public class TCPSocketReplication3VoidValueTest { assertEquals(map3, map3); assertTrue(!map1.isEmpty()); - } private boolean waitTillEqual(final int timeOutMs) throws InterruptedException { diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayPutReturnsNullTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayPutReturnsNullTest.java index e25494f66..b5548275f 100755 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayPutReturnsNullTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayPutReturnsNullTest.java @@ -100,7 +100,6 @@ public class TCPSocketReplication3wayPutReturnsNullTest { assertEquals(map1, map2); assertEquals(map3, map2); assertTrue(!map1.isEmpty()); - } @Test @@ -124,7 +123,6 @@ public class TCPSocketReplication3wayPutReturnsNullTest { assertEquals(map1, map2); assertEquals(map3, map3); assertTrue(!map1.isEmpty()); - } @Test @@ -149,7 +147,6 @@ public class TCPSocketReplication3wayPutReturnsNullTest { assertEquals(map1, map2); assertEquals(map3, map3); assertTrue(!map1.isEmpty()); - } private void waitTillEqual(final int timeOutMs) throws InterruptedException { @@ -161,7 +158,6 @@ public class TCPSocketReplication3wayPutReturnsNullTest { break; Thread.sleep(1); } - } } diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayTest.java index d5386c5ad..e16827f66 100755 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication3wayTest.java @@ -84,7 +84,6 @@ public class TCPSocketReplication3wayTest { assertEquals(map1, map2); assertEquals(map3, map2); assertTrue(!map1.isEmpty()); - } @Test @@ -108,7 +107,6 @@ public class TCPSocketReplication3wayTest { assertEquals(map1, map2); assertEquals(map3, map3); assertTrue(!map1.isEmpty()); - } @Test @@ -131,7 +129,6 @@ public class TCPSocketReplication3wayTest { assertEquals(map1, map2); assertEquals(map3, map3); assertTrue(!map1.isEmpty()); - } @Test @@ -156,7 +153,6 @@ public class TCPSocketReplication3wayTest { assertEquals(map1, map2); assertEquals(map3, map3); assertTrue(!map1.isEmpty()); - } private void waitTillEqual(final int timeOutMs) throws InterruptedException { @@ -168,7 +164,6 @@ public class TCPSocketReplication3wayTest { break; Thread.sleep(1); } - } } diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication4WayMapTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication4WayMapTest.java index f3fed2f50..0891b2908 100644 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplication4WayMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplication4WayMapTest.java @@ -102,7 +102,6 @@ public class TCPSocketReplication4WayMapTest { assertEquals("map3", map1, map3); assertEquals("map4", map1, map4); assertTrue("map2.empty", !map2.isEmpty()); - } @Test @@ -119,7 +118,6 @@ public class TCPSocketReplication4WayMapTest { assertEquals("map3", map1, map3); assertEquals("map4", map1, map4); assertTrue("map2.empty", !map2.isEmpty()); - } @Test @@ -141,7 +139,6 @@ public class TCPSocketReplication4WayMapTest { assertEquals("map3", map1, map3); assertEquals("map4", map1, map4); assertTrue("map2.empty", !map2.isEmpty()); - } /** @@ -163,7 +160,6 @@ public class TCPSocketReplication4WayMapTest { break; Thread.sleep(1); } - } } diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationBootStrapTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationBootStrapTest.java index ac06b72bd..1f0d1fcbd 100644 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationBootStrapTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationBootStrapTest.java @@ -85,7 +85,6 @@ public class TCPSocketReplicationBootStrapTest { // add data into it waitTillEqual(5000); assertEquals("ADDED WHEN DISCONNECTED TO MAP1", map1.get(11)); - } @Test @@ -138,7 +137,6 @@ public class TCPSocketReplicationBootStrapTest { // add data into it waitTillEqual(20000000); assertEquals("ADDED WHEN DISCONNECTED TO MAP1", map1.get(11)); - } @After @@ -179,7 +177,6 @@ public class TCPSocketReplicationBootStrapTest { break; Thread.sleep(1); } - } } diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationIntValueTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationIntValueTest.java index 59f8cb9b8..929546baf 100644 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationIntValueTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationIntValueTest.java @@ -135,7 +135,6 @@ public class TCPSocketReplicationIntValueTest { assertEquals(map1, map2); assertTrue(!map1.isEmpty()); - } @Test @@ -150,7 +149,6 @@ public class TCPSocketReplicationIntValueTest { assertEquals(map1, map2); assertTrue(!map2.isEmpty()); - } /** @@ -190,7 +188,6 @@ public class TCPSocketReplicationIntValueTest { map.remove(set(rnd.nextInt(Builder.SIZE))); } } - } waitTillEqual(10000); @@ -199,7 +196,6 @@ public class TCPSocketReplicationIntValueTest { //assertTrue("timeTaken="+time, time < 2200); System.out.println("\ntime taken millis=" + time); - } } diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationNativeTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationNativeTest.java index a91205cf3..c7d7a047a 100644 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationNativeTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationNativeTest.java @@ -60,7 +60,6 @@ public class TCPSocketReplicationNativeTest { map2 = ChronicleMapBuilder.of(Integer.class, LongValue.class) .replication((byte) 2, tcpConfig2).create(); - } @After @@ -104,7 +103,6 @@ public class TCPSocketReplicationNativeTest { assertEquals(map1, map2); assertTrue(!map1.isEmpty()); - } @Test @@ -129,7 +127,6 @@ public class TCPSocketReplicationNativeTest { assertEquals(map1, map2); assertTrue(!map1.isEmpty()); - } /** @@ -145,7 +142,6 @@ public class TCPSocketReplicationNativeTest { break; Thread.sleep(1); } - } } diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationPostConnectionTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationPostConnectionTest.java index 1befdc59f..c86ca8e92 100644 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationPostConnectionTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationPostConnectionTest.java @@ -67,7 +67,6 @@ public class TCPSocketReplicationPostConnectionTest { assertEquals(map1, map2); assertTrue(!map1.isEmpty()); - } @Test @@ -82,7 +81,6 @@ public class TCPSocketReplicationPostConnectionTest { assertEquals(map1, map2); assertTrue(!map1.isEmpty()); - } @Test @@ -97,7 +95,6 @@ public class TCPSocketReplicationPostConnectionTest { Thread.sleep(1); map1.put(5, "EXAMPLE-2"); - } Thread.sleep(1); @@ -112,7 +109,6 @@ public class TCPSocketReplicationPostConnectionTest { assertEquals(map1, map2); assertTrue(!map1.isEmpty()); assertTrue(map2.get(6).equals("EXAMPLE-1")); - } @After @@ -142,7 +138,6 @@ public class TCPSocketReplicationPostConnectionTest { break; Thread.sleep(1); } - } } diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java index 071e28fa9..c493e23b7 100644 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java @@ -114,7 +114,6 @@ public class TCPSocketReplicationTest { assertEquals(map1, map2); assertTrue(!map1.isEmpty()); - } @Test @@ -129,7 +128,6 @@ public class TCPSocketReplicationTest { assertEquals(map1, map2); assertTrue(!map2.isEmpty()); - } /** @@ -145,7 +143,6 @@ public class TCPSocketReplicationTest { break; Thread.sleep(1); } - } // TODO test this with larger sizes. @@ -170,11 +167,9 @@ public class TCPSocketReplicationTest { break; } } - } System.out.println(""); waitTillEqual(10000); - } } diff --git a/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTest.java b/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTest.java index eaa80d695..643cc3d15 100644 --- a/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTest.java +++ b/src/test/java/net/openhft/chronicle/map/TimeBasedReplicationTest.java @@ -144,7 +144,6 @@ public class TimeBasedReplicationTest extends JSR166TestCase { current(timeProvider); assertEquals(map.size(), 1); assertEquals("value-1", map.get("key-1")); - } } @@ -204,7 +203,6 @@ public class TimeBasedReplicationTest extends JSR166TestCase { assertEquals(1, map.size()); assertEquals("value-1", map.get("key-1")); } - } @Test @@ -298,7 +296,6 @@ public class TimeBasedReplicationTest extends JSR166TestCase { assertEquals("value-1", map.get("key-1")); assertEquals(1, map.size(), 0); - } } diff --git a/src/test/java/net/openhft/chronicle/map/TwoMapOnDifferentServersTest.java b/src/test/java/net/openhft/chronicle/map/TwoMapOnDifferentServersTest.java index 3c11977dd..e683a2b58 100644 --- a/src/test/java/net/openhft/chronicle/map/TwoMapOnDifferentServersTest.java +++ b/src/test/java/net/openhft/chronicle/map/TwoMapOnDifferentServersTest.java @@ -109,7 +109,6 @@ public class TwoMapOnDifferentServersTest { break; Thread.sleep(1); } - } } \ No newline at end of file diff --git a/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java b/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java index 2e8e741e0..85d572a40 100644 --- a/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java +++ b/src/test/java/net/openhft/chronicle/map/UDPSocketReplicationTest.java @@ -84,7 +84,6 @@ public class UDPSocketReplicationTest { map2.put(i * 2, "E"); System.out.println("" + map2); } - }*/ } diff --git a/src/test/java/net/openhft/chronicle/map/example/ChannelReplicationTest.java b/src/test/java/net/openhft/chronicle/map/example/ChannelReplicationTest.java index c4c19398b..71868871f 100644 --- a/src/test/java/net/openhft/chronicle/map/example/ChannelReplicationTest.java +++ b/src/test/java/net/openhft/chronicle/map/example/ChannelReplicationTest.java @@ -81,7 +81,6 @@ public class ChannelReplicationTest { .replicatedViaChannel(hubOnServer1.createChannel(channel2)).create(); favoriteComputerServer1.put("peter", "dell"); - } // server 2 with identifier = 2 @@ -176,7 +175,6 @@ public class ChannelReplicationTest { .replicatedViaChannel(hubOnServer1.createChannel(channel2)).create(); favoriteComputerServer1.put("peter", "dell"); - } // server 2 with identifier = 2 @@ -231,7 +229,6 @@ public class ChannelReplicationTest { favoriteComputerServer3 = smallStringToStringMapBuilder.instance() .replicatedViaChannel(hubOnServer3.createChannel(channel2)).create(); - } // allow time for the recompilation to resolve @@ -256,7 +253,6 @@ public class ChannelReplicationTest { favoriteColourServer1.close(); favoriteColourServer2.close(); - } @Test @@ -294,7 +290,6 @@ public class ChannelReplicationTest { .replicatedViaChannel(hubOnServer1.createChannel(channel2)).create(); favoriteComputerServer1.put("peter", "dell"); - } // server 2 with identifier = 2 diff --git a/src/test/java/net/openhft/chronicle/map/jrs166/map/ChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/jrs166/map/ChronicleMapTest.java index 3310b689e..d6701422f 100644 --- a/src/test/java/net/openhft/chronicle/map/jrs166/map/ChronicleMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/jrs166/map/ChronicleMapTest.java @@ -49,7 +49,6 @@ public class ChronicleMapTest extends JSR166TestCase { static ChronicleMap newShmIntString(int size) throws IOException { return ChronicleMapBuilder.of(Integer.class, CharSequence.class) .entries(size).create(); - } static ChronicleMap newShmListBoolean(int size) throws IOException { @@ -99,7 +98,6 @@ public class ChronicleMapTest extends JSR166TestCase { map.clear(); assertEquals(0, map.size()); - } } @@ -112,7 +110,6 @@ public class ChronicleMapTest extends JSR166TestCase { assertTrue(map.containsValue("A")); assertFalse(map.containsValue("Z")); } - } /** @@ -213,7 +210,6 @@ public class ChronicleMapTest extends JSR166TestCase { assertTrue(s.contains("C")); assertTrue(s.contains("D")); assertTrue(s.contains("E")); - } } @@ -230,7 +226,6 @@ public class ChronicleMapTest extends JSR166TestCase { assertTrue(map.containsKey(((java.util.Map.Entry) (ar[i])).getKey())); assertTrue(map.containsValue(((java.util.Map.Entry) (ar[i])).getValue())); } - } } @@ -269,7 +264,6 @@ public class ChronicleMapTest extends JSR166TestCase { (e.getKey().equals(five) && e.getValue().equals("E")) ); } - } } @@ -288,7 +282,6 @@ public class ChronicleMapTest extends JSR166TestCase { assertTrue(empty.containsKey(three)); assertTrue(empty.containsKey(four)); assertTrue(empty.containsKey(five)); - } } } @@ -301,7 +294,6 @@ public class ChronicleMapTest extends JSR166TestCase { try (ChronicleMap map = map5()) { map.putIfAbsent(six, "Z"); assertTrue(map.containsKey(six)); - } } @@ -323,7 +315,6 @@ public class ChronicleMapTest extends JSR166TestCase { try (ChronicleMap map = map5()) { assertNull(map.replace(six, "Z")); assertFalse(map.containsKey(six)); - } } @@ -349,7 +340,6 @@ public class ChronicleMapTest extends JSR166TestCase { assertEquals("A", map.get(one)); assertFalse(map.replace(one, "Z", "Z")); assertEquals("A", map.get(one)); - } } @@ -363,7 +353,6 @@ public class ChronicleMapTest extends JSR166TestCase { assertEquals("A", map.get(one)); assertTrue(map.replace(one, "A", "Z")); assertEquals("Z", map.get(one)); - } } @@ -377,7 +366,6 @@ public class ChronicleMapTest extends JSR166TestCase { map.remove(five); assertEquals(4, map.size()); assertFalse(map.containsKey(five)); - } } @@ -449,7 +437,6 @@ public class ChronicleMapTest extends JSR166TestCase { for (int i = 1; i <= 5; ++i) { assertTrue(s.contains(String.valueOf(i))); } - } } @@ -464,7 +451,6 @@ public class ChronicleMapTest extends JSR166TestCase { shouldThrow(); } catch (NullPointerException success) { } - } /** diff --git a/src/test/java/net/openhft/chronicle/map/jrs166/map/MapCheck.java b/src/test/java/net/openhft/chronicle/map/jrs166/map/MapCheck.java index fbf312339..6f065768f 100644 --- a/src/test/java/net/openhft/chronicle/map/jrs166/map/MapCheck.java +++ b/src/test/java/net/openhft/chronicle/map/jrs166/map/MapCheck.java @@ -121,7 +121,6 @@ public class MapCheck { static Map newMap() { try { return ChronicleMapBuilder.of(Object.class, Object.class).create(); - } catch (Exception e) { throw new RuntimeException("Can't instantiate CHM : " + e); } @@ -736,7 +735,6 @@ public class MapCheck { else ((Stats) st).addTime(elapsed, numOps); } - } static final class Stats { diff --git a/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java index 26155b49b..da5d24a83 100755 --- a/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/jrs166/map/StatelessChronicleMapTest.java @@ -239,7 +239,6 @@ public class StatelessChronicleMapTest extends JSR166TestCase { .statelessClient(new InetSocketAddress("localhost", port)).create(); return new SingleCloseMap(statelessMap, statelessMap, serverMap); - } static ChronicleMap newStrStrMap(int port) throws @@ -303,7 +302,6 @@ public class StatelessChronicleMapTest extends JSR166TestCase { assertFalse(map.isEmpty()); assertEquals(5, map.size()); return map; - } static int s_port = 11050; @@ -348,7 +346,6 @@ public class StatelessChronicleMapTest extends JSR166TestCase { map.clear(); assertEquals(0, map.size()); - } } @@ -361,7 +358,6 @@ public class StatelessChronicleMapTest extends JSR166TestCase { assertTrue(map.containsValue("A")); assertFalse(map.containsValue("Z")); } - } /** @@ -462,7 +458,6 @@ public class StatelessChronicleMapTest extends JSR166TestCase { assertTrue(s.contains("C")); assertTrue(s.contains("D")); assertTrue(s.contains("E")); - } } @@ -479,7 +474,6 @@ public class StatelessChronicleMapTest extends JSR166TestCase { assertTrue(map.containsKey(((java.util.Map.Entry) (ar[i])).getKey())); assertTrue(map.containsValue(((java.util.Map.Entry) (ar[i])).getValue())); } - } } @@ -518,7 +512,6 @@ public class StatelessChronicleMapTest extends JSR166TestCase { (e.getKey().equals(five) && e.getValue().equals("E")) ); } - } } @@ -537,7 +530,6 @@ public class StatelessChronicleMapTest extends JSR166TestCase { assertTrue(empty.containsKey(three)); assertTrue(empty.containsKey(four)); assertTrue(empty.containsKey(five)); - } } } @@ -550,7 +542,6 @@ public class StatelessChronicleMapTest extends JSR166TestCase { try (ChronicleMap map = map5(s_port++)) { map.putIfAbsent(six, "Z"); assertTrue(map.containsKey(six)); - } } @@ -572,7 +563,6 @@ public class StatelessChronicleMapTest extends JSR166TestCase { try (ChronicleMap map = map5(s_port++)) { assertNull(map.replace(six, "Z")); assertFalse(map.containsKey(six)); - } } @@ -597,7 +587,6 @@ public class StatelessChronicleMapTest extends JSR166TestCase { assertEquals("A", map.get(one)); assertFalse(map.replace(one, "Z", "Z")); assertEquals("A", map.get(one)); - } } @@ -610,7 +599,6 @@ public class StatelessChronicleMapTest extends JSR166TestCase { assertEquals("A", map.get(one)); assertTrue(map.replace(one, "A", "Z")); assertEquals("Z", map.get(one)); - } } @@ -623,7 +611,6 @@ public class StatelessChronicleMapTest extends JSR166TestCase { map.remove(five); assertEquals(4, map.size()); assertFalse(map.containsKey(five)); - } } @@ -695,7 +682,6 @@ public class StatelessChronicleMapTest extends JSR166TestCase { for (int i = 1; i <= 5; ++i) { assertTrue(s.contains(String.valueOf(i))); } - } } @@ -710,7 +696,6 @@ public class StatelessChronicleMapTest extends JSR166TestCase { shouldThrow(); } catch (NullPointerException success) { } - } /** diff --git a/src/test/java/net/openhft/chronicle/set/ChronicleSetBuilderTest.java b/src/test/java/net/openhft/chronicle/set/ChronicleSetBuilderTest.java index e6cb8f365..fd39568f0 100644 --- a/src/test/java/net/openhft/chronicle/set/ChronicleSetBuilderTest.java +++ b/src/test/java/net/openhft/chronicle/set/ChronicleSetBuilderTest.java @@ -35,6 +35,5 @@ public class ChronicleSetBuilderTest { Assert.assertTrue(integers.contains(5)); Assert.assertEquals(10, integers.size()); } - } } diff --git a/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplication3wayTest.java b/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplication3wayTest.java index f52f3a4b0..e0351dce6 100644 --- a/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplication3wayTest.java +++ b/src/test/java/net/openhft/chronicle/set/SetForTCPSocketReplication3wayTest.java @@ -87,7 +87,6 @@ public class SetForTCPSocketReplication3wayTest { assertEquals(set1, set2); assertEquals(set3, set2); assertTrue(!set1.isEmpty()); - } @Test @@ -111,7 +110,6 @@ public class SetForTCPSocketReplication3wayTest { assertEquals(set1, set2); assertEquals(set3, set3); assertTrue(!set1.isEmpty()); - } @Test @@ -136,7 +134,6 @@ public class SetForTCPSocketReplication3wayTest { assertEquals(set1, set2); assertEquals(set3, set3); assertTrue(!set1.isEmpty()); - } private void waitTillEqual(final int timeOutMs) throws InterruptedException { @@ -148,7 +145,6 @@ public class SetForTCPSocketReplication3wayTest { break; Thread.sleep(1); } - } }