JLANG-39 HCOLL-214 refactored builders (leaved a single builder class), fixes in DataValueBytesMarshallers implementation

This commit is contained in:
leventov
2014-12-11 20:31:57 +07:00
parent 5e5b969bf2
commit 872d34e230
51 changed files with 1661 additions and 2619 deletions
@@ -52,7 +52,7 @@ import java.util.concurrent.TimeUnit;
* @see ChronicleSet
* @see net.openhft.chronicle.map.ChronicleMapBuilder
*/
public class ChronicleSetBuilder<E>
public final class ChronicleSetBuilder<E>
implements ChronicleHashBuilder<E, ChronicleSet<E>, ChronicleSetBuilder<E>> {
private ChronicleMapBuilder<E, DummyValue> chronicleMapBuilder;
@@ -64,7 +64,7 @@ public class ChronicleSetBuilder<E>
}
public static <K> ChronicleSetBuilder<K> of(Class<K> keyClass) {
return new ChronicleSetBuilder<K>(keyClass);
return new ChronicleSetBuilder<>(keyClass);
}
@Override
@@ -153,6 +153,12 @@ public class ChronicleSetBuilder<E>
return this;
}
@Override
public ChronicleSetBuilder<E> maxEntryOversizeFactor(int maxEntryOversizeFactor) {
chronicleMapBuilder.maxEntryOversizeFactor(maxEntryOversizeFactor);
return this;
}
@Override
public ChronicleSetBuilder<E> entries(long entries) {
chronicleMapBuilder.entries(entries);
@@ -227,7 +233,7 @@ public class ChronicleSetBuilder<E>
}
@Override
public ChronicleSetBuilder<E> keyMarshaller(@NotNull BytesMarshaller<E> keyMarshaller) {
public ChronicleSetBuilder<E> keyMarshaller(@NotNull BytesMarshaller<? super E> keyMarshaller) {
chronicleMapBuilder.keyMarshaller(keyMarshaller);
return this;
}
@@ -293,31 +299,26 @@ public class ChronicleSetBuilder<E>
}
@Override
public ChronicleHashInstanceConfig<ChronicleSet<E>> instance() {
return new InstanceConfig<>(chronicleMapBuilder.instance());
public ChronicleSet<E> createStatelessClient(InetSocketAddress serverAddress)
throws IOException {
return statelessClient(serverAddress).create();
}
@Override
public ChronicleSet<E> create() throws IOException {
public ChronicleHashInstanceConfig<ChronicleSet<E>> instance() {
return new SetInstanceConfig<>(chronicleMapBuilder.instance());
}
@Override
public ChronicleSet<E> create() {
final ChronicleMap<E, DummyValue> map = chronicleMapBuilder.create();
return new SetFromMap<E>(map);
return new SetFromMap<>(map);
}
@Override
public ChronicleSet<E> createPersistedTo(File file) throws IOException {
ChronicleMap<E, DummyValue> map = chronicleMapBuilder.createPersistedTo(file);
return new SetFromMap<E>(map);
return new SetFromMap<>(map);
}
@Override
public String name() {
return chronicleMapBuilder.name();
}
public ChronicleSetBuilder<E> name(String name) {
chronicleMapBuilder.name(name);
return this;
}
}