aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2019-06-03 22:20:31 -0700
committerAnton Tananaev <anton.tananaev@gmail.com>2019-06-03 22:20:31 -0700
commit24f96678d940b44182abfb9a8d51f0f2abdb14bc (patch)
tree21f83b65fa3347999f8d2a8a32e4cf9daad6d7cf /src
parenta8ab9f203496bd2d7acb151c3797c69b828e7160 (diff)
downloadtrackermap-server-24f96678d940b44182abfb9a8d51f0f2abdb14bc.tar.gz
trackermap-server-24f96678d940b44182abfb9a8d51f0f2abdb14bc.tar.bz2
trackermap-server-24f96678d940b44182abfb9a8d51f0f2abdb14bc.zip
Rename Sigfox HTTP protocol
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/traccar/protocol/SigfoxHttpProtocol.java (renamed from src/main/java/org/traccar/protocol/SigfoxProtocol.java)8
-rw-r--r--src/main/java/org/traccar/protocol/SigfoxHttpProtocolDecoder.java (renamed from src/main/java/org/traccar/protocol/SigfoxProtocolDecoder.java)6
-rw-r--r--src/test/java/org/traccar/protocol/SigfoxHttpProtocolDecoderTest.java (renamed from src/test/java/org/traccar/protocol/SigfoxProtocolDecoderTest.java)4
3 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/org/traccar/protocol/SigfoxProtocol.java b/src/main/java/org/traccar/protocol/SigfoxHttpProtocol.java
index e2f2cbe1f..587b8fa68 100644
--- a/src/main/java/org/traccar/protocol/SigfoxProtocol.java
+++ b/src/main/java/org/traccar/protocol/SigfoxHttpProtocol.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 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.
@@ -22,16 +22,16 @@ import org.traccar.BaseProtocol;
import org.traccar.PipelineBuilder;
import org.traccar.TrackerServer;
-public class SigfoxProtocol extends BaseProtocol {
+public class SigfoxHttpProtocol extends BaseProtocol {
- public SigfoxProtocol() {
+ public SigfoxHttpProtocol() {
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 SigfoxProtocolDecoder(SigfoxProtocol.this));
+ pipeline.addLast(new SigfoxHttpProtocolDecoder(SigfoxHttpProtocol.this));
}
});
}
diff --git a/src/main/java/org/traccar/protocol/SigfoxProtocolDecoder.java b/src/main/java/org/traccar/protocol/SigfoxHttpProtocolDecoder.java
index d7836b35d..e50336d7c 100644
--- a/src/main/java/org/traccar/protocol/SigfoxProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/SigfoxHttpProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 - 2018 Anton Tananaev (anton@traccar.org)
+ * Copyright 2017 - 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.
@@ -35,9 +35,9 @@ import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.Date;
-public class SigfoxProtocolDecoder extends BaseHttpProtocolDecoder {
+public class SigfoxHttpProtocolDecoder extends BaseHttpProtocolDecoder {
- public SigfoxProtocolDecoder(Protocol protocol) {
+ public SigfoxHttpProtocolDecoder(Protocol protocol) {
super(protocol);
}
diff --git a/src/test/java/org/traccar/protocol/SigfoxProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/SigfoxHttpProtocolDecoderTest.java
index 48adb0ccb..7acc64477 100644
--- a/src/test/java/org/traccar/protocol/SigfoxProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/SigfoxHttpProtocolDecoderTest.java
@@ -4,12 +4,12 @@ import io.netty.handler.codec.http.HttpMethod;
import org.junit.Test;
import org.traccar.ProtocolTest;
-public class SigfoxProtocolDecoderTest extends ProtocolTest {
+public class SigfoxHttpProtocolDecoderTest extends ProtocolTest {
@Test
public void testDecode() throws Exception {
- SigfoxProtocolDecoder decoder = new SigfoxProtocolDecoder(null);
+ SigfoxHttpProtocolDecoder decoder = new SigfoxHttpProtocolDecoder(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=")));