Made TcpConfig back immutable; Draw the borderline: Builders are mutable, Configs are immutable (hence ChronicleHashInstanceBuilder and StatelessClientBuilder renamed to Configs; improved TcpConfig static factory naming

This commit is contained in:
leventov
2014-11-07 12:24:52 +03:00
parent 4a51b129a3
commit 4c86dae04f
29 changed files with 198 additions and 215 deletions
@@ -619,9 +619,9 @@ public abstract class AbstractChronicleMapBuilder<K, V,
}
@Override
public StatelessClientBuilder<ChronicleMap<K, V>> statelessClient(
public StatelessClientConfig<ChronicleMap<K, V>> statelessClient(
InetSocketAddress remoteAddress) {
return new StatelessMapBuilder<>(this.clone(), remoteAddress);
return new StatelessMapConfig<>(this.clone(), remoteAddress);
}
/**
@@ -736,8 +736,8 @@ public abstract class AbstractChronicleMapBuilder<K, V,
}
@Override
public ChronicleHashInstanceBuilder<ChronicleMap<K, V>> instance() {
return new InstanceBuilder<>(this.clone(), simpleReplication, null, null);
public ChronicleHashInstanceConfig<ChronicleMap<K, V>> instance() {
return new InstanceConfig<>(this.clone(), simpleReplication, null, null);
}
@Override
@@ -750,7 +750,7 @@ public abstract class AbstractChronicleMapBuilder<K, V,
return createWithoutFile(simpleReplication, null);
}
ChronicleMap<K, V> create(InstanceBuilder<K, V> ib) throws IOException {
ChronicleMap<K, V> create(InstanceConfig<K, V> ib) throws IOException {
if (ib.file != null) {
return createWithFile(ib.file, ib.simpleReplication, ib.channel);
} else {
@@ -830,7 +830,7 @@ public abstract class AbstractChronicleMapBuilder<K, V,
return establishReplication(map, simpleReplication, channel);
}
ChronicleMap<K, V> createStatelessMap(StatelessMapBuilder<K, V> statelessBuilder)
ChronicleMap<K, V> createStatelessMap(StatelessMapConfig<K, V> statelessBuilder)
throws IOException {
preMapConstruction(false);
return new StatelessChronicleMap<K, V>(
@@ -16,7 +16,7 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.hash.ChronicleHashInstanceBuilder;
import net.openhft.chronicle.hash.ChronicleHashInstanceConfig;
import net.openhft.chronicle.hash.replication.ReplicationChannel;
import net.openhft.chronicle.hash.replication.SimpleReplication;
import net.openhft.chronicle.hash.replication.TcpConfig;
@@ -24,18 +24,18 @@ import net.openhft.chronicle.hash.replication.TcpConfig;
import java.io.File;
import java.io.IOException;
final class InstanceBuilder<K, V>
implements ChronicleHashInstanceBuilder<ChronicleMap<K, V>> {
final class InstanceConfig<K, V>
implements ChronicleHashInstanceConfig<ChronicleMap<K, V>> {
final AbstractChronicleMapBuilder<K, V, ?> mapBuilder;
final SimpleReplication simpleReplication;
final ReplicationChannel channel;
final File file;
InstanceBuilder(AbstractChronicleMapBuilder<K, V, ?> mapBuilder,
SimpleReplication simpleReplication,
ReplicationChannel channel,
File file) {
InstanceConfig(AbstractChronicleMapBuilder<K, V, ?> mapBuilder,
SimpleReplication simpleReplication,
ReplicationChannel channel,
File file) {
this.mapBuilder = mapBuilder;
this.simpleReplication = simpleReplication;
this.channel = channel;
@@ -43,27 +43,27 @@ final class InstanceBuilder<K, V>
}
@Override
public ChronicleHashInstanceBuilder<ChronicleMap<K, V>> replicated(
public ChronicleHashInstanceConfig<ChronicleMap<K, V>> replicated(
byte identifier, TcpConfig tcpTransportAndNetwork) {
return replicated(SimpleReplication.builder()
.tcpTransportAndNetwork(tcpTransportAndNetwork).create(identifier));
}
@Override
public ChronicleHashInstanceBuilder<ChronicleMap<K, V>> replicated(
public ChronicleHashInstanceConfig<ChronicleMap<K, V>> replicated(
SimpleReplication replication) {
return new InstanceBuilder<>(mapBuilder, replication, null, file);
return new InstanceConfig<>(mapBuilder, replication, null, file);
}
@Override
public ChronicleHashInstanceBuilder<ChronicleMap<K, V>> replicatedViaChannel(
public ChronicleHashInstanceConfig<ChronicleMap<K, V>> replicatedViaChannel(
ReplicationChannel channel) {
return new InstanceBuilder<>(mapBuilder, null, channel, file);
return new InstanceConfig<>(mapBuilder, null, channel, file);
}
@Override
public ChronicleHashInstanceBuilder<ChronicleMap<K, V>> persistedTo(File file) {
return new InstanceBuilder<>(mapBuilder, simpleReplication, channel, file);
public ChronicleHashInstanceConfig<ChronicleMap<K, V>> persistedTo(File file) {
return new InstanceConfig<>(mapBuilder, simpleReplication, channel, file);
}
@Override
@@ -222,8 +222,10 @@ public class NodeDiscovery {
knownNodes.add(ourAddressAndPort, identifier);
final TcpConfig tcpConfig = TcpConfig
.of(ourAddressAndPort.getPort(), toInetSocketArray(knownHostPorts))
.heartBeatInterval(1, SECONDS).nonUniqueIdentifierListener(identifierListener);
.unknownTopology(ourAddressAndPort.getPort(),
toInetSocketCollection(knownHostPorts))
.heartBeatInterval(1, SECONDS)
.nonUniqueIdentifierListener(identifierListener);
LOG.info("Using Remote identifier=" + identifier);
@@ -236,24 +238,22 @@ public class NodeDiscovery {
}
private InetSocketAddress[] toInetSocketArray(Set<AddressAndPort> source) throws
UnknownHostException {
private static Collection<InetSocketAddress> toInetSocketCollection(Set<AddressAndPort> source)
throws UnknownHostException {
// make a safe copy
final HashSet<AddressAndPort> addressAndPorts = new HashSet<AddressAndPort>(source);
if (addressAndPorts.isEmpty())
return new InetSocketAddress[0];
return Collections.emptyList();
final InetSocketAddress[] addresses = new InetSocketAddress[addressAndPorts.size()];
int i = 0;
ArrayList<InetSocketAddress> addresses =
new ArrayList<InetSocketAddress>(addressAndPorts.size());
for (final AddressAndPort addressAndPort : addressAndPorts) {
addresses[i++] = new InetSocketAddress(InetAddress.getByAddress(addressAndPort.address())
.getHostAddress(), addressAndPort.port());
addresses.add(new InetSocketAddress(InetAddress.getByAddress(addressAndPort.address())
.getHostAddress(), addressAndPort.port()));
}
return addresses;
}
@@ -60,7 +60,7 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
private volatile SocketChannel clientChannel;
private CloseablesManager closeables;
private final StatelessMapBuilder builder;
private final StatelessMapConfig builder;
private int maxEntrySize;
private final Class<K> kClass;
private final Class<V> vClass;
@@ -96,7 +96,7 @@ class StatelessChronicleMap<K, V> implements ChronicleMap<K, V>, Closeable {
private long transactionID;
StatelessChronicleMap(final StatelessMapBuilder builder,
StatelessChronicleMap(final StatelessMapConfig builder,
final AbstractChronicleMapBuilder chronicleMapBuilder) throws IOException {
this.builder = builder;
this.keyValueSerializer = new KeyValueSerializer<K, V>(chronicleMapBuilder.keyBuilder,
@@ -18,7 +18,7 @@
package net.openhft.chronicle.map;
import net.openhft.chronicle.hash.StatelessClientBuilder;
import net.openhft.chronicle.hash.StatelessClientConfig;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -27,14 +27,14 @@ import java.util.concurrent.TimeUnit;
/**
* @author Rob Austin.
*/
class StatelessMapBuilder<K, V> implements StatelessClientBuilder<ChronicleMap<K, V>> {
class StatelessMapConfig<K, V> implements StatelessClientConfig<ChronicleMap<K, V>> {
private final AbstractChronicleMapBuilder<K, V, ?> mapBuilder;
private final InetSocketAddress remoteAddress;
private long timeoutMs = TimeUnit.SECONDS.toMillis(10);
StatelessMapBuilder(AbstractChronicleMapBuilder<K, V, ?> mapBuilder,
InetSocketAddress remoteAddress) {
StatelessMapConfig(AbstractChronicleMapBuilder<K, V, ?> mapBuilder,
InetSocketAddress remoteAddress) {
this.mapBuilder = mapBuilder;
this.remoteAddress = remoteAddress;
}
@@ -48,7 +48,7 @@ class StatelessMapBuilder<K, V> implements StatelessClientBuilder<ChronicleMap<K
}
@Override
public StatelessMapBuilder<K, V> timeout(long timeout, TimeUnit units) {
public StatelessMapConfig<K, V> timeout(long timeout, TimeUnit units) {
this.timeoutMs = units.toMillis(timeout);
return this;
}