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 c455edcd3..902781f97 100644 --- a/src/main/java/net/openhft/chronicle/hash/replication/AbstractReplication.java +++ b/src/main/java/net/openhft/chronicle/hash/replication/AbstractReplication.java @@ -206,6 +206,5 @@ public abstract class AbstractReplication implements Serializable { return ", udpConfig=" + udpConfig + ", remoteNodeValidator=" + remoteNodeValidator; } - } } diff --git a/src/main/java/net/openhft/chronicle/hash/serialization/internal/ByteableMarshaller.java b/src/main/java/net/openhft/chronicle/hash/serialization/internal/ByteableMarshaller.java index 4131be744..ed1973f24 100644 --- a/src/main/java/net/openhft/chronicle/hash/serialization/internal/ByteableMarshaller.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/internal/ByteableMarshaller.java @@ -32,17 +32,6 @@ public abstract class ByteableMarshaller DeserializationFactoryConfigurableBytesReader>, SizeMarshaller { private static final long serialVersionUID = 0L; - - public static ByteableMarshaller of(@NotNull Class eClass) { - return new Default<>(eClass); - } - - @Override - public ByteableMarshaller withDeserializationFactory( - ObjectFactory deserializationFactory) { - return new WithCustomFactory<>(tClass, deserializationFactory); - } - @NotNull private final Class tClass; private long size; @@ -51,6 +40,27 @@ public abstract class ByteableMarshaller this.tClass = tClass; } + public static ByteableMarshaller of(@NotNull Class eClass) { + return new Default<>(eClass); + } + + public static void setBytesAndOffset(Byteable e, Bytes bytes) { + // use the unshifting underlying Bytes (the position never changes) + // if you use a Bytes where the position changes, you risk concurrency issues. + if (bytes instanceof MultiStoreBytes) { + MultiStoreBytes msb = (MultiStoreBytes) bytes; + e.bytes(msb.underlyingBytes(), msb.underlyingOffset() + msb.position()); + } else { + e.bytes(bytes, bytes.position()); + } + } + + @Override + public ByteableMarshaller withDeserializationFactory( + ObjectFactory deserializationFactory) { + return new WithCustomFactory<>(tClass, deserializationFactory); + } + void initSize() { try { size = getInstance().maxSize(); @@ -148,17 +158,6 @@ public abstract class ByteableMarshaller } } - public static void setBytesAndOffset(Byteable e, Bytes bytes) { - // use the unshifting underlying Bytes (the position never changes) - // if you use a Bytes where the position changes, you risk concurrency issues. - if (bytes instanceof MultiStoreBytes) { - MultiStoreBytes msb = (MultiStoreBytes) bytes; - e.bytes(msb.underlyingBytes(), msb.underlyingOffset() + msb.position()); - } else { - e.bytes(bytes, bytes.position()); - } - } - @SuppressWarnings("unchecked") @NotNull E getInstance() throws Exception { @@ -192,8 +191,6 @@ public abstract class ByteableMarshaller super(tClass); initSize(); } - - } private static class WithCustomFactory extends ByteableMarshaller { @@ -214,7 +211,5 @@ public abstract class ByteableMarshaller E getInstance() throws Exception { return factory.create(); } - - } } diff --git a/src/main/java/net/openhft/chronicle/hash/serialization/internal/DirectBytesBuffer.java b/src/main/java/net/openhft/chronicle/hash/serialization/internal/DirectBytesBuffer.java index 4040dc84c..90e70d894 100644 --- a/src/main/java/net/openhft/chronicle/hash/serialization/internal/DirectBytesBuffer.java +++ b/src/main/java/net/openhft/chronicle/hash/serialization/internal/DirectBytesBuffer.java @@ -136,6 +136,5 @@ class DirectBytesBuffer private ForDataValueWriter() { super(DirectBytesBuffer.this); } - } } diff --git a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java index 6d4e7db7b..85c9a95ef 100644 --- a/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java +++ b/src/main/java/net/openhft/chronicle/map/AbstractChannelReplicator.java @@ -555,9 +555,9 @@ abstract class AbstractChannelReplicator implements Closeable { entry.position(startOfEntry); return onEntry(entry, chronicleId, bootstrapTime); - } else + } else { throw e; - + } } return true; } @@ -647,7 +647,6 @@ abstract class AbstractChannelReplicator implements Closeable { public void setSuccessfullyConnected() { connectionAttempts = 0; } - } } diff --git a/src/main/java/net/openhft/chronicle/map/ChroncileMapJsonSerializer.java b/src/main/java/net/openhft/chronicle/map/ChroncileMapJsonSerializer.java index 673043691..f298acb25 100644 --- a/src/main/java/net/openhft/chronicle/map/ChroncileMapJsonSerializer.java +++ b/src/main/java/net/openhft/chronicle/map/ChroncileMapJsonSerializer.java @@ -78,7 +78,6 @@ class JsonSerializer { " expecting an object of type com.thoughtworks.xstream.converters" + ".Converter"); } - } return xstream; diff --git a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java index 7ab35e8a4..21be35531 100755 --- a/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/ReplicatedChronicleMap.java @@ -130,7 +130,6 @@ final class ReplicatedChronicleMap 0 && source.remaining() > 0) { destination.writeByte(source.readByte()); } - } private int assignedModIterBitSetSizeInBytes() { @@ -311,7 +310,6 @@ final class ReplicatedChronicleMap { diff --git a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java index 247574eb3..1847dd819 100755 --- a/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java @@ -262,7 +262,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon outBytes.position(position); // outBytesLock.lock(); } - } private byte[] copyBufferBytes() { @@ -300,7 +299,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon if (closeables != null) closeables.closeQuietly(); clientChannel = null; } - } /** @@ -817,7 +815,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon inBytesLock.unlock(); } } - } public void putAll(@NotNull Map map) { @@ -1068,8 +1065,9 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon long limit = inBytes.position(); inBytes.position(limit); resizeBufferInBuffer(remainingBytes, pos); - } else + } else { inBytes.limit(inBytes.capacity()); + } try { // block until we have received all the bytes in this chunk @@ -1710,7 +1708,6 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon default: return false; } - } private void writeObject(@NotNull Object function) { @@ -1735,8 +1732,9 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon throw e; } - } else + } else { throw e; + } } } } @@ -1753,10 +1751,12 @@ class StatelessChronicleMap implements ChronicleMap, Closeable, Clon long requiresExtra = size - outBytes.remaining(); resizeBufferOutBuffer((int) (outBytes.capacity() + requiresExtra), start); - } else + } else { throw e; - } else + } + } else { throw e; + } } @Nullable diff --git a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java index a7df7e140..77b428319 100644 --- a/src/main/java/net/openhft/chronicle/map/TcpReplicator.java +++ b/src/main/java/net/openhft/chronicle/map/TcpReplicator.java @@ -98,7 +98,6 @@ final class TcpReplicator extends AbstractChannelReplicator implements Clo private long largestEntrySoFar = 128; private long selectorTimeout; - /** * @throws IOException on an io error. */ @@ -152,7 +151,6 @@ final class TcpReplicator extends AbstractChannelReplicator implements Clo } }; - start(); } @@ -569,14 +567,14 @@ final class TcpReplicator extends AbstractChannelReplicator implements Clo if (!remoteVersion.equals(localVersion)) { byte remoteIdentifier = attached.remoteIdentifier; LOG.warn("DIFFERENT CHRONICLE-MAP VERSIONS : " + - "local-map=" + localVersion + - ", remote-map-id-" + remoteIdentifier + "=" + - remoteVersion + + "local-map=" + localVersion + + ", remote-map-id-" + remoteIdentifier + "=" + + remoteVersion + - ", The Remote Chronicle Map with " + - "identifier=" + remoteIdentifier + - " and this Chronicle Map are on different " + - "versions, we suggest that you use the same version." + ", The Remote Chronicle Map with " + + "identifier=" + remoteIdentifier + + " and this Chronicle Map are on different " + + "versions, we suggest that you use the same version." ); } @@ -817,8 +815,9 @@ final class TcpReplicator extends AbstractChannelReplicator implements Clo AbstractConnector connector = attached.connector; if (connector != null) connector.connectLater(); - } else + } else { socketChannel.close(); + } return; } @@ -1151,18 +1150,18 @@ final class TcpReplicator extends AbstractChannelReplicator implements Clo void resizeToMessage(@NotNull IllegalStateException e) { String message = e.getMessage(); - if (message.startsWith("java.io.IOException: Not enough available space for writing ")) { + if (!message.startsWith("java.io.IOException: Not enough available space for writing ")) { + throw e; + } String substring = message.substring("java.io.IOException: Not enough available space for writing ".length(), message.length()); int i = substring.indexOf(' '); - if (i != -1) { - int size = Integer.parseInt(substring.substring(0, i)); - - long requiresExtra = size - in().remaining(); - ensureBufferSize((int) (in().capacity() + requiresExtra)); - } else + if (i == -1) throw e; - } else - throw e; + + int size = Integer.parseInt(substring.substring(0, i)); + + long requiresExtra = size - in().remaining(); + ensureBufferSize((int) (in().capacity() + requiresExtra)); } Bytes in() { @@ -1500,12 +1499,13 @@ final class TcpReplicator extends AbstractChannelReplicator implements Clo * @return the timestamp or -1 if unsuccessful */ String readRemoteServerVersion() { - if (out.remaining() >= 64) { - char[] chars = new char[64]; - out.readFully(chars, 0, chars.length); - return new String(chars).trim(); - } else + if (out.remaining() < 64) { return null; + } + char[] chars = new char[64]; + out.readFully(chars, 0, chars.length); + return new String(chars).trim(); + } public long readRemoteHeartbeatIntervalFromBuffer() { @@ -2163,7 +2163,6 @@ class StatelessServerConnector { out.limit(limit); out.position(pos); } - } private void writeException(@NotNull TcpReplicator.TcpSocketChannelEntryWriter out, Throwable e) { diff --git a/src/main/java/net/openhft/chronicle/map/UdpChannelReplicator.java b/src/main/java/net/openhft/chronicle/map/UdpChannelReplicator.java index 63efdf046..72ec814b5 100644 --- a/src/main/java/net/openhft/chronicle/map/UdpChannelReplicator.java +++ b/src/main/java/net/openhft/chronicle/map/UdpChannelReplicator.java @@ -204,7 +204,6 @@ class UdpChannelReplicator extends AbstractChannelReplicator implements Replica. if (!isClosed) closeEarlyAndQuietly(key.channel()); } - } private DatagramChannel connectClient() throws IOException { diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java index 8d9e08853..52a8f30c6 100755 --- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java @@ -705,7 +705,6 @@ class VanillaChronicleMap, } return result; } - } V putMapped0(K key, @NotNull UnaryOperator unaryOperator) { @@ -780,7 +779,6 @@ class VanillaChronicleMap, long keySize = metaKeyInterop.size(keyInterop, key); long hash = metaKeyInterop.hash(keyInterop, key); - int segmentNum = getSegment(hash); long segmentHash = segmentHash(hash); @@ -1371,7 +1369,6 @@ class VanillaChronicleMap, public void write(Void writer, Bytes bytes, Bytes value) { bytes.write(value, value.position(), value.remaining()); } - } public static final class SegmentState implements StatefulCopyable, @@ -1894,7 +1891,6 @@ class VanillaChronicleMap, } } - public WriteLocked writeLock() { return writeLock(null, false); } diff --git a/src/main/java/net/openhft/xstream/converters/AbstractChronicleMapConverter.java b/src/main/java/net/openhft/xstream/converters/AbstractChronicleMapConverter.java index 84f5c06d6..10e7b091f 100644 --- a/src/main/java/net/openhft/xstream/converters/AbstractChronicleMapConverter.java +++ b/src/main/java/net/openhft/xstream/converters/AbstractChronicleMapConverter.java @@ -81,7 +81,6 @@ class AbstractChronicleMapConverter implements Converter { } catch (Exception e1) { throw new ConversionException("class=" + clazz, e1); } - } } @@ -111,7 +110,6 @@ class AbstractChronicleMapConverter implements Converter { } writer.endNode(); } - } @Override diff --git a/src/main/java/net/openhft/xstream/converters/DataValueConverter.java b/src/main/java/net/openhft/xstream/converters/DataValueConverter.java index 9d1d9b29b..8941f0f6b 100644 --- a/src/main/java/net/openhft/xstream/converters/DataValueConverter.java +++ b/src/main/java/net/openhft/xstream/converters/DataValueConverter.java @@ -196,7 +196,6 @@ public class DataValueConverter implements Converter { } catch (Exception e) { LOG.error("class=" + fileModel.name(), e); } - } } catch (ClassNotFoundException e) { @@ -262,7 +261,6 @@ public class DataValueConverter implements Converter { } catch (Exception e) { throw new ConversionException("class=" + canonicalName, e); } - } private void fillInObject(HierarchicalStreamReader reader, UnmarshallingContext context, Object using) throws ClassNotFoundException { diff --git a/src/main/java/net/openhft/xstream/converters/StatelessChronicleMapConverter.java b/src/main/java/net/openhft/xstream/converters/StatelessChronicleMapConverter.java index b6711eb33..925536b88 100644 --- a/src/main/java/net/openhft/xstream/converters/StatelessChronicleMapConverter.java +++ b/src/main/java/net/openhft/xstream/converters/StatelessChronicleMapConverter.java @@ -72,7 +72,6 @@ public class StatelessChronicleMapConverter extends AbstractChronicleMapCo } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { throw new ConversionException("", e); } - } } diff --git a/src/main/java/net/openhft/xstream/converters/VanillaChronicleMapConverter.java b/src/main/java/net/openhft/xstream/converters/VanillaChronicleMapConverter.java index 065b34634..abd1f7a1d 100644 --- a/src/main/java/net/openhft/xstream/converters/VanillaChronicleMapConverter.java +++ b/src/main/java/net/openhft/xstream/converters/VanillaChronicleMapConverter.java @@ -50,7 +50,6 @@ public class VanillaChronicleMapConverter extends AbstractChronicleMapConv } writer.endNode(); } - } } diff --git a/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java b/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java index 0a1f55599..a57afe8f4 100644 --- a/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java +++ b/src/test/java/net/openhft/chronicle/map/CHMMetaDataTest.java @@ -84,6 +84,5 @@ public class CHMMetaDataTest { public void onRemove(Bytes entry, long metaDataPos, long keyPos, long valuePos, boolean replicationEvent, byte identifier, byte replacedIdentifier, long timeStamp, long replacedTimeStamp, SharedSegment segment) { System.out.println("Removed entry with ts of " + entry.readLong(metaDataPos)); } - } } diff --git a/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java b/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java index dc136abf7..c96a63373 100644 --- a/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java +++ b/src/test/java/net/openhft/chronicle/map/CHMUseCasesTest.java @@ -340,7 +340,6 @@ public class CHMUseCasesTest { return map1; } - } case STATELESS: { @@ -483,7 +482,6 @@ public class CHMUseCasesTest { mpx1030.setAskPx(109.7); mpx1030.setBidPx(107.6); } - } } @@ -1180,7 +1178,6 @@ public class CHMUseCasesTest { } catch (Exception todoMoreSpecificException) { } - } } @@ -2597,7 +2594,6 @@ public class CHMUseCasesTest { public String update(String s) { return prefix + s; } - } } diff --git a/src/test/java/net/openhft/chronicle/map/ChronicleMapSanityCheckTest.java b/src/test/java/net/openhft/chronicle/map/ChronicleMapSanityCheckTest.java index 9979a9a94..76b46e97c 100644 --- a/src/test/java/net/openhft/chronicle/map/ChronicleMapSanityCheckTest.java +++ b/src/test/java/net/openhft/chronicle/map/ChronicleMapSanityCheckTest.java @@ -33,10 +33,6 @@ import java.util.concurrent.locks.LockSupport; */ public class ChronicleMapSanityCheckTest { - enum DummyValue { - DUMMY_VALUE - } - @Test public void testSanity1() throws IOException, InterruptedException { @@ -124,6 +120,9 @@ public class ChronicleMapSanityCheckTest { throw new RuntimeException(e); } } + } + enum DummyValue { + DUMMY_VALUE } } diff --git a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java index 1cfbea702..f4f49c095 100755 --- a/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java @@ -216,7 +216,6 @@ public class ChronicleMapTest { assertEquals(map1, map2); } - } } @@ -238,7 +237,6 @@ public class ChronicleMapTest { assertEquals(map1, map2); } - } } @@ -260,7 +258,6 @@ public class ChronicleMapTest { assertEquals(map1, map2); } - } } @@ -684,7 +681,6 @@ public class ChronicleMapTest { assertEquals(j, value3.getValue()); } } - } } } @@ -777,7 +773,6 @@ public class ChronicleMapTest { } } } - } @Test @@ -1246,7 +1241,6 @@ public class ChronicleMapTest { assertNull(map.getUsing(key, value)); } } - } } @@ -1266,7 +1260,6 @@ public class ChronicleMapTest { assertValues(values, new CharSequence[]{"1", "3"}); assertValues(map.values(), new CharSequence[]{"1", "3"}); } - } @Test @@ -1317,7 +1310,6 @@ public class ChronicleMapTest { assertValues(values, new CharSequence[]{"1", "3"}); } - } @Test @@ -1334,7 +1326,6 @@ public class ChronicleMapTest { assertValues(values, new CharSequence[]{"1", "3"}); } - } @Test @@ -1378,7 +1369,6 @@ public class ChronicleMapTest { assertValues(values, expectedValues); } - } @Test @@ -1405,7 +1395,6 @@ public class ChronicleMapTest { assertValues(values, expectedValues); } - } @Test @@ -1427,7 +1416,6 @@ public class ChronicleMapTest { assertValues(values, new CharSequence[]{"3"}); } - } @Test @@ -1444,7 +1432,6 @@ public class ChronicleMapTest { assertValues(values, new CharSequence[]{"3"}); } - } @Test @@ -1498,7 +1485,6 @@ public class ChronicleMapTest { assertValues(values, new CharSequence[]{"2", "1"}); } - } @Test @@ -1531,7 +1517,6 @@ public class ChronicleMapTest { org.junit.Assert.assertTrue(values.isEmpty()); } - } @Test @@ -1564,7 +1549,6 @@ public class ChronicleMapTest { org.junit.Assert.assertTrue(values.isEmpty()); } - } @Test @@ -1583,7 +1567,6 @@ public class ChronicleMapTest { assertEquals(noOfElements, sum); } - } @Test @@ -1657,7 +1640,6 @@ public class ChronicleMapTest { assertValues(map.values(), new String[]{"B"}); } - } @Test @@ -1704,7 +1686,6 @@ public class ChronicleMapTest { assertEquals(largeValue, map.remove(key)); map.checkConsistency(); } - } @Test @@ -1724,7 +1705,6 @@ public class ChronicleMapTest { assertEquals(map1, map2); } } - } @Test @@ -1746,7 +1726,6 @@ public class ChronicleMapTest { throw new AssertionError("Should throw either IllegalStateException or " + "NullPointerException, but succeed"); } - } @Test @@ -1802,7 +1781,6 @@ public class ChronicleMapTest { assert value == context.value(); assertEquals(1, context.value().getValue()); } - } } @@ -1831,7 +1809,6 @@ public class ChronicleMapTest { Assert.assertNotNull(map2.get(key)); } } - } } @@ -1969,7 +1946,6 @@ public class ChronicleMapTest { e.printStackTrace(); } } - } } diff --git a/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java b/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java index 1a5ab02d0..078cdeae6 100644 --- a/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java +++ b/src/test/java/net/openhft/chronicle/map/EntryCountMapTest.java @@ -257,7 +257,6 @@ public class EntryCountMapTest { ", seg: " + segments + ", min: " + minSize + ", size: " + map.size()); } - } private void dumpMapStats(int segments, int minSize, diff --git a/src/test/java/net/openhft/chronicle/map/EventListenerWithTCPSocketReplicationTest.java b/src/test/java/net/openhft/chronicle/map/EventListenerWithTCPSocketReplicationTest.java index c55594b82..b1cee50e2 100644 --- a/src/test/java/net/openhft/chronicle/map/EventListenerWithTCPSocketReplicationTest.java +++ b/src/test/java/net/openhft/chronicle/map/EventListenerWithTCPSocketReplicationTest.java @@ -37,18 +37,12 @@ import java.util.concurrent.atomic.AtomicReference; */ public class EventListenerWithTCPSocketReplicationTest { - ChronicleMap map1; - ChronicleMap map2; - final AtomicReference keyRef = new AtomicReference(); - final AtomicReference replacedValueRef = new AtomicReference(); final AtomicReference valueRef = new AtomicReference(); final AtomicBoolean putWasCalled = new AtomicBoolean(false); - final AtomicBoolean wasRemoved = new AtomicBoolean(false); final AtomicReference valueRemoved = new AtomicReference(); - final MapEventListener eventListener = new MapEventListener() { private static final long serialVersionUID = 1L; @@ -70,6 +64,8 @@ public class EventListenerWithTCPSocketReplicationTest { valueRemoved.set(value); } }; + ChronicleMap map1; + ChronicleMap map2; @After public void tearDown() throws InterruptedException { @@ -250,7 +246,6 @@ public class EventListenerWithTCPSocketReplicationTest { if (numberOfTimesTheSame == 100) { break; } - } Thread.sleep(1); } diff --git a/src/test/java/net/openhft/chronicle/map/MapFullTest.java b/src/test/java/net/openhft/chronicle/map/MapFullTest.java index 507cb723b..00602cdc1 100644 --- a/src/test/java/net/openhft/chronicle/map/MapFullTest.java +++ b/src/test/java/net/openhft/chronicle/map/MapFullTest.java @@ -12,13 +12,17 @@ import java.util.Collection; * @author Rob Austin. */ - @RunWith(Parameterized.class) public class MapFullTest { private final int segments; private final long maxEntries; + public MapFullTest(int segments, long maxEntries) { + this.segments = segments; + this.maxEntries = maxEntries; + } + @Parameterized.Parameters public static Collection data() { @@ -38,12 +42,6 @@ public class MapFullTest { }); } - - public MapFullTest(int segments, long maxEntries) { - this.segments = segments; - this.maxEntries = maxEntries; - } - @Test public void testThatWeCanPutALotOfEntriesInAMap() throws Exception { @@ -67,7 +65,6 @@ public class MapFullTest { Assert.assertEquals(size, chronicleMap.size()); - chronicleMap.clear(); for (int i = 0; i < size; i++) { diff --git a/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java b/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java index 1e2e06a09..54fd1cecb 100644 --- a/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java +++ b/src/test/java/net/openhft/chronicle/map/ReplicationCheckingMap.java @@ -92,8 +92,9 @@ public class ReplicationCheckingMap implements ChronicleMap { } catch (InterruptedException e) { e.printStackTrace(); } - } else + } else { Thread.yield(); + } } Assert.assertEquals(map1, map2); diff --git a/src/test/java/net/openhft/chronicle/map/ReplicationTest.java b/src/test/java/net/openhft/chronicle/map/ReplicationTest.java index 0739c09e4..bfeb196ef 100755 --- a/src/test/java/net/openhft/chronicle/map/ReplicationTest.java +++ b/src/test/java/net/openhft/chronicle/map/ReplicationTest.java @@ -44,18 +44,15 @@ import java.util.concurrent.atomic.AtomicLong; public class ReplicationTest { - static int s_port = 8093; - Set threads; - private ChronicleMap map1; final AtomicLong count = new AtomicLong(); final AtomicBoolean hasValueChanged = new AtomicBoolean(); - final AtomicInteger identifier = new AtomicInteger(); final AtomicInteger replacedIdentifier = new AtomicInteger(); final AtomicLong timeStamp = new AtomicLong(); final AtomicLong replacedTimeStamp = new AtomicLong(); - + Set threads; + private ChronicleMap map1; private IntValue value; @Before @@ -63,7 +60,6 @@ public class ReplicationTest { value = DataValueClasses.newDirectReference(IntValue.class); ((Byteable) value).bytes(new ByteBufferBytes(ByteBuffer.allocateDirect(4)), 0); - final InetSocketAddress endpoint = new InetSocketAddress("localhost", s_port + 1); { @@ -104,7 +100,6 @@ public class ReplicationTest { }; - map1 = ChronicleMapBuilder.of(Integer.class, CharSequence.class) .entries(Builder.SIZE + Builder.SIZE) .actualSegments(1) @@ -160,7 +155,6 @@ public class ReplicationTest { Assert.assertEquals(124, timeStamp.get()); Assert.assertEquals(123, replacedTimeStamp.get()); - map.put(1, "test2", (byte) 2, 125); Assert.assertTrue(hasValueChanged.get()); Assert.assertEquals((byte) 2, identifier.get()); @@ -176,6 +170,5 @@ public class ReplicationTest { Assert.assertEquals(125, replacedTimeStamp.get()); } - } diff --git a/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java b/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java index c3592292f..dc817ad03 100644 --- a/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java +++ b/src/test/java/net/openhft/chronicle/map/StatelessClientTest.java @@ -618,7 +618,6 @@ public class StatelessClientTest { executorService.awaitTermination(1000, TimeUnit.SECONDS); } - } @Test @@ -715,7 +714,6 @@ public class StatelessClientTest { executorService.shutdownNow(); executorService.awaitTermination(1000, TimeUnit.SECONDS); } - } @Test(timeout = 10000) @@ -765,7 +763,6 @@ public class StatelessClientTest { } } - } @Test(timeout = 10000) diff --git a/src/test/java/net/openhft/chronicle/map/TCPReplicationCheckUpdatesFromOtherMapsAreNotPopulated.java b/src/test/java/net/openhft/chronicle/map/TCPReplicationCheckUpdatesFromOtherMapsAreNotPopulated.java index 6f57ac501..53389303e 100755 --- a/src/test/java/net/openhft/chronicle/map/TCPReplicationCheckUpdatesFromOtherMapsAreNotPopulated.java +++ b/src/test/java/net/openhft/chronicle/map/TCPReplicationCheckUpdatesFromOtherMapsAreNotPopulated.java @@ -41,7 +41,6 @@ import java.util.concurrent.TimeUnit; public class TCPReplicationCheckUpdatesFromOtherMapsAreNotPopulated { - static int s_port = 8093; Set threads; private ChronicleMap map1; @@ -120,7 +119,6 @@ public class TCPReplicationCheckUpdatesFromOtherMapsAreNotPopulated { @Test public void test() throws IOException, InterruptedException { - ReplicatedChronicleMap map = (ReplicatedChronicleMap) map1; map.put(1, "test", (byte) 2, System.currentTimeMillis()); @@ -128,7 +126,6 @@ public class TCPReplicationCheckUpdatesFromOtherMapsAreNotPopulated { Thread.sleep(1000); Assert.assertTrue(map2.isEmpty()); - map.put(1, "test2", (byte) 1, System.currentTimeMillis()); // ((ReplicatedChronicleMap) map1).put(1, "test"); Thread.sleep(1000); @@ -137,6 +134,5 @@ public class TCPReplicationCheckUpdatesFromOtherMapsAreNotPopulated { } - } diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationAfterNodeFailureTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationAfterNodeFailureTest.java index 1256aa808..ea1c29dbf 100644 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationAfterNodeFailureTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationAfterNodeFailureTest.java @@ -52,7 +52,6 @@ public class TCPSocketReplicationAfterNodeFailureTest { StatelessClientTest.checkThreadsShutdown(threads); } - @Test public void testTCPSocketReplicationAfterNodeFailure() throws IOException, InterruptedException { @@ -125,7 +124,6 @@ public class TCPSocketReplicationAfterNodeFailureTest { waitTillEqual(2500, favoriteComputerServer1, favoriteComputerServer2); - assertEquals(favoriteComputerServer1, favoriteComputerServer2); assertEquals(2, favoriteComputerServer1.size()); @@ -164,10 +162,8 @@ public class TCPSocketReplicationAfterNodeFailureTest { favoriteComputerServer3.put("ozan", "mac"); } - waitTillEqual(2500, favoriteComputerServer1, favoriteComputerServer3); - assertEquals(favoriteComputerServer1, favoriteComputerServer3); assertEquals(3, favoriteComputerServer1.size()); @@ -176,7 +172,6 @@ public class TCPSocketReplicationAfterNodeFailureTest { } - private void waitTillEqual(final int timeOutMs, Map map1, Map map2) throws InterruptedException { int t = 0; for (; t < timeOutMs; t++) { diff --git a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java index f90d07ae5..678c9981c 100644 --- a/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java +++ b/src/test/java/net/openhft/chronicle/map/TCPSocketReplicationTest.java @@ -18,7 +18,6 @@ package net.openhft.chronicle.map; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import java.io.Closeable; @@ -195,7 +194,6 @@ public class TCPSocketReplicationTest { System.out.println("same"); break; } - } Thread.sleep(1); } diff --git a/src/test/java/net/openhft/chronicle/map/TcpReplicationLargeEntryTest.java b/src/test/java/net/openhft/chronicle/map/TcpReplicationLargeEntryTest.java index 9b8368eca..0ae8aad78 100644 --- a/src/test/java/net/openhft/chronicle/map/TcpReplicationLargeEntryTest.java +++ b/src/test/java/net/openhft/chronicle/map/TcpReplicationLargeEntryTest.java @@ -148,7 +148,6 @@ public class TcpReplicationLargeEntryTest { System.out.println("same"); break; } - } Thread.sleep(1); } diff --git a/src/test/java/net/openhft/chronicle/map/TcpReplicationSoakTest.java b/src/test/java/net/openhft/chronicle/map/TcpReplicationSoakTest.java index 2e06a5a13..88b9aab12 100644 --- a/src/test/java/net/openhft/chronicle/map/TcpReplicationSoakTest.java +++ b/src/test/java/net/openhft/chronicle/map/TcpReplicationSoakTest.java @@ -138,7 +138,6 @@ public class TcpReplicationSoakTest { map1.close(); map2.close(); } - } private void waitTillEqual(final int timeOutMs) throws InterruptedException { @@ -161,7 +160,6 @@ public class TcpReplicationSoakTest { System.out.println("same"); break; } - } Thread.sleep(1); } diff --git a/src/test/java/net/openhft/chronicle/map/TcpReplicationWithAcquireUsingLockedTest.java b/src/test/java/net/openhft/chronicle/map/TcpReplicationWithAcquireUsingLockedTest.java index e99d2b1af..7666e528e 100644 --- a/src/test/java/net/openhft/chronicle/map/TcpReplicationWithAcquireUsingLockedTest.java +++ b/src/test/java/net/openhft/chronicle/map/TcpReplicationWithAcquireUsingLockedTest.java @@ -73,7 +73,6 @@ public class TcpReplicationWithAcquireUsingLockedTest { Assert.assertEquals(map1a, map2a); } } - } @Test @@ -121,7 +120,6 @@ public class TcpReplicationWithAcquireUsingLockedTest { Assert.assertEquals(map1a, map2a); } } - } @Test @@ -170,7 +168,6 @@ public class TcpReplicationWithAcquireUsingLockedTest { Assert.assertEquals(map1a, map2a); } } - } } diff --git a/src/test/java/net/openhft/chronicle/map/TcpTimeBasedReplicationSoakTest.java b/src/test/java/net/openhft/chronicle/map/TcpTimeBasedReplicationSoakTest.java index 461c21751..215867721 100644 --- a/src/test/java/net/openhft/chronicle/map/TcpTimeBasedReplicationSoakTest.java +++ b/src/test/java/net/openhft/chronicle/map/TcpTimeBasedReplicationSoakTest.java @@ -133,7 +133,6 @@ public class TcpTimeBasedReplicationSoakTest { } else { map.remove(rnd.nextInt(100)); } - } System.out.println("\nwaiting till equal"); @@ -164,7 +163,6 @@ public class TcpTimeBasedReplicationSoakTest { break; } - } } diff --git a/src/test/java/net/openhft/chronicle/map/TestReplication.java b/src/test/java/net/openhft/chronicle/map/TestReplication.java index d725e781b..af8531ba8 100644 --- a/src/test/java/net/openhft/chronicle/map/TestReplication.java +++ b/src/test/java/net/openhft/chronicle/map/TestReplication.java @@ -116,6 +116,4 @@ public class TestReplication { } - - } diff --git a/src/test/java/net/openhft/chronicle/map/example/DoubleArrayExample.java b/src/test/java/net/openhft/chronicle/map/example/DoubleArrayExample.java index fb3eaf210..6d855b28f 100644 --- a/src/test/java/net/openhft/chronicle/map/example/DoubleArrayExample.java +++ b/src/test/java/net/openhft/chronicle/map/example/DoubleArrayExample.java @@ -28,7 +28,6 @@ public class DoubleArrayExample { // .createPersistedTo(File.createTempFile("map", "chron")); System.out.println("Created the monkey map ValueWrapper 128"); - double[] values = new double[125]; Arrays.fill(values, 1.1); @@ -42,23 +41,20 @@ public class DoubleArrayExample { for (double v : valueRead.getValues()) { System.out.println("" + v); } - - } - private static class ValueWrapper implements BytesMarshallable { private double values[]; - public double[] getValues() { - return values; - } - public ValueWrapper(@NotNull double[] values) { this.values = values; } + public double[] getValues() { + return values; + } + @Override public void readMarshallable(Bytes bytes) throws IllegalStateException { @@ -69,7 +65,6 @@ public class DoubleArrayExample { for (int i = 0; i < values.length; i++) { values[i] = bytes.readDouble(); } - } @Override @@ -80,11 +75,8 @@ public class DoubleArrayExample { for (double value : values) { bytes.writeDouble(value); } - - } } - } diff --git a/src/test/java/net/openhft/chronicle/map/jsr166/map/LoopHelpers.java b/src/test/java/net/openhft/chronicle/map/jsr166/map/LoopHelpers.java index 3b70dbe9f..2c73f27a5 100644 --- a/src/test/java/net/openhft/chronicle/map/jsr166/map/LoopHelpers.java +++ b/src/test/java/net/openhft/chronicle/map/jsr166/map/LoopHelpers.java @@ -214,11 +214,12 @@ class LoopHelpers { public void run() { long t = System.nanoTime(); - if (!started) { + if (started) { + endTime = t; + } else { started = true; startTime = t; - } else - endTime = t; + } } public void clear() { diff --git a/src/test/java/net/openhft/chronicle/map/jsr166/map/MapCheck.java b/src/test/java/net/openhft/chronicle/map/jsr166/map/MapCheck.java index b13416747..55ab91f09 100644 --- a/src/test/java/net/openhft/chronicle/map/jsr166/map/MapCheck.java +++ b/src/test/java/net/openhft/chronicle/map/jsr166/map/MapCheck.java @@ -555,8 +555,9 @@ public class MapCheck { initDoubles(key, absent, size); } else if (eclass == String.class) { initWords(size, key, absent); - } else + } else { throw new Error("unknown type"); + } } static void initInts(Object[] key, Object[] absent, int size) { @@ -702,8 +703,9 @@ public class MapCheck { if (n == 0) { n = stats.firstn; s = stats.first; - } else + } else { s = stats.sum; + } double t = ((double) s) / n; long nano = Math.round(t); diff --git a/src/test/java/net/openhft/chronicle/set/Issue24ChronicleSetTest.java b/src/test/java/net/openhft/chronicle/set/Issue24ChronicleSetTest.java index 559e761ba..26a6c240f 100644 --- a/src/test/java/net/openhft/chronicle/set/Issue24ChronicleSetTest.java +++ b/src/test/java/net/openhft/chronicle/set/Issue24ChronicleSetTest.java @@ -118,6 +118,5 @@ public class Issue24ChronicleSetTest { System.out.println(s); } } - } }