From cb4ba475c71cd83a2bde40938216b55e8f686207 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Wed, 20 Feb 2019 22:54:58 -0800 Subject: Support headers for forwarding --- src/org/traccar/notification/EventForwarder.java | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'src/org/traccar/notification') diff --git a/src/org/traccar/notification/EventForwarder.java b/src/org/traccar/notification/EventForwarder.java index b8990d84f..c0010ebbd 100644 --- a/src/org/traccar/notification/EventForwarder.java +++ b/src/org/traccar/notification/EventForwarder.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 - 2018 Anton Tananaev (anton@traccar.org) + * Copyright 2016 - 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. @@ -15,8 +15,6 @@ */ package org.traccar.notification; -import org.apache.commons.collections4.MultiValuedMap; -import org.apache.commons.collections4.multimap.ArrayListValuedHashMap; import org.traccar.Context; import org.traccar.model.Device; import org.traccar.model.Event; @@ -52,25 +50,15 @@ public abstract class EventForwarder { Invocation.Builder requestBuilder = Context.getClient().target(url).request(); if (header != null && !header.isEmpty()) { - for (Map.Entry entry : splitKeyValues(header, ":").entries()) { - requestBuilder = requestBuilder.header(entry.getKey(), entry.getValue()); + for (String line: header.split("\\r?\\n")) { + String[] values = line.split(":", 2); + requestBuilder.header(values[0].trim(), values[1].trim()); } } executeRequest(event, position, users, requestBuilder.async()); } - protected MultiValuedMap splitKeyValues(String params, String separator) { - MultiValuedMap data = new ArrayListValuedHashMap<>(); - for (String line: params.split("\\r?\\n")) { - String[] values = line.split(separator, 2); - if (values.length == 2) { - data.put(values[0].trim(), values[1].trim()); - } - } - return data; - } - protected Map preparePayload(Event event, Position position, Set users) { Map data = new HashMap<>(); data.put(KEY_EVENT, event); -- cgit v1.2.3