From 377a2234ef8c25c54c22acf9db36d102347e0ad4 Mon Sep 17 00:00:00 2001 From: nativbarak Date: Sun, 4 Feb 2018 15:31:10 +0200 Subject: added POST option to forward url --- src/org/traccar/BasePipelineFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/org/traccar/BasePipelineFactory.java') diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java index aa188d209..e8034779d 100644 --- a/src/org/traccar/BasePipelineFactory.java +++ b/src/org/traccar/BasePipelineFactory.java @@ -238,7 +238,7 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { } if (Context.getConfig().getBoolean("forward.enable")) { - pipeline.addLast("webHandler", new WebDataHandler(Context.getConfig().getString("forward.url"))); + pipeline.addLast("webHandler", new WebDataHandler(Context.getConfig().getString("forward.url"), Context.getConfig().getBoolean("forward.json"))); } if (commandResultEventHandler != null) { -- cgit v1.2.3 From dc092138fc69bb5f8f137be435309d3945c49b13 Mon Sep 17 00:00:00 2001 From: nativbarak Date: Sun, 4 Feb 2018 17:12:51 +0200 Subject: Fixed length on basepipelinefactory --- src/org/traccar/BasePipelineFactory.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/org/traccar/BasePipelineFactory.java') diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java index e8034779d..4407caae4 100644 --- a/src/org/traccar/BasePipelineFactory.java +++ b/src/org/traccar/BasePipelineFactory.java @@ -238,7 +238,9 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { } if (Context.getConfig().getBoolean("forward.enable")) { - pipeline.addLast("webHandler", new WebDataHandler(Context.getConfig().getString("forward.url"), Context.getConfig().getBoolean("forward.json"))); + final Boolean json = Context.getConfig().getBoolean("forward.json"); + final String url = Context.getConfig().getString("forward.url"); + pipeline.addLast("webHandler", new WebDataHandler(url, json)); } if (commandResultEventHandler != null) { -- cgit v1.2.3 From da1f01f9367e882b90b495cfae9b67d71e0cf1bb Mon Sep 17 00:00:00 2001 From: nativbarak Date: Wed, 7 Feb 2018 09:11:01 +0200 Subject: fixed inline variables + test name --- src/org/traccar/BasePipelineFactory.java | 5 ++--- test/org/traccar/WebDataHandlerTest.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/org/traccar/BasePipelineFactory.java') diff --git a/src/org/traccar/BasePipelineFactory.java b/src/org/traccar/BasePipelineFactory.java index 4407caae4..5a077da7c 100644 --- a/src/org/traccar/BasePipelineFactory.java +++ b/src/org/traccar/BasePipelineFactory.java @@ -238,9 +238,8 @@ public abstract class BasePipelineFactory implements ChannelPipelineFactory { } if (Context.getConfig().getBoolean("forward.enable")) { - final Boolean json = Context.getConfig().getBoolean("forward.json"); - final String url = Context.getConfig().getString("forward.url"); - pipeline.addLast("webHandler", new WebDataHandler(url, json)); + pipeline.addLast("webHandler", new WebDataHandler(Context.getConfig().getString("forward.url"), + Context.getConfig().getBoolean("forward.json"))); } if (commandResultEventHandler != null) { diff --git a/test/org/traccar/WebDataHandlerTest.java b/test/org/traccar/WebDataHandlerTest.java index 3e79232ec..30b50d8b9 100644 --- a/test/org/traccar/WebDataHandlerTest.java +++ b/test/org/traccar/WebDataHandlerTest.java @@ -23,7 +23,7 @@ public class WebDataHandlerTest extends ProtocolTest { } @Test - public void testBuilderRequest() throws ParseException { + public void testPrepareJsonPayload() throws ParseException { Position p = position("2016-01-01 01:02:03.000", true, 20, 30); -- cgit v1.2.3