- Global jsonPrettyPrinting option

- Minor refactoring
- Config option name changed from "event.forward.prettyPrintedPayload" to "config.mapper.prettyPrintedJson"

1 files changed, 1 insertions, 14 deletions

diff --git a/src/org/traccar/notification/EventForwarder.java b/src/org/traccar/notification/EventForwarder.java
index c21799d74..d7e0eca19 100644
--- a/src/org/traccar/notification/EventForwarder.java
+++ b/src/org/traccar/notification/EventForwarder.java
@@ -29,7 +29,6 @@ import org.traccar.model.Geofence;
 import org.traccar.model.Position;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectWriter;
 import com.ning.http.client.AsyncHttpClient.BoundRequestBuilder;
 import com.ning.http.client.FluentCaseInsensitiveStringsMap;
 
@@ -39,14 +38,12 @@ public abstract class EventForwarder {
     private String header;
     private final String payloadParamName;
     private final String additionalParams;
-    private final boolean prettyPrinted;
 
     public EventForwarder() {
         url = Context.getConfig().getString("event.forward.url", "http://localhost/");
         header = Context.getConfig().getString("event.forward.header", "");
         payloadParamName = Context.getConfig().getString("event.forward.paramMode.payloadParamName", "payload");
         additionalParams = Context.getConfig().getString("event.forward.paramMode.additionalParams", "");
-        prettyPrinted = Context.getConfig().getBoolean("event.forward.prettyPrintedPayload");
     }
 
     private static final String KEY_POSITION = "position";
@@ -105,29 +102,19 @@ public abstract class EventForwarder {
             }
         }
         try {
-            return getObjectWriter().writeValueAsString(data);
+            return Context.getObjectMapper().writeValueAsString(data);
         } catch (JsonProcessingException e) {
             Log.warning(e);
             return null;
         }
     }
 
-    protected ObjectWriter getObjectWriter() {
-        return prettyPrinted
-            ? Context.getObjectWriterPrettyPrinter()
-            : Context.getObjectMapper().writer();
-    }
-
-
     protected String getPayloadParamName() {
         return payloadParamName;
     }
     protected String getAdditionalParams() {
         return additionalParams;
     }
-    protected boolean isPrettyPrinted() {
-        return prettyPrinted;
-    }
 
     protected abstract String getContentType();
     protected abstract void setContent(Event event, Position position, BoundRequestBuilder requestBuilder);