diff options
| author | Vitaliy Gergel <vitaliy.gergel@zoomdata.com> | 2020-03-05 22:22:59 +0200 |
|---|---|---|
| committer | Vitaliy Gergel <vitaliy.gergel@zoomdata.com> | 2020-03-05 22:22:59 +0200 |
| commit | 3c82764799784d3d30d969dbfef9a075f4874278 (patch) | |
| tree | 34f1acf1124575dcf891bff53cf23cc1df35d271 | |
| parent | 0270f5b639166b385ac779c0d2caa41d7c408771 (diff) | |
| download | trackermap-server-3c82764799784d3d30d969dbfef9a075f4874278.tar.gz trackermap-server-3c82764799784d3d30d969dbfef9a075f4874278.tar.bz2 trackermap-server-3c82764799784d3d30d969dbfef9a075f4874278.zip | |
Rename forward.urlVariables property
| -rw-r--r-- | src/main/java/org/traccar/WebDataHandler.java | 6 | ||||
| -rw-r--r-- | src/main/java/org/traccar/config/Keys.java | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/org/traccar/WebDataHandler.java b/src/main/java/org/traccar/WebDataHandler.java index 1af1af48a..d6bfb126b 100644 --- a/src/main/java/org/traccar/WebDataHandler.java +++ b/src/main/java/org/traccar/WebDataHandler.java @@ -67,7 +67,7 @@ public class WebDataHandler extends BaseDataHandler { private final String url; private final String header; private final boolean json; - private final boolean jsonUrlVariables; + private final boolean urlVariables; private final boolean retryEnabled; private final int retryDelay; @@ -86,7 +86,7 @@ public class WebDataHandler extends BaseDataHandler { this.url = config.getString(Keys.FORWARD_URL); this.header = config.getString(Keys.FORWARD_HEADER); this.json = config.getBoolean(Keys.FORWARD_JSON); - this.jsonUrlVariables = config.getBoolean(Keys.FORWARD_JSON_URL_VARIABLES); + this.urlVariables = config.getBoolean(Keys.FORWARD_URL_VARIABLES); this.retryEnabled = config.getBoolean(Keys.FORWARD_RETRY_ENABLE); this.retryDelay = config.getInteger(Keys.FORWARD_RETRY_DELAY, 100); @@ -194,7 +194,7 @@ public class WebDataHandler extends BaseDataHandler { String formattedUrl; try { - formattedUrl = (json && !jsonUrlVariables) ? url : formatRequest(position); + formattedUrl = (json && !urlVariables) ? url : formatRequest(position); } catch (UnsupportedEncodingException | JsonProcessingException e) { throw new RuntimeException("Forwarding formatting error", e); } diff --git a/src/main/java/org/traccar/config/Keys.java b/src/main/java/org/traccar/config/Keys.java index a5b7b780c..200ef8aa3 100644 --- a/src/main/java/org/traccar/config/Keys.java +++ b/src/main/java/org/traccar/config/Keys.java @@ -104,8 +104,8 @@ public final class Keys { * Boolean value to enable URL parameters in json mode. For example, {uniqueId} for device identifier, * {latitude} and {longitude} for coordinates. */ - public static final ConfigKey FORWARD_JSON_URL_VARIABLES = new ConfigKey( - "forward.json.url.variables", Boolean.class); + public static final ConfigKey FORWARD_URL_VARIABLES = new ConfigKey( + "forward.urlVariables", Boolean.class); /** * Position forwarding retrying enable. When enabled, additional attempts are made to deliver positions. If initial |