Fix misc check style issues

3 files changed, 110 insertions, 86 deletions

diff --git a/src/org/traccar/WebDataHandler.java b/src/org/traccar/WebDataHandler.java
index 7e8fc1ec4..332fc5222 100644
--- a/src/org/traccar/WebDataHandler.java
+++ b/src/org/traccar/WebDataHandler.java
@@ -50,8 +50,24 @@ public class WebDataHandler extends BaseDataHandler {
 
             double lat = position.getLatitude();
             double lon = position.getLongitude();
-            f.format("%02d%07.4f,%c,", (int) Math.abs(lat), Math.abs(lat) % 1 * 60, lat < 0 ? 'S' : 'N');
-            f.format("%03d%07.4f,%c,", (int) Math.abs(lon), Math.abs(lon) % 1 * 60, lon < 0 ? 'W' : 'E');
+
+            char hemisphere;
+
+            if (lat < 0) {
+                hemisphere = 'S';
+            } else {
+                hemisphere = 'N';
+            }
+
+            f.format("%02d%07.4f,%c,", (int) Math.abs(lat), Math.abs(lat) % 1 * 60, hemisphere);
+
+            if (lon < 0) {
+                hemisphere = 'W';
+            } else {
+                hemisphere = 'E';
+            }
+
+            f.format("%03d%07.4f,%c,", (int) Math.abs(lon), Math.abs(lon) % 1 * 60, hemisphere);
 
             f.format("%.2f,%.2f,", position.getSpeed(), position.getCourse());
             f.format("%1$td%1$tm%1$ty,,", calendar);
diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java
index af2dd559a..8be6aec42 100644
--- a/src/org/traccar/database/DataManager.java
+++ b/src/org/traccar/database/DataManager.java
@@ -241,7 +241,11 @@ public class DataManager implements IdentityManager {
         User user = QueryBuilder.create(dataSource, getQuery("database.loginUser"))
                 .setString("email", email)
                 .executeQuerySingle(new User());
-        return user != null && user.isPasswordValid(password) ? user : null;
+        if (user != null && user.isPasswordValid(password)) {
+            return user;
+        } else {
+            return null;
+        }
     }
 
     public Collection<User> getUsers() throws SQLException {
diff --git a/src/org/traccar/database/QueryBuilder.java b/src/org/traccar/database/QueryBuilder.java
index c3cde0723..ca6335556 100644
--- a/src/org/traccar/database/QueryBuilder.java
+++ b/src/org/traccar/database/QueryBuilder.java
@@ -281,6 +281,92 @@ public final class QueryBuilder {
         }
     }
 
+    private <T extends Factory> void addProcessors(
+            List<ResultSetProcessor<T>> processors, Class<?> parameterType, final Method method, final String name) {
+
+        if (parameterType.equals(boolean.class)) {
+            processors.add(new ResultSetProcessor<T>() {
+                @Override
+                public void process(T object, ResultSet resultSet) throws SQLException {
+                    try {
+                        method.invoke(object, resultSet.getBoolean(name));
+                    } catch (IllegalAccessException | InvocationTargetException error) {
+                        Log.warning(error);
+                    }
+                }
+            });
+        } else if (parameterType.equals(int.class)) {
+            processors.add(new ResultSetProcessor<T>() {
+                @Override
+                public void process(T object, ResultSet resultSet) throws SQLException {
+                    try {
+                        method.invoke(object, resultSet.getInt(name));
+                    } catch (IllegalAccessException | InvocationTargetException error) {
+                        Log.warning(error);
+                    }
+                }
+            });
+        } else if (parameterType.equals(long.class)) {
+            processors.add(new ResultSetProcessor<T>() {
+                @Override
+                public void process(T object, ResultSet resultSet) throws SQLException {
+                    try {
+                        method.invoke(object, resultSet.getLong(name));
+                    } catch (IllegalAccessException | InvocationTargetException error) {
+                        Log.warning(error);
+                    }
+                }
+            });
+        } else if (parameterType.equals(double.class)) {
+            processors.add(new ResultSetProcessor<T>() {
+                @Override
+                public void process(T object, ResultSet resultSet) throws SQLException {
+                    try {
+                        method.invoke(object, resultSet.getDouble(name));
+                    } catch (IllegalAccessException | InvocationTargetException error) {
+                        Log.warning(error);
+                    }
+                }
+            });
+        } else if (parameterType.equals(String.class)) {
+            processors.add(new ResultSetProcessor<T>() {
+                @Override
+                public void process(T object, ResultSet resultSet) throws SQLException {
+                    try {
+                        method.invoke(object, resultSet.getString(name));
+                    } catch (IllegalAccessException | InvocationTargetException error) {
+                        Log.warning(error);
+                    }
+                }
+            });
+        } else if (parameterType.equals(Date.class)) {
+            processors.add(new ResultSetProcessor<T>() {
+                @Override
+                public void process(T object, ResultSet resultSet) throws SQLException {
+                    try {
+                        Timestamp timestamp = resultSet.getTimestamp(name);
+                        if (timestamp != null) {
+                            method.invoke(object, new Date(timestamp.getTime()));
+                        }
+                    } catch (IllegalAccessException | InvocationTargetException error) {
+                        Log.warning(error);
+                    }
+                }
+            });
+        } else if (parameterType.equals(Map.class)) {
+            processors.add(new ResultSetProcessor<T>() {
+                @Override
+                public void process(T object, ResultSet resultSet) throws SQLException {
+                    try (JsonReader reader = Json.createReader(new StringReader(resultSet.getString(name)))) {
+                        method.invoke(object, MiscFormatter.fromJson(reader.readObject()));
+                    } catch (IllegalAccessException | InvocationTargetException | JsonParsingException error) {
+                        Log.warning(error);
+                    }
+                }
+            });
+        }
+    }
+
     public <T extends Factory> Collection<T> executeQuery(T prototype) throws SQLException {
         List<T> result = new LinkedList<>();
 
@@ -313,89 +399,7 @@ public final class QueryBuilder {
                                 continue;
                             }
 
-                            Class<?> parameterType = method.getParameterTypes()[0];
-
-                            if (parameterType.equals(boolean.class)) {
-                                processors.add(new ResultSetProcessor<T>() {
-                                    @Override
-                                    public void process(T object, ResultSet resultSet) throws SQLException {
-                                        try {
-                                            method.invoke(object, resultSet.getBoolean(name));
-                                        } catch (IllegalAccessException | InvocationTargetException error) {
-                                            Log.warning(error);
-                                        }
-                                    }
-                                });
-                            } else if (parameterType.equals(int.class)) {
-                                processors.add(new ResultSetProcessor<T>() {
-                                    @Override
-                                    public void process(T object, ResultSet resultSet) throws SQLException {
-                                        try {
-                                            method.invoke(object, resultSet.getInt(name));
-                                        } catch (IllegalAccessException | InvocationTargetException error) {
-                                            Log.warning(error);
-                                        }
-                                    }
-                                });
-                            } else if (parameterType.equals(long.class)) {
-                                processors.add(new ResultSetProcessor<T>() {
-                                    @Override
-                                    public void process(T object, ResultSet resultSet) throws SQLException {
-                                        try {
-                                            method.invoke(object, resultSet.getLong(name));
-                                        } catch (IllegalAccessException | InvocationTargetException error) {
-                                            Log.warning(error);
-                                        }
-                                    }
-                                });
-                            } else if (parameterType.equals(double.class)) {
-                                processors.add(new ResultSetProcessor<T>() {
-                                    @Override
-                                    public void process(T object, ResultSet resultSet) throws SQLException {
-                                        try {
-                                            method.invoke(object, resultSet.getDouble(name));
-                                        } catch (IllegalAccessException | InvocationTargetException error) {
-                                            Log.warning(error);
-                                        }
-                                    }
-                                });
-                            } else if (parameterType.equals(String.class)) {
-                                processors.add(new ResultSetProcessor<T>() {
-                                    @Override
-                                    public void process(T object, ResultSet resultSet) throws SQLException {
-                                        try {
-                                            method.invoke(object, resultSet.getString(name));
-                                        } catch (IllegalAccessException | InvocationTargetException error) {
-                                            Log.warning(error);
-                                        }
-                                    }
-                                });
-                            } else if (parameterType.equals(Date.class)) {
-                                processors.add(new ResultSetProcessor<T>() {
-                                    @Override
-                                    public void process(T object, ResultSet resultSet) throws SQLException {
-                                        try {
-                                            Timestamp timestamp = resultSet.getTimestamp(name);
-                                            if (timestamp != null) {
-                                                method.invoke(object, new Date(timestamp.getTime()));
-                                            }
-                                        } catch (IllegalAccessException | InvocationTargetException error) {
-                                            Log.warning(error);
-                                        }
-                                    }
-                                });
-                            } else if (parameterType.equals(Map.class)) {
-                                processors.add(new ResultSetProcessor<T>() {
-                                    @Override
-                                    public void process(T object, ResultSet resultSet) throws SQLException {
-                                        try (JsonReader reader = Json.createReader(new StringReader(resultSet.getString(name)))) {
-                                            method.invoke(object, MiscFormatter.fromJson(reader.readObject()));
-                                        } catch (IllegalAccessException | InvocationTargetException | JsonParsingException error) {
-                                            Log.warning(error);
-                                        }
-                                    }
-                                });
-                            }
+                            addProcessors(processors, method.getParameterTypes()[0], method, name);
                         }
                     }