Author: tchemit Date: 2014-05-07 11:21:47 +0200 (Wed, 07 May 2014) New Revision: 3918 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3918 Log: fix json serialization Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRender.java Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRender.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRender.java 2014-05-07 09:04:29 UTC (rev 3917) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRender.java 2014-05-07 09:21:47 UTC (rev 3918) @@ -106,24 +106,20 @@ response.setStatus(HttpServletResponse.SC_BAD_REQUEST); - map = toMap(model); - mapper = Jsons.newSimpleMapper(); } else if (model instanceof PollenPrincipalRef) { - map = toMap(model); - mapper = Jsons.newSimpleMapper(); } else { - map = model; - mapper = Jsons.newEntityMapper(); } + map = toMap(model); + // GsonBuilder gsonBuilder = new GsonBuilder().registerTypeAdapter(Date.class, new JsonSerializer<Date>() { // @Override // public JsonElement serialize(Date src, Type typeOfSrc, JsonSerializationContext c) { @@ -210,6 +206,7 @@ } // single object + // FIXME Do this in service, not here if (model instanceof TopiaEntity) { @@ -243,10 +240,13 @@ } } + return result; + } return model; + } protected static class PollenEntityBinder<E extends TopiaEntity> extends Binder<E, E> {