Author: cziegeler
Date: Mon Aug 6 06:08:58 2018
New Revision: 1837479
URL: http://svn.apache.org/viewvc?rev=1837479&view=rev
Log:
FELIX-5847 : ClassNotFoundException with complex JSON String with Array
Modified:
felix/trunk/configurator/pom.xml
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/json/JSONUtil.java
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/json/TypeConverter.java
Modified: felix/trunk/configurator/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/configurator/pom.xml?rev=1837479&r1=1837478&r2=1837479&view=diff
==============================================================================
--- felix/trunk/configurator/pom.xml (original)
+++ felix/trunk/configurator/pom.xml Mon Aug 6 06:08:58 2018
@@ -29,7 +29,7 @@
<artifactId>org.apache.felix.configurator</artifactId>
<packaging>bundle</packaging>
- <name>Apache Felix Configurer Service</name>
+ <name>Apache Felix Configurator Service</name>
<description>
Implementation of the OSGi Configurator Service Specification 1.0
</description>
Modified:
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/json/JSONUtil.java
URL:
http://svn.apache.org/viewvc/felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/json/JSONUtil.java?rev=1837479&r1=1837478&r2=1837479&view=diff
==============================================================================
---
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/json/JSONUtil.java
(original)
+++
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/json/JSONUtil.java
Mon Aug 6 06:08:58 2018
@@ -36,7 +36,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.json.Json;
import javax.json.JsonArray;
import javax.json.JsonArrayBuilder;
import javax.json.JsonNumber;
@@ -265,7 +264,7 @@ public class JSONUtil {
if ( value instanceof List ) {
@SuppressWarnings("unchecked")
final List<Object> list = (List<Object>)value;
- final JsonArrayBuilder builder = Json.createArrayBuilder();
+ final JsonArrayBuilder builder = new
JsonProviderImpl().createArrayBuilder();
for(final Object obj : list) {
if ( obj instanceof String ) {
builder.add(obj.toString());
@@ -286,7 +285,7 @@ public class JSONUtil {
} else if ( value instanceof Map ) {
@SuppressWarnings("unchecked")
final Map<String, Object> map = (Map<String, Object>)value;
- final JsonObjectBuilder builder = Json.createObjectBuilder();
+ final JsonObjectBuilder builder = new
JsonProviderImpl().createObjectBuilder();
for(final Map.Entry<String, Object> entry : map.entrySet()) {
if ( entry.getValue() instanceof String ) {
builder.add(entry.getKey(), entry.getValue().toString());
Modified:
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/json/TypeConverter.java
URL:
http://svn.apache.org/viewvc/felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/json/TypeConverter.java?rev=1837479&r1=1837478&r2=1837479&view=diff
==============================================================================
---
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/json/TypeConverter.java
(original)
+++
felix/trunk/configurator/src/main/java/org/apache/felix/configurator/impl/json/TypeConverter.java
Mon Aug 6 06:08:58 2018
@@ -28,9 +28,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.json.Json;
import javax.json.JsonStructure;
+import org.apache.johnzon.core.JsonProviderImpl;
import org.osgi.util.converter.Converter;
import org.osgi.util.converter.ConverterFunction;
import org.osgi.util.converter.Converters;
@@ -56,7 +56,7 @@ public class TypeConverter {
if ( obj instanceof Map || obj instanceof List ) {
final JsonStructure json = JSONUtil.build(obj);
final StringWriter w = new StringWriter();
- Json.createWriter(w).write(json);
+ new JsonProviderImpl().createWriter(w).write(json);
return w.toString();
}
return CANNOT_HANDLE;
