diff options
author | Valerij Fredriksen <valerij92@gmail.com> | 2019-01-17 20:54:57 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-01-24 10:02:12 +0100 |
commit | b13b03a23713aeccaa09a61cd07acf8b8b3caba9 (patch) | |
tree | 8632d721cc8d1be4124ff2457338e7a7a0ac18a2 /flags | |
parent | f154ace6c528101766eeccc6a7d840889eb33eb8 (diff) |
Implement JacksonArraySerializer and test serialization/deserialization
Diffstat (limited to 'flags')
-rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/JacksonArraySerializer.java | 2 | ||||
-rw-r--r-- | flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/JacksonArraySerializer.java b/flags/src/main/java/com/yahoo/vespa/flags/JacksonArraySerializer.java index 619c0c51c17..5716582e0aa 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/JacksonArraySerializer.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/JacksonArraySerializer.java @@ -16,6 +16,6 @@ public class JacksonArraySerializer<T> implements FlagSerializer<List<T>> { @Override public RawFlag serialize(List<T> value) { - return null; + return JsonNodeRawFlag.fromJacksonClass(value); } } diff --git a/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java b/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java index aa41cbbd94d..eccca6ccfde 100644 --- a/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java +++ b/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java @@ -106,14 +106,15 @@ public class FlagsTest { defaultInstance, instance); } - private <T> void testGeneric(UnboundFlag<?, ?, ?> unboundFlag, T defaultValue, T value) { + private <T> void testGeneric(UnboundFlag<T, ?, ?> unboundFlag, T defaultValue, T value) { FlagSource source = mock(FlagSource.class); - Flag<?, ?> flag = unboundFlag.bindTo(source); + Flag<T, ?> flag = unboundFlag.bindTo(source); - when(source.fetch(any(), any())).thenReturn(Optional.empty()); - assertThat(flag.boxedValue(), equalTo(defaultValue)); + when(source.fetch(any(), any())) + .thenReturn(Optional.empty()) + .thenReturn(Optional.of(flag.serializer().serialize(value))); - when(source.fetch(any(), any())).thenReturn(Optional.of(JsonNodeRawFlag.fromJacksonClass(value))); + assertThat(flag.boxedValue(), equalTo(defaultValue)); assertThat(flag.boxedValue(), equalTo(value)); assertTrue(Flags.getFlag(unboundFlag.id()).isPresent()); |