Juan Hernandez has uploaded a new change for review. Change subject: restapi: Don't depend on Resteasy JSON provider ......................................................................
restapi: Don't depend on Resteasy JSON provider Extending this provider increases our dependency on Resteasy and doesn't provide any real benefit. Change-Id: Ic748e0aec07379760521e03e3dd8573b0546b1f0 Signed-off-by: Juan Hernandez <[email protected]> --- R backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/CustomBeanFactory.java R backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/CustomObjectMapper.java R backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/JSONProvider.java M backend/manager/modules/restapi/interface/definition/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers 4 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/29792/1 diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resteasy/json/CustomBeanFactory.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/CustomBeanFactory.java similarity index 95% rename from backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resteasy/json/CustomBeanFactory.java rename to backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/CustomBeanFactory.java index efdf40d..52a3d4c 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resteasy/json/CustomBeanFactory.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/CustomBeanFactory.java @@ -1,4 +1,4 @@ -package org.ovirt.engine.api.resteasy.json; +package org.ovirt.engine.api.json; import java.util.List; diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resteasy/json/CustomObjectMapper.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/CustomObjectMapper.java similarity index 98% rename from backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resteasy/json/CustomObjectMapper.java rename to backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/CustomObjectMapper.java index cdcdcc2..9984e94 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resteasy/json/CustomObjectMapper.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/CustomObjectMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ovirt.engine.api.resteasy.json; +package org.ovirt.engine.api.json; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.codehaus.jackson.map.DeserializationConfig; diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resteasy/json/JsonProvider.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/JSONProvider.java similarity index 80% rename from backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resteasy/json/JsonProvider.java rename to backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/JSONProvider.java index 5dd3c77..64e5e75 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/resteasy/json/JsonProvider.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/json/JSONProvider.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.ovirt.engine.api.resteasy.json; +package org.ovirt.engine.api.json; import javax.ws.rs.Consumes; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.ext.Provider; -import org.jboss.resteasy.plugins.providers.jackson.ResteasyJacksonProvider; +import org.codehaus.jackson.jaxrs.JacksonJsonProvider; @Provider @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) -public class JsonProvider extends ResteasyJacksonProvider { - public JsonProvider() { +public class JSONProvider extends JacksonJsonProvider { + public JSONProvider() { super(); setMapper(CustomObjectMapper.get()); } diff --git a/backend/manager/modules/restapi/interface/definition/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers b/backend/manager/modules/restapi/interface/definition/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers index 27d3917..7e89479 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers +++ b/backend/manager/modules/restapi/interface/definition/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers @@ -1,3 +1,3 @@ -org.ovirt.engine.api.resteasy.json.JsonProvider +org.ovirt.engine.api.json.JSONProvider org.ovirt.engine.api.xml.JAXBProvider org.ovirt.engine.api.pdf.FOPMessageBodyWriter -- To view, visit http://gerrit.ovirt.org/29792 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic748e0aec07379760521e03e3dd8573b0546b1f0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
