7 files changed, 10 insertions, 12 deletions
diff --git a/src/org/traccar/Protocol.java b/src/org/traccar/Protocol.java
index cd37853d0..002a8b4d2 100644
--- a/src/org/traccar/Protocol.java
+++ b/src/org/traccar/Protocol.java
@@ -6,7 +6,7 @@ import org.traccar.model.Command;
 
 public interface Protocol {
 
-    public String getName();
+    String getName();
 
     void sendCommand(ActiveDevice activeDevice, Command command);
 
diff --git a/src/org/traccar/StringProtocolEncoder.java b/src/org/traccar/StringProtocolEncoder.java
index c64e1d03f..17e57cf8e 100644
--- a/src/org/traccar/StringProtocolEncoder.java
+++ b/src/org/traccar/StringProtocolEncoder.java
@@ -15,14 +15,13 @@
  */
 package org.traccar;
 
-import org.traccar.model.Command;
-
 import java.util.Map;
+import org.traccar.model.Command;
 
 public abstract class StringProtocolEncoder extends BaseProtocolEncoder {
 
     public interface ValueFormatter {
-        public String formatValue(String key, Object value);
+        String formatValue(String key, Object value);
     }
 
     protected String formatCommand(Command command, String format, ValueFormatter valueFormatter, String... keys) {
diff --git a/src/org/traccar/database/ConnectionManager.java b/src/org/traccar/database/ConnectionManager.java
index c34428af5..e45c83651 100644
--- a/src/org/traccar/database/ConnectionManager.java
+++ b/src/org/traccar/database/ConnectionManager.java
@@ -91,8 +91,8 @@ public class ConnectionManager {
         return result;
     }
 
-    public static interface DataCacheListener {
-        public void onUpdate(Position position);
+    public interface DataCacheListener {
+        void onUpdate(Position position);
     }
 
     public void addListener(Collection<Long> devices, DataCacheListener listener) {
diff --git a/src/org/traccar/database/IdentityManager.java b/src/org/traccar/database/IdentityManager.java
index b24bf79ed..8bdce09a3 100644
--- a/src/org/traccar/database/IdentityManager.java
+++ b/src/org/traccar/database/IdentityManager.java
@@ -19,8 +19,8 @@ import org.traccar.model.Device;
 
 public interface IdentityManager {
 
-    public Device getDeviceById(long id);
+    Device getDeviceById(long id);
 
-    public Device getDeviceByUniqueId(String uniqueId) throws Exception;
+    Device getDeviceByUniqueId(String uniqueId) throws Exception;
 
 }
diff --git a/src/org/traccar/database/QueryBuilder.java b/src/org/traccar/database/QueryBuilder.java
index 7bec25ee5..09fb19d13 100644
--- a/src/org/traccar/database/QueryBuilder.java
+++ b/src/org/traccar/database/QueryBuilder.java
@@ -36,7 +36,6 @@ import javax.json.Json;
 import javax.json.JsonReader;
 import javax.json.stream.JsonParsingException;
 import javax.sql.DataSource;
-
 import org.traccar.Context;
 import org.traccar.model.Factory;
 import org.traccar.model.MiscFormatter;
@@ -267,7 +266,7 @@ public class QueryBuilder {
     }
 
     private interface ResultSetProcessor<T> {
-        public void process(T object, ResultSet resultSet) throws SQLException;
+        void process(T object, ResultSet resultSet) throws SQLException;
     }
 
     public <T extends Factory> T executeQuerySingle(T prototype) throws SQLException {
diff --git a/src/org/traccar/geocode/ReverseGeocoder.java b/src/org/traccar/geocode/ReverseGeocoder.java
index b19a6b7ce..336a26d83 100644
--- a/src/org/traccar/geocode/ReverseGeocoder.java
+++ b/src/org/traccar/geocode/ReverseGeocoder.java
@@ -17,6 +17,6 @@ package org.traccar.geocode;
 
 public interface ReverseGeocoder {
 
-    public String getAddress(AddressFormat format, double latitude, double longitude);
+    String getAddress(AddressFormat format, double latitude, double longitude);
 
 }
diff --git a/src/org/traccar/model/Factory.java b/src/org/traccar/model/Factory.java
index c09d11ab6..150f52b80 100644
--- a/src/org/traccar/model/Factory.java
+++ b/src/org/traccar/model/Factory.java
@@ -17,6 +17,6 @@ package org.traccar.model;
 
 public interface Factory {
 
-    public Object create();
+    Object create();
 
 }