mirror/traccar
1
0
Fork 0
mirror of https://github.com/traccar/traccar.git synced 2026-01-31 10:43:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename Sigfox HTTP protocol

Browse Source
This commit is contained in:
Anton Tananaev
2019-06-03 22:20:31 -07:00
parent a8ab9f2034
commit 24f96678d9
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/default.xml
View File

@@ -230,7 +230,7 @@
<entry key='recoda.port'>5151</entry>
<entry key='oko.port'>5152</entry>
<entry key='ivt401.port'>5153</entry>
<entry key='sigfox.port'>5154</entry>
<entry key='sigfoxhttp.port'>5154</entry>
<entry key='t57.port'>5155</entry>
<entry key='spot.port'>5156</entry>
<entry key='m2c.port'>5157</entry>

8
src/main/java/org/traccar/protocol/SigfoxProtocol.java → src/main/java/org/traccar/protocol/SigfoxHttpProtocol.java
View File

@@ -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));
}
});
}

6
src/main/java/org/traccar/protocol/SigfoxProtocolDecoder.java → src/main/java/org/traccar/protocol/SigfoxHttpProtocolDecoder.java
View File

@@ -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);
}

4
src/test/java/org/traccar/protocol/SigfoxProtocolDecoderTest.java → src/test/java/org/traccar/protocol/SigfoxHttpProtocolDecoderTest.java
View File

@@ -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=")));