Author: davidb
Date: Mon Aug 29 07:52:25 2016
New Revision: 1758181
URL: http://svn.apache.org/viewvc?rev=1758181&view=rev
Log:
Remove hardcoded dependency to ConverterImpl
Modified:
felix/trunk/converter/codec/src/main/java/org/apache/felix/codec/impl/json/JsonCodecImpl.java
felix/trunk/converter/codec/src/main/java/org/apache/felix/codec/impl/yaml/YamlCodecImpl.java
Modified:
felix/trunk/converter/codec/src/main/java/org/apache/felix/codec/impl/json/JsonCodecImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/converter/codec/src/main/java/org/apache/felix/codec/impl/json/JsonCodecImpl.java?rev=1758181&r1=1758180&r2=1758181&view=diff
==============================================================================
---
felix/trunk/converter/codec/src/main/java/org/apache/felix/codec/impl/json/JsonCodecImpl.java
(original)
+++
felix/trunk/converter/codec/src/main/java/org/apache/felix/codec/impl/json/JsonCodecImpl.java
Mon Aug 29 07:52:25 2016
@@ -24,17 +24,17 @@ import java.nio.charset.StandardCharsets
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.felix.converter.impl.ConverterImpl;
import org.osgi.service.codec.Codec;
import org.osgi.service.codec.Decoding;
import org.osgi.service.codec.Encoding;
import org.osgi.service.converter.Converter;
import org.osgi.service.converter.TypeReference;
+import org.osgi.service.converter.util.ConverterFactory;
public class JsonCodecImpl implements Codec {
private Map<String, Object> configuration = new ConcurrentHashMap<>();
private ThreadLocal<Boolean> threadLocal = new ThreadLocal<>();
- private Converter converter = new ConverterImpl();
+ private Converter converter = ConverterFactory.standardConverter();
@Override
public Codec with(Converter c) {
Modified:
felix/trunk/converter/codec/src/main/java/org/apache/felix/codec/impl/yaml/YamlCodecImpl.java
URL:
http://svn.apache.org/viewvc/felix/trunk/converter/codec/src/main/java/org/apache/felix/codec/impl/yaml/YamlCodecImpl.java?rev=1758181&r1=1758180&r2=1758181&view=diff
==============================================================================
---
felix/trunk/converter/codec/src/main/java/org/apache/felix/codec/impl/yaml/YamlCodecImpl.java
(original)
+++
felix/trunk/converter/codec/src/main/java/org/apache/felix/codec/impl/yaml/YamlCodecImpl.java
Mon Aug 29 07:52:25 2016
@@ -20,16 +20,16 @@ import java.lang.reflect.Type;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.felix.converter.impl.ConverterImpl;
import org.osgi.service.codec.Codec;
import org.osgi.service.codec.Decoding;
import org.osgi.service.codec.Encoding;
import org.osgi.service.converter.Converter;
import org.osgi.service.converter.TypeReference;
+import org.osgi.service.converter.util.ConverterFactory;
public class YamlCodecImpl implements Codec {
private Map<String, Object> configuration = new ConcurrentHashMap<>();
- private Converter converter = new ConverterImpl();
+ private Converter converter = ConverterFactory.standardConverter();
@Override
public Codec with(Converter c) {
