aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/org/traccar/api/resource/DeviceResource.java2
-rw-r--r--src/org/traccar/api/resource/SessionResource.java11
-rw-r--r--src/org/traccar/notification/EventForwarder.java4
-rw-r--r--src/org/traccar/web/CsvBuilder.java2
-rw-r--r--test/org/traccar/FilterHandlerTest.java2
-rw-r--r--test/org/traccar/ProtocolTest.java1
-rw-r--r--test/org/traccar/WebDataHandlerTest.java1
-rw-r--r--test/org/traccar/calendar/CalendarTest.java1
-rw-r--r--test/org/traccar/database/DataManagerTest.java1
-rw-r--r--test/org/traccar/database/GroupTreeTest.java1
-rw-r--r--test/org/traccar/geocoder/AddressFormatTest.java1
-rw-r--r--test/org/traccar/geocoder/GeocoderTest.java1
-rw-r--r--test/org/traccar/geofence/GeofenceCircleTest.java1
-rw-r--r--test/org/traccar/geofence/GeofencePolygonTest.java1
-rw-r--r--test/org/traccar/geofence/GeofencePolylineTest.java1
-rw-r--r--test/org/traccar/geolocation/GeolocationProviderTest.java1
-rw-r--r--test/org/traccar/helper/BcdUtilTest.java1
-rw-r--r--test/org/traccar/helper/BitUtilTest.java1
-rw-r--r--test/org/traccar/helper/ChecksumTest.java1
-rw-r--r--test/org/traccar/helper/DateBuilderTest.java1
-rw-r--r--test/org/traccar/helper/DateUtilTest.java1
-rw-r--r--test/org/traccar/helper/DistanceCalculatorTest.java1
-rw-r--r--test/org/traccar/helper/LocationTreeTest.java1
-rw-r--r--test/org/traccar/helper/ObdDecoderTest.java1
-rw-r--r--test/org/traccar/helper/PatternBuilderTest.java1
-rw-r--r--test/org/traccar/helper/StringFinderTest.java5
-rw-r--r--test/org/traccar/notification/NotificiationMailTest.java4
-rw-r--r--test/org/traccar/processing/ComputedAttributesTest.java1
-rw-r--r--test/org/traccar/protocol/AdmProtocolEncoderTest.java1
-rw-r--r--test/org/traccar/protocol/AplicomFrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/At2000FrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/AtrackFrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/EskyFrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/GalileoFrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/GatorProtocolDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/Gl200FrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/Gps056FrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/Gps103ProtocolEncoderTest.java1
-rw-r--r--test/org/traccar/protocol/GranitFrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/Gt06FrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/H02FrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/H02ProtocolEncoderTest.java1
-rw-r--r--test/org/traccar/protocol/HuaShengFrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/HuabaoFrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/Jt600FrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/L100FrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/MegastekFrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/MeiligaoFrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/MeitrackFrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/MeitrackProtocolEncoderTest.java1
-rw-r--r--test/org/traccar/protocol/MiniFinderProtocolEncoderTest.java1
-rw-r--r--test/org/traccar/protocol/NvsFrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/Pt502FrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/Pt502ProtocolEncoderTest.java1
-rw-r--r--test/org/traccar/protocol/TelicFrameDecoderTest.java2
-rw-r--r--test/org/traccar/protocol/Tk103ProtocolEncoderTest.java3
-rw-r--r--test/org/traccar/protocol/TmgFrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/TotemFrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/TotemProtocolEncoderTest.java1
-rw-r--r--test/org/traccar/protocol/TzoneProtocolDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/UlbotechFrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/Vt200FrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/VtfmsFrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/WatchProtocolEncoderTest.java1
-rw-r--r--test/org/traccar/protocol/WondexFrameDecoderTest.java1
-rw-r--r--test/org/traccar/protocol/WondexProtocolEncoderTest.java1
-rw-r--r--test/org/traccar/protocol/XexunFrameDecoderTest.java1
-rw-r--r--test/org/traccar/reports/ReportUtilsTest.java1
68 files changed, 12 insertions, 82 deletions
diff --git a/src/org/traccar/api/resource/DeviceResource.java b/src/org/traccar/api/resource/DeviceResource.java
index ddf8832ed..87927e45b 100644
--- a/src/org/traccar/api/resource/DeviceResource.java
+++ b/src/org/traccar/api/resource/DeviceResource.java
@@ -71,7 +71,7 @@ public class DeviceResource extends BaseObjectResource<Device> {
result = deviceManager.getUserItems(userId);
}
} else {
- result = new HashSet<Long>();
+ result = new HashSet<>();
for (String uniqueId : uniqueIds) {
Device device = deviceManager.getByUniqueId(uniqueId);
Context.getPermissionsManager().checkDevice(getUserId(), device.getId());
diff --git a/src/org/traccar/api/resource/SessionResource.java b/src/org/traccar/api/resource/SessionResource.java
index 3f7842626..2a0bd4364 100644
--- a/src/org/traccar/api/resource/SessionResource.java
+++ b/src/org/traccar/api/resource/SessionResource.java
@@ -61,15 +61,14 @@ public class SessionResource extends BaseResource {
Cookie[] cookies = request.getCookies();
String email = null, password = null;
if (cookies != null) {
- for (int i = 0; i < cookies.length; i++) {
- if (cookies[i].getName().equals(USER_COOKIE_KEY)) {
+ for (Cookie cookie : cookies) {
+ if (cookie.getName().equals(USER_COOKIE_KEY)) {
byte[] emailBytes = DatatypeConverter.parseBase64Binary(
- URLDecoder.decode(cookies[i].getValue(), StandardCharsets.US_ASCII.name()));
+ URLDecoder.decode(cookie.getValue(), StandardCharsets.US_ASCII.name()));
email = new String(emailBytes, StandardCharsets.UTF_8);
- }
- if (cookies[i].getName().equals(PASS_COOKIE_KEY)) {
+ } else if (cookie.getName().equals(PASS_COOKIE_KEY)) {
byte[] passwordBytes = DatatypeConverter.parseBase64Binary(
- URLDecoder.decode(cookies[i].getValue(), StandardCharsets.US_ASCII.name()));
+ URLDecoder.decode(cookie.getValue(), StandardCharsets.US_ASCII.name()));
password = new String(passwordBytes, StandardCharsets.UTF_8);
}
}
diff --git a/src/org/traccar/notification/EventForwarder.java b/src/org/traccar/notification/EventForwarder.java
index ad8134f18..d1bdd4aba 100644
--- a/src/org/traccar/notification/EventForwarder.java
+++ b/src/org/traccar/notification/EventForwarder.java
@@ -17,7 +17,7 @@ package org.traccar.notification;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.ning.http.client.AsyncHttpClient.BoundRequestBuilder;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import org.traccar.Context;
@@ -73,7 +73,7 @@ public abstract class EventForwarder {
for (String paramLine: paramsLines) {
splitedLine = paramLine.split(separator, 2);
if (splitedLine.length == 2) {
- paramsMap.put(splitedLine[0].trim(), Arrays.asList(splitedLine[1].trim()));
+ paramsMap.put(splitedLine[0].trim(), Collections.singletonList(splitedLine[1].trim()));
}
}
return paramsMap;
diff --git a/src/org/traccar/web/CsvBuilder.java b/src/org/traccar/web/CsvBuilder.java
index 2bbe89788..fa99f1b18 100644
--- a/src/org/traccar/web/CsvBuilder.java
+++ b/src/org/traccar/web/CsvBuilder.java
@@ -51,7 +51,7 @@ public class CsvBuilder {
private SortedSet<Method> getSortedMethods(Object object) {
Method[] methodArray = object.getClass().getMethods();
- SortedSet<Method> methods = new TreeSet<Method>(new Comparator<Method>() {
+ SortedSet<Method> methods = new TreeSet<>(new Comparator<Method>() {
@Override
public int compare(Method m1, Method m2) {
if (m1.getName().equals("getAttributes") && !m1.getName().equals(m2.getName())) {
diff --git a/test/org/traccar/FilterHandlerTest.java b/test/org/traccar/FilterHandlerTest.java
index 0d488a7fb..8b1ba3b1f 100644
--- a/test/org/traccar/FilterHandlerTest.java
+++ b/test/org/traccar/FilterHandlerTest.java
@@ -3,8 +3,6 @@ package org.traccar;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.traccar.database.IdentityManager;
-import org.traccar.model.Device;
import org.traccar.model.Position;
import java.util.Date;
diff --git a/test/org/traccar/ProtocolTest.java b/test/org/traccar/ProtocolTest.java
index 246e3d0e7..e67b53aa8 100644
--- a/test/org/traccar/ProtocolTest.java
+++ b/test/org/traccar/ProtocolTest.java
@@ -5,7 +5,6 @@ import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.handler.codec.http.DefaultHttpRequest;
import org.jboss.netty.handler.codec.http.HttpMethod;
import org.jboss.netty.handler.codec.http.HttpVersion;
-import org.junit.Assert;
import org.traccar.model.CellTower;
import org.traccar.model.Command;
import org.traccar.model.Position;
diff --git a/test/org/traccar/WebDataHandlerTest.java b/test/org/traccar/WebDataHandlerTest.java
index be05e0855..70b098b0f 100644
--- a/test/org/traccar/WebDataHandlerTest.java
+++ b/test/org/traccar/WebDataHandlerTest.java
@@ -1,6 +1,5 @@
package org.traccar;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.model.Position;
diff --git a/test/org/traccar/calendar/CalendarTest.java b/test/org/traccar/calendar/CalendarTest.java
index ae68af9c0..0de89f97f 100644
--- a/test/org/traccar/calendar/CalendarTest.java
+++ b/test/org/traccar/calendar/CalendarTest.java
@@ -7,7 +7,6 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.model.Calendar;
diff --git a/test/org/traccar/database/DataManagerTest.java b/test/org/traccar/database/DataManagerTest.java
index 3e3dcab6c..f9945c994 100644
--- a/test/org/traccar/database/DataManagerTest.java
+++ b/test/org/traccar/database/DataManagerTest.java
@@ -1,6 +1,5 @@
package org.traccar.database;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.model.Attribute;
import org.traccar.model.Device;
diff --git a/test/org/traccar/database/GroupTreeTest.java b/test/org/traccar/database/GroupTreeTest.java
index 3e75f9073..b547aab60 100644
--- a/test/org/traccar/database/GroupTreeTest.java
+++ b/test/org/traccar/database/GroupTreeTest.java
@@ -1,6 +1,5 @@
package org.traccar.database;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.model.Device;
import org.traccar.model.Group;
diff --git a/test/org/traccar/geocoder/AddressFormatTest.java b/test/org/traccar/geocoder/AddressFormatTest.java
index 12f38fca4..0cc5168ef 100644
--- a/test/org/traccar/geocoder/AddressFormatTest.java
+++ b/test/org/traccar/geocoder/AddressFormatTest.java
@@ -1,6 +1,5 @@
package org.traccar.geocoder;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/test/org/traccar/geocoder/GeocoderTest.java b/test/org/traccar/geocoder/GeocoderTest.java
index 3b53495c4..1ddc43ad2 100644
--- a/test/org/traccar/geocoder/GeocoderTest.java
+++ b/test/org/traccar/geocoder/GeocoderTest.java
@@ -2,7 +2,6 @@ package org.traccar.geocoder;
import java.util.Locale;
-import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
diff --git a/test/org/traccar/geofence/GeofenceCircleTest.java b/test/org/traccar/geofence/GeofenceCircleTest.java
index 020b10a0b..259a8fb77 100644
--- a/test/org/traccar/geofence/GeofenceCircleTest.java
+++ b/test/org/traccar/geofence/GeofenceCircleTest.java
@@ -2,7 +2,6 @@ package org.traccar.geofence;
import java.text.ParseException;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/test/org/traccar/geofence/GeofencePolygonTest.java b/test/org/traccar/geofence/GeofencePolygonTest.java
index 31f35120f..94b73af3a 100644
--- a/test/org/traccar/geofence/GeofencePolygonTest.java
+++ b/test/org/traccar/geofence/GeofencePolygonTest.java
@@ -2,7 +2,6 @@ package org.traccar.geofence;
import java.text.ParseException;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/test/org/traccar/geofence/GeofencePolylineTest.java b/test/org/traccar/geofence/GeofencePolylineTest.java
index 1b51c17f6..1e9dcb7c3 100644
--- a/test/org/traccar/geofence/GeofencePolylineTest.java
+++ b/test/org/traccar/geofence/GeofencePolylineTest.java
@@ -2,7 +2,6 @@ package org.traccar.geofence;
import java.text.ParseException;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/test/org/traccar/geolocation/GeolocationProviderTest.java b/test/org/traccar/geolocation/GeolocationProviderTest.java
index 97b5b32da..2729052d6 100644
--- a/test/org/traccar/geolocation/GeolocationProviderTest.java
+++ b/test/org/traccar/geolocation/GeolocationProviderTest.java
@@ -1,6 +1,5 @@
package org.traccar.geolocation;
-import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.traccar.BaseTest;
diff --git a/test/org/traccar/helper/BcdUtilTest.java b/test/org/traccar/helper/BcdUtilTest.java
index 9ffceacd9..e97aad09f 100644
--- a/test/org/traccar/helper/BcdUtilTest.java
+++ b/test/org/traccar/helper/BcdUtilTest.java
@@ -1,7 +1,6 @@
package org.traccar.helper;
import org.jboss.netty.buffer.ChannelBuffers;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/test/org/traccar/helper/BitUtilTest.java b/test/org/traccar/helper/BitUtilTest.java
index 683c4e6b8..90431bf55 100644
--- a/test/org/traccar/helper/BitUtilTest.java
+++ b/test/org/traccar/helper/BitUtilTest.java
@@ -1,6 +1,5 @@
package org.traccar.helper;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/test/org/traccar/helper/ChecksumTest.java b/test/org/traccar/helper/ChecksumTest.java
index 1c20ba899..a7c66a2a2 100644
--- a/test/org/traccar/helper/ChecksumTest.java
+++ b/test/org/traccar/helper/ChecksumTest.java
@@ -2,7 +2,6 @@ package org.traccar.helper;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
-import org.junit.Assert;
import org.junit.Test;
import java.nio.charset.StandardCharsets;
diff --git a/test/org/traccar/helper/DateBuilderTest.java b/test/org/traccar/helper/DateBuilderTest.java
index 8b2898fed..b6323cc1d 100644
--- a/test/org/traccar/helper/DateBuilderTest.java
+++ b/test/org/traccar/helper/DateBuilderTest.java
@@ -1,6 +1,5 @@
package org.traccar.helper;
-import org.junit.Assert;
import org.junit.Test;
import java.text.DateFormat;
diff --git a/test/org/traccar/helper/DateUtilTest.java b/test/org/traccar/helper/DateUtilTest.java
index b0bae4d11..ec42e71ae 100644
--- a/test/org/traccar/helper/DateUtilTest.java
+++ b/test/org/traccar/helper/DateUtilTest.java
@@ -1,6 +1,5 @@
package org.traccar.helper;
-import org.junit.Assert;
import org.junit.Test;
import java.text.DateFormat;
diff --git a/test/org/traccar/helper/DistanceCalculatorTest.java b/test/org/traccar/helper/DistanceCalculatorTest.java
index f12a1ec83..a7457b6c4 100644
--- a/test/org/traccar/helper/DistanceCalculatorTest.java
+++ b/test/org/traccar/helper/DistanceCalculatorTest.java
@@ -1,6 +1,5 @@
package org.traccar.helper;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/test/org/traccar/helper/LocationTreeTest.java b/test/org/traccar/helper/LocationTreeTest.java
index 3984b1142..21604144a 100644
--- a/test/org/traccar/helper/LocationTreeTest.java
+++ b/test/org/traccar/helper/LocationTreeTest.java
@@ -1,6 +1,5 @@
package org.traccar.helper;
-import org.junit.Assert;
import org.junit.Test;
import java.util.ArrayList;
diff --git a/test/org/traccar/helper/ObdDecoderTest.java b/test/org/traccar/helper/ObdDecoderTest.java
index d9cc2ed6b..1ffe68c8b 100644
--- a/test/org/traccar/helper/ObdDecoderTest.java
+++ b/test/org/traccar/helper/ObdDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.helper;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/test/org/traccar/helper/PatternBuilderTest.java b/test/org/traccar/helper/PatternBuilderTest.java
index a8fb1aa93..4c76bc463 100644
--- a/test/org/traccar/helper/PatternBuilderTest.java
+++ b/test/org/traccar/helper/PatternBuilderTest.java
@@ -1,6 +1,5 @@
package org.traccar.helper;
-import org.junit.Assert;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
diff --git a/test/org/traccar/helper/StringFinderTest.java b/test/org/traccar/helper/StringFinderTest.java
index 6bc78ea82..f35f9a759 100644
--- a/test/org/traccar/helper/StringFinderTest.java
+++ b/test/org/traccar/helper/StringFinderTest.java
@@ -1,16 +1,11 @@
package org.traccar.helper;
import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferFactory;
import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.buffer.HeapChannelBufferFactory;
-import org.junit.Assert;
import org.junit.Test;
-import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
-import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
public class StringFinderTest {
diff --git a/test/org/traccar/notification/NotificiationMailTest.java b/test/org/traccar/notification/NotificiationMailTest.java
index 975505a3a..b82bec02e 100644
--- a/test/org/traccar/notification/NotificiationMailTest.java
+++ b/test/org/traccar/notification/NotificiationMailTest.java
@@ -1,5 +1,6 @@
package org.traccar.notification;
+import org.junit.Ignore;
import org.junit.Test;
import javax.mail.Message;
@@ -24,7 +25,8 @@ public class NotificiationMailTest {
private static final int PORT = 25;
- //@Test
+ @Ignore
+ @Test
public void test() throws Exception {
Properties props = System.getProperties();
diff --git a/test/org/traccar/processing/ComputedAttributesTest.java b/test/org/traccar/processing/ComputedAttributesTest.java
index 88ebfd9a9..160067915 100644
--- a/test/org/traccar/processing/ComputedAttributesTest.java
+++ b/test/org/traccar/processing/ComputedAttributesTest.java
@@ -2,7 +2,6 @@ package org.traccar.processing;
import java.util.Date;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.model.Attribute;
import org.traccar.model.Position;
diff --git a/test/org/traccar/protocol/AdmProtocolEncoderTest.java b/test/org/traccar/protocol/AdmProtocolEncoderTest.java
index fd4ea4af0..cb0a31ceb 100644
--- a/test/org/traccar/protocol/AdmProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/AdmProtocolEncoderTest.java
@@ -16,7 +16,6 @@
*/
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
import org.traccar.model.Command;
diff --git a/test/org/traccar/protocol/AplicomFrameDecoderTest.java b/test/org/traccar/protocol/AplicomFrameDecoderTest.java
index 6ba8f9334..581f7696f 100644
--- a/test/org/traccar/protocol/AplicomFrameDecoderTest.java
+++ b/test/org/traccar/protocol/AplicomFrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/At2000FrameDecoderTest.java b/test/org/traccar/protocol/At2000FrameDecoderTest.java
index 52490c107..5613f832e 100644
--- a/test/org/traccar/protocol/At2000FrameDecoderTest.java
+++ b/test/org/traccar/protocol/At2000FrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/AtrackFrameDecoderTest.java b/test/org/traccar/protocol/AtrackFrameDecoderTest.java
index 12ce783ad..9db4fd052 100644
--- a/test/org/traccar/protocol/AtrackFrameDecoderTest.java
+++ b/test/org/traccar/protocol/AtrackFrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/EskyFrameDecoderTest.java b/test/org/traccar/protocol/EskyFrameDecoderTest.java
index e8902e8be..3b16a9051 100644
--- a/test/org/traccar/protocol/EskyFrameDecoderTest.java
+++ b/test/org/traccar/protocol/EskyFrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/GalileoFrameDecoderTest.java b/test/org/traccar/protocol/GalileoFrameDecoderTest.java
index 049c16efa..7a7c97ba6 100644
--- a/test/org/traccar/protocol/GalileoFrameDecoderTest.java
+++ b/test/org/traccar/protocol/GalileoFrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/GatorProtocolDecoderTest.java b/test/org/traccar/protocol/GatorProtocolDecoderTest.java
index ae6240b3e..360a3abed 100644
--- a/test/org/traccar/protocol/GatorProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/GatorProtocolDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/Gl200FrameDecoderTest.java b/test/org/traccar/protocol/Gl200FrameDecoderTest.java
index 2112ce466..e90c6495a 100644
--- a/test/org/traccar/protocol/Gl200FrameDecoderTest.java
+++ b/test/org/traccar/protocol/Gl200FrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/Gps056FrameDecoderTest.java b/test/org/traccar/protocol/Gps056FrameDecoderTest.java
index 58c64f59e..ce21f733f 100644
--- a/test/org/traccar/protocol/Gps056FrameDecoderTest.java
+++ b/test/org/traccar/protocol/Gps056FrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/Gps103ProtocolEncoderTest.java b/test/org/traccar/protocol/Gps103ProtocolEncoderTest.java
index cfb1d5b90..f888ee252 100644
--- a/test/org/traccar/protocol/Gps103ProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/Gps103ProtocolEncoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
import org.traccar.model.Command;
diff --git a/test/org/traccar/protocol/GranitFrameDecoderTest.java b/test/org/traccar/protocol/GranitFrameDecoderTest.java
index aa5a5b580..130b9dbd7 100644
--- a/test/org/traccar/protocol/GranitFrameDecoderTest.java
+++ b/test/org/traccar/protocol/GranitFrameDecoderTest.java
@@ -2,7 +2,6 @@ package org.traccar.protocol;
import java.nio.ByteOrder;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/Gt06FrameDecoderTest.java b/test/org/traccar/protocol/Gt06FrameDecoderTest.java
index 97230695a..cf6d1cfd7 100644
--- a/test/org/traccar/protocol/Gt06FrameDecoderTest.java
+++ b/test/org/traccar/protocol/Gt06FrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/H02FrameDecoderTest.java b/test/org/traccar/protocol/H02FrameDecoderTest.java
index 214f1c9fa..bdb2ff37b 100644
--- a/test/org/traccar/protocol/H02FrameDecoderTest.java
+++ b/test/org/traccar/protocol/H02FrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/H02ProtocolEncoderTest.java b/test/org/traccar/protocol/H02ProtocolEncoderTest.java
index bf3978385..e7b409a88 100644
--- a/test/org/traccar/protocol/H02ProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/H02ProtocolEncoderTest.java
@@ -1,7 +1,6 @@
package org.traccar.protocol;
import org.joda.time.DateTime;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
import org.traccar.model.Command;
diff --git a/test/org/traccar/protocol/HuaShengFrameDecoderTest.java b/test/org/traccar/protocol/HuaShengFrameDecoderTest.java
index dc2536319..0f24d4b5c 100644
--- a/test/org/traccar/protocol/HuaShengFrameDecoderTest.java
+++ b/test/org/traccar/protocol/HuaShengFrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/HuabaoFrameDecoderTest.java b/test/org/traccar/protocol/HuabaoFrameDecoderTest.java
index 98caf1dca..2d3937903 100644
--- a/test/org/traccar/protocol/HuabaoFrameDecoderTest.java
+++ b/test/org/traccar/protocol/HuabaoFrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/Jt600FrameDecoderTest.java b/test/org/traccar/protocol/Jt600FrameDecoderTest.java
index 15e6ec18c..ae0948987 100644
--- a/test/org/traccar/protocol/Jt600FrameDecoderTest.java
+++ b/test/org/traccar/protocol/Jt600FrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/L100FrameDecoderTest.java b/test/org/traccar/protocol/L100FrameDecoderTest.java
index ab70678d5..fc6a892dc 100644
--- a/test/org/traccar/protocol/L100FrameDecoderTest.java
+++ b/test/org/traccar/protocol/L100FrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/MegastekFrameDecoderTest.java b/test/org/traccar/protocol/MegastekFrameDecoderTest.java
index 9a327bb1f..68606a98a 100644
--- a/test/org/traccar/protocol/MegastekFrameDecoderTest.java
+++ b/test/org/traccar/protocol/MegastekFrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/MeiligaoFrameDecoderTest.java b/test/org/traccar/protocol/MeiligaoFrameDecoderTest.java
index 214936514..2d09c626b 100644
--- a/test/org/traccar/protocol/MeiligaoFrameDecoderTest.java
+++ b/test/org/traccar/protocol/MeiligaoFrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/MeitrackFrameDecoderTest.java b/test/org/traccar/protocol/MeitrackFrameDecoderTest.java
index f0afee02e..53749816e 100644
--- a/test/org/traccar/protocol/MeitrackFrameDecoderTest.java
+++ b/test/org/traccar/protocol/MeitrackFrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/MeitrackProtocolEncoderTest.java b/test/org/traccar/protocol/MeitrackProtocolEncoderTest.java
index a2b0ae6fd..d5ecbb488 100644
--- a/test/org/traccar/protocol/MeitrackProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/MeitrackProtocolEncoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
import org.traccar.model.Command;
diff --git a/test/org/traccar/protocol/MiniFinderProtocolEncoderTest.java b/test/org/traccar/protocol/MiniFinderProtocolEncoderTest.java
index d446c228c..e9422da9f 100644
--- a/test/org/traccar/protocol/MiniFinderProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/MiniFinderProtocolEncoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
import org.traccar.model.Command;
diff --git a/test/org/traccar/protocol/NvsFrameDecoderTest.java b/test/org/traccar/protocol/NvsFrameDecoderTest.java
index b03e3826c..8a00207eb 100644
--- a/test/org/traccar/protocol/NvsFrameDecoderTest.java
+++ b/test/org/traccar/protocol/NvsFrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/Pt502FrameDecoderTest.java b/test/org/traccar/protocol/Pt502FrameDecoderTest.java
index d654c0c61..04180abb0 100644
--- a/test/org/traccar/protocol/Pt502FrameDecoderTest.java
+++ b/test/org/traccar/protocol/Pt502FrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/Pt502ProtocolEncoderTest.java b/test/org/traccar/protocol/Pt502ProtocolEncoderTest.java
index 5438eb366..9d591bceb 100644
--- a/test/org/traccar/protocol/Pt502ProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/Pt502ProtocolEncoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
import org.traccar.model.Command;
diff --git a/test/org/traccar/protocol/TelicFrameDecoderTest.java b/test/org/traccar/protocol/TelicFrameDecoderTest.java
index 711014c46..dd0efacb6 100644
--- a/test/org/traccar/protocol/TelicFrameDecoderTest.java
+++ b/test/org/traccar/protocol/TelicFrameDecoderTest.java
@@ -1,7 +1,5 @@
package org.traccar.protocol;
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/Tk103ProtocolEncoderTest.java b/test/org/traccar/protocol/Tk103ProtocolEncoderTest.java
index 6b38035ed..565f6bb88 100644
--- a/test/org/traccar/protocol/Tk103ProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/Tk103ProtocolEncoderTest.java
@@ -1,11 +1,8 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
-import org.traccar.TestIdentityManager;
import org.traccar.model.Command;
-import org.traccar.model.Device;
import static org.junit.Assert.assertEquals;
diff --git a/test/org/traccar/protocol/TmgFrameDecoderTest.java b/test/org/traccar/protocol/TmgFrameDecoderTest.java
index 7a6c47fb9..4f7be1b28 100644
--- a/test/org/traccar/protocol/TmgFrameDecoderTest.java
+++ b/test/org/traccar/protocol/TmgFrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/TotemFrameDecoderTest.java b/test/org/traccar/protocol/TotemFrameDecoderTest.java
index 0d3e69465..8fb5f8d54 100644
--- a/test/org/traccar/protocol/TotemFrameDecoderTest.java
+++ b/test/org/traccar/protocol/TotemFrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/TotemProtocolEncoderTest.java b/test/org/traccar/protocol/TotemProtocolEncoderTest.java
index d17f70405..5a47f74cc 100644
--- a/test/org/traccar/protocol/TotemProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/TotemProtocolEncoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
import org.traccar.model.Command;
diff --git a/test/org/traccar/protocol/TzoneProtocolDecoderTest.java b/test/org/traccar/protocol/TzoneProtocolDecoderTest.java
index 68c8bbdbc..c309abce1 100644
--- a/test/org/traccar/protocol/TzoneProtocolDecoderTest.java
+++ b/test/org/traccar/protocol/TzoneProtocolDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import static org.junit.Assert.assertNotNull;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/UlbotechFrameDecoderTest.java b/test/org/traccar/protocol/UlbotechFrameDecoderTest.java
index b0af435b8..d3d0429d6 100644
--- a/test/org/traccar/protocol/UlbotechFrameDecoderTest.java
+++ b/test/org/traccar/protocol/UlbotechFrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/Vt200FrameDecoderTest.java b/test/org/traccar/protocol/Vt200FrameDecoderTest.java
index a9fff6c33..9422f6d74 100644
--- a/test/org/traccar/protocol/Vt200FrameDecoderTest.java
+++ b/test/org/traccar/protocol/Vt200FrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/VtfmsFrameDecoderTest.java b/test/org/traccar/protocol/VtfmsFrameDecoderTest.java
index c9ee8ae20..a5eb0b49b 100644
--- a/test/org/traccar/protocol/VtfmsFrameDecoderTest.java
+++ b/test/org/traccar/protocol/VtfmsFrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/WatchProtocolEncoderTest.java b/test/org/traccar/protocol/WatchProtocolEncoderTest.java
index a87afbfc5..a201b7860 100644
--- a/test/org/traccar/protocol/WatchProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/WatchProtocolEncoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
import org.traccar.model.Command;
diff --git a/test/org/traccar/protocol/WondexFrameDecoderTest.java b/test/org/traccar/protocol/WondexFrameDecoderTest.java
index 8eb80da9a..642473f2d 100644
--- a/test/org/traccar/protocol/WondexFrameDecoderTest.java
+++ b/test/org/traccar/protocol/WondexFrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/protocol/WondexProtocolEncoderTest.java b/test/org/traccar/protocol/WondexProtocolEncoderTest.java
index 7c5fa572c..3d76cb677 100644
--- a/test/org/traccar/protocol/WondexProtocolEncoderTest.java
+++ b/test/org/traccar/protocol/WondexProtocolEncoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
import org.traccar.model.Command;
diff --git a/test/org/traccar/protocol/XexunFrameDecoderTest.java b/test/org/traccar/protocol/XexunFrameDecoderTest.java
index cdf30965c..8fc628bdb 100644
--- a/test/org/traccar/protocol/XexunFrameDecoderTest.java
+++ b/test/org/traccar/protocol/XexunFrameDecoderTest.java
@@ -1,6 +1,5 @@
package org.traccar.protocol;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.ProtocolTest;
diff --git a/test/org/traccar/reports/ReportUtilsTest.java b/test/org/traccar/reports/ReportUtilsTest.java
index bdf45e9d5..a8ff653c9 100644
--- a/test/org/traccar/reports/ReportUtilsTest.java
+++ b/test/org/traccar/reports/ReportUtilsTest.java
@@ -15,7 +15,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.TimeZone;
-import org.junit.Assert;
import org.junit.Test;
import org.traccar.BaseTest;
import org.traccar.model.Position;