aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/WebDataHandler.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/traccar/WebDataHandler.java')
-rw-r--r--src/org/traccar/WebDataHandler.java33
1 files changed, 27 insertions, 6 deletions
diff --git a/src/org/traccar/WebDataHandler.java b/src/org/traccar/WebDataHandler.java
index a8e20c698..68c6f5e7c 100644
--- a/src/org/traccar/WebDataHandler.java
+++ b/src/org/traccar/WebDataHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 2019 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@ import org.traccar.model.Group;
import javax.inject.Inject;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation;
import java.util.HashMap;
import java.util.Map;
import java.io.UnsupportedEncodingException;
@@ -51,20 +52,22 @@ public class WebDataHandler extends BaseDataHandler {
private final Client client;
private final String url;
+ private final String header;
private final boolean json;
public interface Factory {
- WebDataHandler create(String url, boolean json);
+ WebDataHandler create(String url, String header, boolean json);
}
@Inject
public WebDataHandler(
IdentityManager identityManager, ObjectMapper objectMapper, Client client,
- @Assisted String url, @Assisted boolean json) {
+ @Assisted String url, @Assisted String header, @Assisted boolean json) {
this.identityManager = identityManager;
this.objectMapper = objectMapper;
this.client = client;
this.url = url;
+ this.header = header;
this.json = json;
}
@@ -157,15 +160,33 @@ public class WebDataHandler extends BaseDataHandler {
@Override
protected Position handlePosition(Position position) {
+
+ String url;
if (json) {
- client.target(url).request().async().post(Entity.json(prepareJsonPayload(position)));
+ url = this.url;
} else {
try {
- client.target(formatRequest(position)).request().async().get();
+ url = formatRequest(position);
} catch (UnsupportedEncodingException | JsonProcessingException e) {
- LOGGER.warn("Forwarding formatting error", e);
+ throw new RuntimeException("Forwarding formatting error", e);
+ }
+ }
+
+ Invocation.Builder requestBuilder = client.target(url).request();
+
+ if (header != null && !header.isEmpty()) {
+ for (String line: header.split("\\r?\\n")) {
+ String[] values = line.split(":", 2);
+ requestBuilder.header(values[0].trim(), values[1].trim());
}
}
+
+ if (json) {
+ requestBuilder.async().post(Entity.json(prepareJsonPayload(position)));
+ } else {
+ requestBuilder.async().get();
+ }
+
return position;
}