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
@@ -261,14 +261,14 @@ public class ChronicleSetBuilder<E>
}
@Override
public StatelessClientBuilder<ChronicleSet<E>> statelessClient(
public StatelessClientConfig<ChronicleSet<E>> statelessClient(
InetSocketAddress remoteAddress) {
return new StatelessSetBuilder<>(chronicleMapBuilder.statelessClient(remoteAddress));
return new StatelessSetConfig<>(chronicleMapBuilder.statelessClient(remoteAddress));
}
@Override
public ChronicleHashInstanceBuilder<ChronicleSet<E>> instance() {
return new InstanceBuilder<>(chronicleMapBuilder.instance());
public ChronicleHashInstanceConfig<ChronicleSet<E>> instance() {
return new InstanceConfig<>(chronicleMapBuilder.instance());
}
@Override
@@ -16,7 +16,7 @@
package net.openhft.chronicle.set;
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;
@@ -25,38 +25,38 @@ import net.openhft.chronicle.map.ChronicleMap;
import java.io.File;
import java.io.IOException;
final class InstanceBuilder<E> implements ChronicleHashInstanceBuilder<ChronicleSet<E>> {
final class InstanceConfig<E> implements ChronicleHashInstanceConfig<ChronicleSet<E>> {
private final ChronicleHashInstanceBuilder<ChronicleMap<E, DummyValue>> mapBuilder;
private final ChronicleHashInstanceConfig<ChronicleMap<E, DummyValue>> mapConfig;
InstanceBuilder(ChronicleHashInstanceBuilder<ChronicleMap<E, DummyValue>> mapBuilder) {
this.mapBuilder = mapBuilder;
InstanceConfig(ChronicleHashInstanceConfig<ChronicleMap<E, DummyValue>> mapConfig) {
this.mapConfig = mapConfig;
}
@Override
public ChronicleHashInstanceBuilder<ChronicleSet<E>> replicated(
public ChronicleHashInstanceConfig<ChronicleSet<E>> replicated(
byte identifier, TcpConfig tcpTransportAndNetwork) {
return new InstanceBuilder<>(mapBuilder.replicated(identifier, tcpTransportAndNetwork));
return new InstanceConfig<>(mapConfig.replicated(identifier, tcpTransportAndNetwork));
}
@Override
public ChronicleHashInstanceBuilder<ChronicleSet<E>> replicated(SimpleReplication replication) {
return new InstanceBuilder<>(mapBuilder.replicated(replication));
public ChronicleHashInstanceConfig<ChronicleSet<E>> replicated(SimpleReplication replication) {
return new InstanceConfig<>(mapConfig.replicated(replication));
}
@Override
public ChronicleHashInstanceBuilder<ChronicleSet<E>> replicatedViaChannel(
public ChronicleHashInstanceConfig<ChronicleSet<E>> replicatedViaChannel(
ReplicationChannel channel) {
return new InstanceBuilder<>(mapBuilder.replicatedViaChannel(channel));
return new InstanceConfig<>(mapConfig.replicatedViaChannel(channel));
}
@Override
public ChronicleHashInstanceBuilder<ChronicleSet<E>> persistedTo(File file) {
return new InstanceBuilder<>(mapBuilder.persistedTo(file));
public ChronicleHashInstanceConfig<ChronicleSet<E>> persistedTo(File file) {
return new InstanceConfig<>(mapConfig.persistedTo(file));
}
@Override
public ChronicleSet<E> create() throws IOException {
return new SetFromMap<>(mapBuilder.create());
return new SetFromMap<>(mapConfig.create());
}
}
@@ -16,23 +16,23 @@
package net.openhft.chronicle.set;
import net.openhft.chronicle.hash.StatelessClientBuilder;
import net.openhft.chronicle.hash.StatelessClientConfig;
import net.openhft.chronicle.map.ChronicleMap;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
final class StatelessSetBuilder<E> implements StatelessClientBuilder<ChronicleSet<E>> {
final class StatelessSetConfig<E> implements StatelessClientConfig<ChronicleSet<E>> {
private final StatelessClientBuilder<ChronicleMap<E, DummyValue>> mapClientBuilder;
private final StatelessClientConfig<ChronicleMap<E, DummyValue>> mapClientBuilder;
StatelessSetBuilder(StatelessClientBuilder<ChronicleMap<E, DummyValue>> mapClientBuilder) {
StatelessSetConfig(StatelessClientConfig<ChronicleMap<E, DummyValue>> mapClientBuilder) {
this.mapClientBuilder = mapClientBuilder;
}
@Override
public StatelessClientBuilder<ChronicleSet<E>> timeout(long timeout, TimeUnit units) {
return new StatelessSetBuilder<>(mapClientBuilder.timeout(timeout, units));
public StatelessClientConfig<ChronicleSet<E>> timeout(long timeout, TimeUnit units) {
return new StatelessSetConfig<>(mapClientBuilder.timeout(timeout, units));
}
@Override