From 8ca988c3381b10eeb0939b05ba1cc3e49c7cc8ed Mon Sep 17 00:00:00 2001 From: nativbarak Date: Thu, 12 Apr 2018 19:11:55 +0300 Subject: Fixed wrong order of input, unused import and changed name of protocol --- src/org/traccar/protocol/AustinNBProtocol.java | 45 ++++++++++++++ .../traccar/protocol/AustinNBProtocolDecoder.java | 69 ++++++++++++++++++++++ src/org/traccar/protocol/GlobeKeeperProtocol.java | 45 -------------- .../protocol/GlobeKeeperProtocolDecoder.java | 69 ---------------------- 4 files changed, 114 insertions(+), 114 deletions(-) create mode 100644 src/org/traccar/protocol/AustinNBProtocol.java create mode 100644 src/org/traccar/protocol/AustinNBProtocolDecoder.java delete mode 100644 src/org/traccar/protocol/GlobeKeeperProtocol.java delete mode 100644 src/org/traccar/protocol/GlobeKeeperProtocolDecoder.java (limited to 'src/org/traccar/protocol') diff --git a/src/org/traccar/protocol/AustinNBProtocol.java b/src/org/traccar/protocol/AustinNBProtocol.java new file mode 100644 index 000000000..c250e9b3d --- /dev/null +++ b/src/org/traccar/protocol/AustinNBProtocol.java @@ -0,0 +1,45 @@ +/* + * Copyright 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.protocol; + +import org.jboss.netty.bootstrap.ConnectionlessBootstrap; +import org.jboss.netty.channel.ChannelPipeline; +import org.jboss.netty.handler.codec.string.StringDecoder; +import org.jboss.netty.handler.codec.string.StringEncoder; +import org.traccar.BaseProtocol; +import org.traccar.TrackerServer; + +import java.util.List; + +public class AustinNBProtocol extends BaseProtocol { + + public AustinNBProtocol() { + super("austinnb"); + } + + @Override + public void initTrackerServers(List serverList) { + serverList.add(new TrackerServer(new ConnectionlessBootstrap(), getName()) { + @Override + protected void addSpecificHandlers(ChannelPipeline pipeline) { + pipeline.addLast("stringEncoder", new StringEncoder()); + pipeline.addLast("stringDecoder", new StringDecoder()); + pipeline.addLast("objectDecoder", new AustinNBProtocolDecoder(AustinNBProtocol.this)); + } + }); + } + +} diff --git a/src/org/traccar/protocol/AustinNBProtocolDecoder.java b/src/org/traccar/protocol/AustinNBProtocolDecoder.java new file mode 100644 index 000000000..4c37ac9a2 --- /dev/null +++ b/src/org/traccar/protocol/AustinNBProtocolDecoder.java @@ -0,0 +1,69 @@ +/* + * Copyright 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.protocol; + +import org.jboss.netty.channel.Channel; +import org.traccar.BaseProtocolDecoder; +import org.traccar.DeviceSession; +import org.traccar.helper.Parser; +import org.traccar.helper.PatternBuilder; +import org.traccar.model.Position; + +import java.net.SocketAddress; +import java.util.regex.Pattern; + +public class AustinNBProtocolDecoder extends BaseProtocolDecoder { + + public AustinNBProtocolDecoder(AustinNBProtocol protocol) { + super(protocol); + } + + private static final Pattern PATTERN = new PatternBuilder() + .number("(d+);") // imei + .number("(dddd)-(dd)-(dd) ") // date + .number("(dd):(dd):(dd);") // time + .number("(-?d+,d+);") // latitude + .number("(-?d+,d+);") // longitude + .any() + .compile(); + + @Override + protected Object decode( + Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { + + Parser parser = new Parser(PATTERN, (String) msg); + if (!parser.matches()) { + return null; + } + + DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next()); + if (deviceSession == null) { + return null; + } + + Position position = new Position(getProtocolName()); + position.setDeviceId(deviceSession.getDeviceId()); + + position.setTime(parser.nextDateTime()); + + position.setValid(true); + position.setLatitude(Double.parseDouble(parser.next().replace(',', '.'))); + position.setLongitude(Double.parseDouble(parser.next().replace(',', '.'))); + + return position; + } + +} diff --git a/src/org/traccar/protocol/GlobeKeeperProtocol.java b/src/org/traccar/protocol/GlobeKeeperProtocol.java deleted file mode 100644 index 9231c067c..000000000 --- a/src/org/traccar/protocol/GlobeKeeperProtocol.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.protocol; - -import org.jboss.netty.bootstrap.ConnectionlessBootstrap; -import org.jboss.netty.channel.ChannelPipeline; -import org.jboss.netty.handler.codec.string.StringDecoder; -import org.jboss.netty.handler.codec.string.StringEncoder; -import org.traccar.BaseProtocol; -import org.traccar.TrackerServer; - -import java.util.List; - -public class GlobeKeeperProtocol extends BaseProtocol { - - public GlobeKeeperProtocol() { - super("globekeeper"); - } - - @Override - public void initTrackerServers(List serverList) { - serverList.add(new TrackerServer(new ConnectionlessBootstrap(), getName()) { - @Override - protected void addSpecificHandlers(ChannelPipeline pipeline) { - pipeline.addLast("stringEncoder", new StringEncoder()); - pipeline.addLast("stringDecoder", new StringDecoder()); - pipeline.addLast("objectDecoder", new GlobeKeeperProtocolDecoder(GlobeKeeperProtocol.this)); - } - }); - } - -} diff --git a/src/org/traccar/protocol/GlobeKeeperProtocolDecoder.java b/src/org/traccar/protocol/GlobeKeeperProtocolDecoder.java deleted file mode 100644 index c4daf4409..000000000 --- a/src/org/traccar/protocol/GlobeKeeperProtocolDecoder.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.traccar.protocol; - -import org.jboss.netty.channel.Channel; -import org.traccar.BaseProtocolDecoder; -import org.traccar.DeviceSession; -import org.traccar.helper.Parser; -import org.traccar.helper.PatternBuilder; -import org.traccar.model.Position; - -import java.net.SocketAddress; -import java.util.regex.Pattern; - -public class GlobeKeeperProtocolDecoder extends BaseProtocolDecoder { - - public GlobeKeeperProtocolDecoder(GlobeKeeperProtocol protocol) { - super(protocol); - } - - private static final Pattern PATTERN = new PatternBuilder() - .number("(d+);") // imei - .number("(dddd)-(dd)-(dd) ") // date - .number("(dd):(dd):(dd);") // time - .number("(-?d+,d+);") // latitude - .number("(-?d+,d+);") // longitude - .any() - .compile(); - - @Override - protected Object decode( - Channel channel, SocketAddress remoteAddress, Object msg) throws Exception { - - Parser parser = new Parser(PATTERN, (String) msg); - if (!parser.matches()) { - return null; - } - - DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, parser.next()); - if (deviceSession == null) { - return null; - } - - Position position = new Position(getProtocolName()); - position.setDeviceId(deviceSession.getDeviceId()); - - position.setTime(parser.nextDateTime()); - - position.setValid(true); - position.setLongitude(Double.parseDouble(parser.next().replace(',', '.'))); - position.setLatitude(Double.parseDouble(parser.next().replace(',', '.'))); - - return position; - } - -} -- cgit v1.2.3