From d6d7f60601c7a9e01a5a2d85fcc5100445a8bc48 Mon Sep 17 00:00:00 2001 From: lresende Date: Sun, 29 Sep 2013 22:54:33 +0000 Subject: Replace json.org dependency with json4j git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1527418 13f79535-47bb-0310-9956-ffa450edef68 --- .../json/provider/JSONWireFormatInterceptor.java | 2 +- .../wireformat/json/CatalogServiceTestCase.java | 4 ++-- .../branches/2.0/modules/databinding-json/pom.xml | 26 ++++++++-------------- .../sca/databinding/json/JSONDataBinding.java | 4 ++-- .../tuscany/sca/databinding/json/JSONHelper.java | 22 +++++++++--------- .../json/jackson/JSON2OutputStream.java | 4 ++-- .../databinding/json/jackson/JacksonHelper.java | 10 ++++----- .../databinding/json/JSONTransformerTestCase.java | 2 +- .../itest/distribution/legal-checks/pom.xml | 2 +- 9 files changed, 34 insertions(+), 42 deletions(-) diff --git a/sca-java-2.x/branches/2.0/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatInterceptor.java b/sca-java-2.x/branches/2.0/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatInterceptor.java index e5ce32328c..705564ebd3 100644 --- a/sca-java-2.x/branches/2.0/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatInterceptor.java +++ b/sca-java-2.x/branches/2.0/modules/binding-rest-runtime/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/provider/JSONWireFormatInterceptor.java @@ -33,7 +33,7 @@ import org.apache.tuscany.sca.invocation.Interceptor; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; import org.apache.tuscany.sca.runtime.RuntimeEndpoint; -import org.json.JSONObject; +import org.apache.wink.json4j.JSONObject; /** * JSON wire format Interceptor. diff --git a/sca-java-2.x/branches/2.0/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java b/sca-java-2.x/branches/2.0/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java index b3cf3f1975..2ea889f0bf 100644 --- a/sca-java-2.x/branches/2.0/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java +++ b/sca-java-2.x/branches/2.0/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java @@ -26,8 +26,8 @@ import org.apache.tuscany.sca.node.Contribution; import org.apache.tuscany.sca.node.ContributionLocationHelper; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; -import org.json.JSONException; -import org.json.JSONObject; +import org.apache.wink.json4j.JSONException; +import org.apache.wink.json4j.JSONObject; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/sca-java-2.x/branches/2.0/modules/databinding-json/pom.xml b/sca-java-2.x/branches/2.0/modules/databinding-json/pom.xml index 44e1599e8c..4bdf30463a 100644 --- a/sca-java-2.x/branches/2.0/modules/databinding-json/pom.xml +++ b/sca-java-2.x/branches/2.0/modules/databinding-json/pom.xml @@ -52,25 +52,13 @@ jackson-xc 1.9.4 - - - com.fasterxml - jackson-module-json-org - 0.9.1 - - - junit - junit - - - - + - org.json - json - 20090211 + org.apache.wink + wink-json4j + 1.2.0-incubating - + org.slf4j slf4j-api @@ -94,6 +82,10 @@ stax stax-api + + stax + jsr173 + diff --git a/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java b/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java index 1557c90bce..56b7819474 100644 --- a/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java +++ b/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONDataBinding.java @@ -40,14 +40,14 @@ public class JSONDataBinding extends BaseDataBinding { public static final QName ROOT_ELEMENT = new QName(ROOT_NAMESPACE, "root"); public JSONDataBinding() { - super(NAME, org.json.JSONObject.class); + super(NAME, org.apache.wink.json4j.JSONObject.class); } @Override public boolean introspect(DataType type, Operation operation) { assert type != null; Class cls = type.getPhysical(); - if (JSONObject.class.isAssignableFrom(cls) || org.json.JSONObject.class.isAssignableFrom(cls)) { + if (JSONObject.class.isAssignableFrom(cls) || org.apache.wink.json4j.JSONObject.class.isAssignableFrom(cls)) { type.setDataBinding(getName()); if (type.getLogical() == null) { type.setLogical(XMLType.UNKNOWN); diff --git a/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java b/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java index a17c08ad20..29b2fea649 100644 --- a/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java +++ b/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/JSONHelper.java @@ -26,7 +26,7 @@ import org.codehaus.jackson.JsonNode; import org.codehaus.jackson.JsonParser; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; -import org.json.JSONArray; +import org.apache.wink.json4j.JSONArray; /** * @version $Rev$ $Date$ @@ -45,7 +45,7 @@ public class JSONHelper { JSONObject json = null; if (source instanceof JSONObject) { json = (JSONObject)source; - } else if (source instanceof org.json.JSONObject || source instanceof String) { + } else if (source instanceof org.apache.wink.json4j.JSONObject || source instanceof String) { json = stringToJettision(source.toString()); } else if (source instanceof JsonNode) { json = stringToJettision(JacksonHelper.toString((JsonNode)source)); @@ -64,20 +64,20 @@ public class JSONHelper { } /** - * Convert to org.json.JSONObject + * Convert to org.apache.wink.json4j.JSONObject * @param source * @return */ - public static org.json.JSONObject toJSONOrg(Object source) { - org.json.JSONObject json = null; + public static org.apache.wink.json4j.JSONObject toJSONOrg(Object source) { + org.apache.wink.json4j.JSONObject json = null; if (source instanceof JSONObject) { try { - json = new org.json.JSONObject(((JSONObject)source).toString()); - } catch (org.json.JSONException e) { + json = new org.apache.wink.json4j.JSONObject(((JSONObject)source).toString()); + } catch (org.apache.wink.json4j.JSONException e) { throw new IllegalArgumentException(e); } - } else if (source instanceof org.json.JSONObject) { - json = (org.json.JSONObject)source; + } else if (source instanceof org.apache.wink.json4j.JSONObject) { + json = (org.apache.wink.json4j.JSONObject)source; } return json; } @@ -91,13 +91,13 @@ public class JSONHelper { } } else { if (type == null) { - type = org.json.JSONObject.class; + type = org.apache.wink.json4j.JSONObject.class; } try { if (type == JSONArray.class || type.isArray() || Collection.class.isAssignableFrom(type)) { return new JSONArray(json); } - return JacksonHelper.MAPPER.readValue(json, org.json.JSONObject.class); + return JacksonHelper.MAPPER.readValue(json, org.apache.wink.json4j.JSONObject.class); } catch (Exception e) { throw new IllegalArgumentException(e); } diff --git a/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2OutputStream.java b/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2OutputStream.java index 1151d59570..4edc75532b 100644 --- a/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2OutputStream.java +++ b/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JSON2OutputStream.java @@ -30,8 +30,8 @@ import org.apache.tuscany.sca.databinding.json.JSONDataBinding; import org.codehaus.jackson.JsonNode; import org.codehaus.jackson.JsonParser; import org.codehaus.jackson.map.ObjectMapper; -import org.json.JSONArray; -import org.json.JSONObject; +import org.apache.wink.json4j.JSONArray; +import org.apache.wink.json4j.JSONObject; /** * diff --git a/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java b/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java index 049907786c..d2232eeaec 100644 --- a/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java +++ b/sca-java-2.x/branches/2.0/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/JacksonHelper.java @@ -48,9 +48,9 @@ import org.codehaus.jackson.map.util.StdDateFormat; import org.codehaus.jackson.xc.JaxbAnnotationIntrospector; import org.codehaus.jackson.xc.XmlAdapterJsonDeserializer; import org.codehaus.jackson.xc.XmlAdapterJsonSerializer; -import org.json.JSONObject; +import org.apache.wink.json4j.JSONObject; -import com.fasterxml.jackson.module.jsonorg.JsonOrgModule; +//import com.fasterxml.jackson.module.jsonorg.JsonOrgModule; /** * @@ -91,7 +91,7 @@ public class JacksonHelper { StdDeserializerProvider deserializerProvider = new StdDeserializerProvider(deserializerFactory); mapper = new ObjectMapper(); - mapper.registerModule(new JsonOrgModule()); + //mapper.registerModule(new JsonOrgModule()); mapper.setSerializerFactory(serializerFactory); mapper.setDeserializerProvider(deserializerProvider); @@ -105,7 +105,7 @@ public class JacksonHelper { } if (mapper == null) { mapper = new ObjectMapper(); - mapper.registerModule(new JsonOrgModule()); + //mapper.registerModule(new JsonOrgModule()); } // Let's honor the Jackson annotations first AnnotationIntrospector primary = new JacksonAnnotationIntrospector(); @@ -202,7 +202,7 @@ public class JacksonHelper { } /** - * Read from String into a org.json.JSONObject + * Read from String into a org.apache.wink.json4j.JSONObject * @param json * @return */ diff --git a/sca-java-2.x/branches/2.0/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java b/sca-java-2.x/branches/2.0/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java index 1aa6cf3dab..c7ba5de0bc 100644 --- a/sca-java-2.x/branches/2.0/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java +++ b/sca-java-2.x/branches/2.0/modules/databinding-json/src/test/java/org/apache/tuscany/sca/databinding/json/JSONTransformerTestCase.java @@ -39,7 +39,7 @@ import org.apache.tuscany.sca.databinding.json.axiom.JSON2OMElement; import org.apache.tuscany.sca.interfacedef.DataType; import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl; import org.apache.tuscany.sca.interfacedef.util.XMLType; -import org.json.JSONObject; +import org.apache.wink.json4j.JSONObject; import org.junit.Test; public class JSONTransformerTestCase { diff --git a/sca-java-2.x/branches/2.0/testing/itest/distribution/legal-checks/pom.xml b/sca-java-2.x/branches/2.0/testing/itest/distribution/legal-checks/pom.xml index 888f833640..05112b03a4 100644 --- a/sca-java-2.x/branches/2.0/testing/itest/distribution/legal-checks/pom.xml +++ b/sca-java-2.x/branches/2.0/testing/itest/distribution/legal-checks/pom.xml @@ -56,7 +56,7 @@ - ../../../../distribution/all/target/apache-tuscany-sca-all-2.0.dir + ../../../../distribution/all/target/apache-tuscany-sca-all-${project.version}.dir false tuscany-sca-2.0/CHANGES -- cgit v1.2.3