aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2019-06-05 08:55:06 -0700
committerAnton Tananaev <anton.tananaev@gmail.com>2019-06-05 08:55:06 -0700
commit920c732f65718f6b1f06b204016223e2d8462630 (patch)
tree74e2c96e246db898aea5084e8ed5a5a1f9227ee5
parent514868567c76982018a40918d6594f5d3800e94e (diff)
downloadtrackermap-server-920c732f65718f6b1f06b204016223e2d8462630.tar.gz
trackermap-server-920c732f65718f6b1f06b204016223e2d8462630.tar.bz2
trackermap-server-920c732f65718f6b1f06b204016223e2d8462630.zip
Revert "Rename Sigfox HTTP protocol"
This reverts commit 24f96678
-rw-r--r--setup/default.xml2
-rw-r--r--src/main/java/org/traccar/protocol/SigfoxProtocol.java (renamed from src/main/java/org/traccar/protocol/SigfoxHttpProtocol.java)8
-rw-r--r--src/main/java/org/traccar/protocol/SigfoxProtocolDecoder.java (renamed from src/main/java/org/traccar/protocol/SigfoxHttpProtocolDecoder.java)6
-rw-r--r--src/test/java/org/traccar/protocol/SigfoxProtocolDecoderTest.java (renamed from src/test/java/org/traccar/protocol/SigfoxHttpProtocolDecoderTest.java)4
4 files changed, 10 insertions, 10 deletions
diff --git a/setup/default.xml b/setup/default.xml
index 32000432b..f2063c5ed 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -230,7 +230,7 @@
<entry key='recoda.port'>5151</entry>
<entry key='oko.port'>5152</entry>
<entry key='ivt401.port'>5153</entry>
- <entry key='sigfoxhttp.port'>5154</entry>
+ <entry key='sigfox.port'>5154</entry>
<entry key='t57.port'>5155</entry>
<entry key='spot.port'>5156</entry>
<entry key='m2c.port'>5157</entry>
diff --git a/src/main/java/org/traccar/protocol/SigfoxHttpProtocol.java b/src/main/java/org/traccar/protocol/SigfoxProtocol.java
index 587b8fa68..e2f2cbe1f 100644
--- a/src/main/java/org/traccar/protocol/SigfoxHttpProtocol.java
+++ b/src/main/java/org/traccar/protocol/SigfoxProtocol.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2018 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.
@@ -22,16 +22,16 @@ import org.traccar.BaseProtocol;
import org.traccar.PipelineBuilder;
import org.traccar.TrackerServer;
-public class SigfoxHttpProtocol extends BaseProtocol {
+public class SigfoxProtocol extends BaseProtocol {
- public SigfoxHttpProtocol() {
+ public SigfoxProtocol() {
addServer(new TrackerServer(false, getName()) {
@Override
protected void addProtocolHandlers(PipelineBuilder pipeline) {
pipeline.addLast(new HttpResponseEncoder());
pipeline.addLast(new HttpRequestDecoder());
pipeline.addLast(new HttpObjectAggregator(65535));
- pipeline.addLast(new SigfoxHttpProtocolDecoder(SigfoxHttpProtocol.this));
+ pipeline.addLast(new SigfoxProtocolDecoder(SigfoxProtocol.this));
}
});
}
diff --git a/src/main/java/org/traccar/protocol/SigfoxHttpProtocolDecoder.java b/src/main/java/org/traccar/protocol/SigfoxProtocolDecoder.java
index e50336d7c..d7836b35d 100644
--- a/src/main/java/org/traccar/protocol/SigfoxHttpProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/SigfoxProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 - 2019 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 2018 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.
@@ -35,9 +35,9 @@ import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.Date;
-public class SigfoxHttpProtocolDecoder extends BaseHttpProtocolDecoder {
+public class SigfoxProtocolDecoder extends BaseHttpProtocolDecoder {
- public SigfoxHttpProtocolDecoder(Protocol protocol) {
+ public SigfoxProtocolDecoder(Protocol protocol) {
super(protocol);
}
diff --git a/src/test/java/org/traccar/protocol/SigfoxHttpProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/SigfoxProtocolDecoderTest.java
index 7acc64477..48adb0ccb 100644
--- a/src/test/java/org/traccar/protocol/SigfoxHttpProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/SigfoxProtocolDecoderTest.java
@@ -4,12 +4,12 @@ import io.netty.handler.codec.http.HttpMethod;
import org.junit.Test;
import org.traccar.ProtocolTest;
-public class SigfoxHttpProtocolDecoderTest extends ProtocolTest {
+public class SigfoxProtocolDecoderTest extends ProtocolTest {
@Test
public void testDecode() throws Exception {
- SigfoxHttpProtocolDecoder decoder = new SigfoxHttpProtocolDecoder(null);
+ SigfoxProtocolDecoder decoder = new SigfoxProtocolDecoder(null);
verifyPosition(decoder, request(HttpMethod.POST, "/",
buffer("%7B++%22device%22%3A%222BF839%22%2C++%22time%22%3A1510605882%2C++%22duplicate%22%3Afalse%2C++%22snr%22%3A45.61%2C++%22station%22%3A%2235A9%22%2C++%22data%22%3A%2200bd6475e907398e562d01b9%22%2C++%22avgSnr%22%3A45.16%2C++%22lat%22%3A-38.0%2C++%22lng%22%3A145.0%2C++%22rssi%22%3A-98.00%2C++%22seqNumber%22%3A228+%7D=")));