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
@@ -18,7 +18,7 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.hash.TcpReplicationConfig;
import net.openhft.chronicle.hash.replication.TcpConfig;
import org.junit.Assert;
import org.junit.Test;
@@ -29,8 +29,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import static net.openhft.chronicle.hash.StatelessBuilder.remoteAddress;
/**
* @author Rob Austin.
@@ -52,13 +50,13 @@ public class StatelessClientTest {
{
statelessMap = ChronicleMapBuilder.of(Integer
.class, CharSequence.class)
.stateless(remoteAddress(new InetSocketAddress("localhost", 8086))).create();
.statelessClient(new InetSocketAddress("localhost", 8086)).create();
}
// server
{
serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.replicators((byte) 2, TcpReplicationConfig.of(8086)).create();
.replication((byte) 2, TcpConfig.of(8086)).create();
}
@@ -95,13 +93,13 @@ public class StatelessClientTest {
{
statelessMap = ChronicleMapBuilder.of(Integer
.class, CharSequence.class)
.stateless(remoteAddress(new InetSocketAddress("localhost", 8086))).create();
.statelessClient(new InetSocketAddress("localhost", 8086)).create();
}
// server
{
serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.replicators((byte) 2, TcpReplicationConfig.of(8086)).create();
.replication((byte) 2, TcpConfig.of(8086)).create();
}
@@ -136,13 +134,13 @@ public class StatelessClientTest {
{
statelessMap = ChronicleMapBuilder.of(Integer
.class, CharSequence.class)
.stateless(remoteAddress(new InetSocketAddress("localhost", 8086))).create();
.statelessClient(new InetSocketAddress("localhost", 8086)).create();
}
// server
{
serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.replicators((byte) 2, TcpReplicationConfig.of(8086)).create();
.replication((byte) 2, TcpConfig.of(8086)).create();
}
@@ -175,7 +173,7 @@ public class StatelessClientTest {
// server
{
serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.replicators((byte) 2, TcpReplicationConfig.of(8086)).create();
.replication((byte) 2, TcpConfig.of(8086)).create();
serverMap.put(10, "EXAMPLE-10");
}
@@ -185,7 +183,7 @@ public class StatelessClientTest {
{
statelessMap = ChronicleMapBuilder.of(Integer
.class, CharSequence.class)
.stateless(remoteAddress(new InetSocketAddress("localhost", 8086))).create();
.statelessClient(new InetSocketAddress("localhost", 8086)).create();
Assert.assertEquals("EXAMPLE-10", statelessMap.get(10));
Assert.assertEquals(1, statelessMap.size());
@@ -208,13 +206,13 @@ public class StatelessClientTest {
{
statelessMap = ChronicleMapBuilder.of(Integer
.class, CharSequence.class)
.stateless(remoteAddress(new InetSocketAddress("localhost", 8086))).create();
.statelessClient(new InetSocketAddress("localhost", 8086)).create();
}
// server
{
serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.replicators((byte) 2, TcpReplicationConfig.of(8086)).create();
.replication((byte) 2, TcpConfig.of(8086)).create();
serverMap.put(10, "EXAMPLE-10");
}
@@ -240,13 +238,13 @@ public class StatelessClientTest {
{
statelessMap = ChronicleMapBuilder.of(Integer
.class, CharSequence.class)
.stateless(remoteAddress(new InetSocketAddress("localhost", 8086))).create();
.statelessClient(new InetSocketAddress("localhost", 8086)).create();
}
// server
{
serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.replicators((byte) 2, TcpReplicationConfig.of(8086)).create();
.replication((byte) 2, TcpConfig.of(8086)).create();
}
@@ -283,13 +281,13 @@ public class StatelessClientTest {
statelessMap = ChronicleMapBuilder.of(Integer
.class, CharSequence.class)
.putReturnsNull(true)
.stateless(remoteAddress(new InetSocketAddress("localhost", 8086))).create();
.statelessClient(new InetSocketAddress("localhost", 8086)).create();
}
// server
{
serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.replicators((byte) 2, TcpReplicationConfig.of(8086))
.replication((byte) 2, TcpConfig.of(8086))
.putReturnsNull(true)
.create();
}
@@ -329,13 +327,13 @@ public class StatelessClientTest {
.class, CharSequence.class)
.putReturnsNull(true)
.removeReturnsNull(true)
.stateless(remoteAddress(new InetSocketAddress("localhost", 8086))).create();
.statelessClient(new InetSocketAddress("localhost", 8086)).create();
}
// server
{
serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.replicators((byte) 2, TcpReplicationConfig.of(8086))
.replication((byte) 2, TcpConfig.of(8086))
.putReturnsNull(true)
.removeReturnsNull(true)
.create();
@@ -368,13 +366,13 @@ public class StatelessClientTest {
.class, CharSequence.class)
.putReturnsNull(true)
.removeReturnsNull(true)
.stateless(remoteAddress(new InetSocketAddress("localhost", 8086))).create();
.statelessClient(new InetSocketAddress("localhost", 8086)).create();
}
// server
{
serverMap = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.replicators((byte) 2, TcpReplicationConfig.of(8086))
.replication((byte) 2, TcpConfig.of(8086))
.putReturnsNull(true)
.removeReturnsNull(true)
.create();
@@ -408,18 +406,18 @@ public class StatelessClientTest {
{
statelessMap1 = ChronicleMapBuilder.of(Integer
.class, CharSequence.class)
.stateless(remoteAddress(new InetSocketAddress("localhost", 8086))).create();
.statelessClient(new InetSocketAddress("localhost", 8086)).create();
statelessMap2 = ChronicleMapBuilder.of(Integer
.class, CharSequence.class)
.stateless(remoteAddress(new InetSocketAddress("localhost", 8077))).create();
.statelessClient(new InetSocketAddress("localhost", 8077)).create();
}
// server
{
serverMap1 = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.replicators((byte) 2, TcpReplicationConfig.of(8086)).create();
.replication((byte) 2, TcpConfig.of(8086)).create();
serverMap2 = ChronicleMapBuilder.of(Integer.class, CharSequence.class)
.replicators((byte) 2, TcpReplicationConfig.of(8077)).create();
.replication((byte) 2, TcpConfig.of(8077)).create();
}