Many renames, API refactorings, classes/interfaces made private to net.openhft.chronicle.map package

Conflicts:
	src/main/java/net/openhft/chronicle/map/StatelessChronicleMap.java
	src/test/java/net/openhft/chronicle/map/ChronicleMapTest.java
This commit is contained in:
leventov
2014-11-07 12:10:40 +03:00
parent 157891dc9d
commit 4a51b129a3
67 changed files with 1241 additions and 850 deletions
@@ -34,7 +34,6 @@ import java.util.Random;
import static net.openhft.chronicle.map.Builder.getPersistenceFile;
import static net.openhft.chronicle.map.Builder.newTcpSocketShmBuilder;
import static net.openhft.chronicle.map.TCPSocketReplication4WayMapTest.newTcpSocketShmIntValueString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -57,9 +56,14 @@ public class TCPSocketReplicationIntValueTest {
((Byteable) value).bytes(new ByteBufferBytes(ByteBuffer.allocateDirect(4)), 0);
map1Builder = newTcpSocketShmBuilder(IntValue.class, CharSequence.class,
(byte) 1, 8076, new InetSocketAddress("localhost", 8077));
map1Builder.keyMarshaller(ByteableIntValueMarshaller.INSTANCE).file(getPersistenceFile());
map1 = map1Builder.keyMarshaller(ByteableIntValueMarshaller.INSTANCE).create();
map2 = newTcpSocketShmIntValueString((byte) 2, 8077);
map1Builder.keyMarshaller(ByteableIntValueMarshaller.INSTANCE);
map1 = map1Builder.keyMarshaller(ByteableIntValueMarshaller.INSTANCE)
.createPersistedTo(getPersistenceFile());
map2 = newTcpSocketShmBuilder(IntValue.class, CharSequence.class,
(byte) 2, 8077)
.entries(20000L)
.keyMarshaller(ByteableIntValueMarshaller.INSTANCE)
.create();
}
@@ -69,7 +73,7 @@ public class TCPSocketReplicationIntValueTest {
for (final Closeable closeable : new Closeable[]{map1, map2}) {
try {
closeable.close();
} catch (IOException e) {
} catch (Exception e) {
e.printStackTrace();
}
}