Add ListMarshaller and SetMarshaller factory methods

This commit is contained in:
leventov
2016-01-11 15:22:42 +03:00
parent c75965020e
commit b168612d90
4 changed files with 25 additions and 9 deletions
@@ -59,6 +59,16 @@ import static net.openhft.chronicle.hash.serialization.StatefulCopyable.copyIfNe
public final class ListMarshaller<T>
implements BytesReader<List<T>>, BytesWriter<List<T>>, StatefulCopyable<ListMarshaller<T>> {
public static <T> ListMarshaller<T> of(
BytesReader<T> elementReader, BytesWriter<? super T> elementWriter) {
return new ListMarshaller<>(elementReader, elementWriter);
}
public static <T, M extends BytesReader<T> & BytesWriter<? super T>> ListMarshaller<T> of(
M elementMarshaller) {
return of(elementMarshaller, elementMarshaller);
}
// Config fields
private BytesReader<T> elementReader;
private BytesWriter<? super T> elementWriter;
@@ -60,6 +60,16 @@ import static net.openhft.chronicle.hash.serialization.StatefulCopyable.copyIfNe
public final class SetMarshaller<T>
implements BytesReader<Set<T>>, BytesWriter<Set<T>>, StatefulCopyable<SetMarshaller<T>> {
public static <T> SetMarshaller<T> of(
BytesReader<T> elementReader, BytesWriter<? super T> elementWriter) {
return new SetMarshaller<>(elementReader, elementWriter);
}
public static <T, M extends BytesReader<T> & BytesWriter<? super T>> SetMarshaller<T> of(
M elementMarshaller) {
return of(elementMarshaller, elementMarshaller);
}
// Config fields
private BytesReader<T> elementReader;
private BytesWriter<? super T> elementWriter;
@@ -2415,12 +2415,11 @@ public class CHMUseCasesTest {
@Test
public void testListValue() throws IOException {
ListMarshaller<String> valueMarshaller = new ListMarshaller<>(
new StringBytesReader(), CharSequenceBytesWriter.INSTANCE);
ChronicleMapBuilder<String, List<String>> builder = ChronicleMapBuilder
.of(String.class, (Class<List<String>>) (Class) List.class)
.entries(2)
.valueMarshaller(valueMarshaller);
.valueMarshaller(ListMarshaller.of(
new StringBytesReader(), CharSequenceBytesWriter.INSTANCE));
try (ChronicleMap<String, List<String>> map = newInstance(builder)) {
@@ -2463,12 +2462,11 @@ public class CHMUseCasesTest {
@Test
public void testSetValue() throws IOException {
SetMarshaller<String> valueMarshaller = new SetMarshaller<>(
new StringBytesReader(), CharSequenceBytesWriter.INSTANCE);
ChronicleMapBuilder<String, Set<String>> builder = ChronicleMapBuilder
.of(String.class, (Class<Set<String>>) (Class) Set.class)
.entries(10)
.valueMarshaller(valueMarshaller);
.valueMarshaller(SetMarshaller.of(
new StringBytesReader(), CharSequenceBytesWriter.INSTANCE));
try (ChronicleMap<String, Set<String>> map = newInstance(builder)) {
@@ -38,12 +38,10 @@ public class DefaultValueTest {
ArrayList<Integer> defaultValue = new ArrayList<Integer>();
defaultValue.add(42);
ListMarshaller<Integer> valueMarshaller =
new ListMarshaller<>(IntegerMarshaller.INSTANCE, IntegerMarshaller.INSTANCE);
try (ChronicleMap<String, List<Integer>> map = ChronicleMap
.of(String.class, (Class<List<Integer>>) ((Class) List.class))
.entries(3)
.valueMarshaller(valueMarshaller)
.valueMarshaller(ListMarshaller.of(IntegerMarshaller.INSTANCE))
.averageKey("a").averageValue(Arrays.asList(1, 2))
.defaultValueProvider(absentEntry ->
absentEntry.context().wrapValueAsData(defaultValue))