From 5f9e3491660ea0e0f37a55da8ca806b01f54bf8d Mon Sep 17 00:00:00 2001 From: David Leangen Date: Wed, 20 Dec 2017 06:23:15 +0000 Subject: [PATCH] [FELIX-5766] Bring Converter sister projects up to date with recent changes to Converter git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1818738 13f79535-47bb-0310-9956-ffa450edef68 --- converter/persister/pom.xml | 2 +- converter/schematizer/pom.xml | 2 +- converter/serializer/pom.xml | 2 +- .../felix/serializer/impl/AbstractSpecifying.java | 11 +++++------ .../serializer/impl/json/JsonSerializingImpl.java | 7 +++++++ .../serializer/impl/yaml/YamlSerializingImpl.java | 8 ++++++++ 6 files changed, 23 insertions(+), 9 deletions(-) diff --git a/converter/persister/pom.xml b/converter/persister/pom.xml index da595f23d11..18e1de3a151 100644 --- a/converter/persister/pom.xml +++ b/converter/persister/pom.xml @@ -28,7 +28,7 @@ Apache Felix Persister Service org.apache.felix.persister - 0.2.0-SNAPSHOT + 0.3.0-SNAPSHOT jar diff --git a/converter/schematizer/pom.xml b/converter/schematizer/pom.xml index 13fa29680a9..d6b9ea2a27a 100644 --- a/converter/schematizer/pom.xml +++ b/converter/schematizer/pom.xml @@ -28,7 +28,7 @@ Apache Felix Schematizer Service org.apache.felix.schematizer - 0.2.0-SNAPSHOT + 0.3.0-SNAPSHOT jar diff --git a/converter/serializer/pom.xml b/converter/serializer/pom.xml index 60cc3709742..2b5014badb6 100644 --- a/converter/serializer/pom.xml +++ b/converter/serializer/pom.xml @@ -28,7 +28,7 @@ Apache Felix Serializer Services org.apache.felix.serializer - 0.2.0-SNAPSHOT + 0.3.0-SNAPSHOT jar diff --git a/converter/serializer/src/main/java/org/apache/felix/serializer/impl/AbstractSpecifying.java b/converter/serializer/src/main/java/org/apache/felix/serializer/impl/AbstractSpecifying.java index 65cb6d21517..26cbde3fcd2 100644 --- a/converter/serializer/src/main/java/org/apache/felix/serializer/impl/AbstractSpecifying.java +++ b/converter/serializer/src/main/java/org/apache/felix/serializer/impl/AbstractSpecifying.java @@ -35,11 +35,11 @@ private T castThis() { return (T) this; } - @Override - public T copy() { - forceCopy = true; - return castThis(); - } +// @Override +// public T copy() { +// forceCopy = true; +// return castThis(); +// } @Override public T defaultValue(Object defVal) { @@ -97,5 +97,4 @@ public T targetAsDTO() { targetAsDTO = true; return castThis(); } - } diff --git a/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonSerializingImpl.java b/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonSerializingImpl.java index 0392cd1a0fb..1a4577295f9 100644 --- a/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonSerializingImpl.java +++ b/converter/serializer/src/main/java/org/apache/felix/serializer/impl/json/JsonSerializingImpl.java @@ -81,4 +81,11 @@ public Serializing writeWith(Writer w) { writer = w; return this; } + + // TODO: what is intended here?? + @Override + public Serializing view() + { + return null; + } } diff --git a/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlSerializingImpl.java b/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlSerializingImpl.java index 9525722a86f..b03f03b1f78 100644 --- a/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlSerializingImpl.java +++ b/converter/serializer/src/main/java/org/apache/felix/serializer/impl/yaml/YamlSerializingImpl.java @@ -83,4 +83,12 @@ public Serializing writeWith(Writer w) { useCustomWriter = true; return this; } + + + // TODO: what is intended here?? + @Override + public Serializing view() + { + return null; + } }