logger, diamond and arraylist refactoring

1 files changed, 40 insertions, 39 deletions

diff --git a/src/main/java/com/juick/server/UserQueries.java b/src/main/java/com/juick/server/UserQueries.java
index 767a68d2..98573bfb 100644
--- a/src/main/java/com/juick/server/UserQueries.java
+++ b/src/main/java/com/juick/server/UserQueries.java
@@ -25,6 +25,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
 import java.util.UUID;
 import java.util.logging.Level;
@@ -52,7 +53,7 @@ public class UserQueries {
                 stmt.setString(2, hash);
                 stmt.executeUpdate();
             } catch (SQLException e) {
-                System.err.println(e);
+                logger.log(Level.SEVERE, "sql exception", e);
             } finally {
                 Utils.finishSQL(null, stmt);
             }
@@ -76,7 +77,7 @@ public class UserQueries {
                 uid = rs.getInt(1);
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -103,7 +104,7 @@ public class UserQueries {
                 user.Banned = rs.getBoolean(2);
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -126,7 +127,7 @@ public class UserQueries {
                 user.Banned = rs.getBoolean(3);
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -149,15 +150,15 @@ public class UserQueries {
                 user.JID = jid;
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
         return user;
     }
 
-    public static ArrayList<com.juick.User> getUsersByName(Connection sql, ArrayList<String> unames) {
-        ArrayList<com.juick.User> users = new ArrayList<com.juick.User>();
+    public static List<com.juick.User> getUsersByName(Connection sql, List<String> unames) {
+        List<com.juick.User> users = new ArrayList<>();
 
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -172,15 +173,15 @@ public class UserQueries {
                 users.add(user);
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
         return users;
     }
 
-    public static ArrayList<com.juick.User> getUsersByID(Connection sql, ArrayList<Integer> uids) {
-        ArrayList<com.juick.User> users = new ArrayList<com.juick.User>();
+    public static List<com.juick.User> getUsersByID(Connection sql, List<Integer> uids) {
+        List<com.juick.User> users = new ArrayList<>();
 
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -195,7 +196,7 @@ public class UserQueries {
                 users.add(u);
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -203,7 +204,7 @@ public class UserQueries {
         return users;
     }
 
-    public static boolean fillUsersByID(Connection sql, ArrayList<com.juick.User> users) {
+    public static boolean fillUsersByID(Connection sql, List<com.juick.User> users) {
         boolean ret = false;
 
         String uids = "";
@@ -231,7 +232,7 @@ public class UserQueries {
                 }
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -239,8 +240,8 @@ public class UserQueries {
         return ret;
     }
 
-    public static ArrayList<com.juick.User> getUsersByJID(Connection sql, ArrayList<String> jids) {
-        ArrayList<com.juick.User> users = new ArrayList<com.juick.User>();
+    public static List<com.juick.User> getUsersByJID(Connection sql, List<String> jids) {
+        List<com.juick.User> users = new ArrayList<>();
 
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -256,7 +257,7 @@ public class UserQueries {
                 users.add(user);
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -296,7 +297,7 @@ public class UserQueries {
                 user.AuthHash = hash;
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -315,7 +316,7 @@ public class UserQueries {
                 stmt.setString(2, hash);
                 stmt.executeUpdate();
             } catch (SQLException e) {
-                System.err.println(e);
+                logger.log(Level.SEVERE, "sql exception", e);
             } finally {
                 Utils.finishSQL(null, stmt);
             }
@@ -353,7 +354,7 @@ public class UserQueries {
                 }
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -373,7 +374,7 @@ public class UserQueries {
                 ret = rs.getInt(1);
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -388,7 +389,7 @@ public class UserQueries {
             stmt.setInt(2, uid);
             stmt.executeUpdate();
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(null, stmt);
         }
@@ -407,7 +408,7 @@ public class UserQueries {
                 ret = rs.getInt(1) < 3600;
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -428,7 +429,7 @@ public class UserQueries {
                 ret = rs.getInt(1) == 1;
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -449,7 +450,7 @@ public class UserQueries {
                 ret = rs.getInt(1) == 1;
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -472,15 +473,15 @@ public class UserQueries {
                 ret = rs.getInt(1) == 1;
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
         return ret;
     }
 
-    public static ArrayList<Integer> checkBL(Connection sql, int visitor, ArrayList<Integer> uids) {
-        ArrayList<Integer> ret = new ArrayList<Integer>();
+    public static List<Integer> checkBL(Connection sql, int visitor, List<Integer> uids) {
+        List<Integer> ret = new ArrayList<>();
 
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -493,7 +494,7 @@ public class UserQueries {
                 ret.add(rs.getInt(1));
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -515,19 +516,19 @@ public class UserQueries {
                 ret = rs.getInt(1) == 1;
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
         return ret;
     }
 
-    public static ArrayList<Integer> getUserRead(Connection sql, int uid) {
+    public static List<Integer> getUserRead(Connection sql, int uid) {
         return SQLHelpers.getArrayInteger(sql, "SELECT user_id FROM subscr_users WHERE suser_id=?", uid);
     }
 
-    public static ArrayList<com.juick.User> getUserReadLeastPopular(Connection sql, int uid, int cnt) {
-        ArrayList<com.juick.User> users = new ArrayList<com.juick.User>(cnt);
+    public static List<com.juick.User> getUserReadLeastPopular(Connection sql, int uid, int cnt) {
+        List<com.juick.User> users = new ArrayList<>(cnt);
 
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -544,7 +545,7 @@ public class UserQueries {
                 users.add(u);
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -552,12 +553,12 @@ public class UserQueries {
         return users;
     }
 
-    public static ArrayList<Integer> getUserReaders(Connection sql, int uid) {
+    public static List<Integer> getUserReaders(Connection sql, int uid) {
         return SQLHelpers.getArrayInteger(sql, "SELECT suser_id FROM subscr_users WHERE user_id=?", uid);
     }
 
-    public static ArrayList<com.juick.User> getUserBLUsers(Connection sql, int uid) {
-        ArrayList<com.juick.User> users = new ArrayList<com.juick.User>();
+    public static List<com.juick.User> getUserBLUsers(Connection sql, int uid) {
+        List<com.juick.User> users = new ArrayList<>();
 
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -573,7 +574,7 @@ public class UserQueries {
                 users.add(u);
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -603,7 +604,7 @@ public class UserQueries {
                 return stmt2.execute();
             }
         } catch (SQLException e) {
-            logger.throwing(UserQueries.class.getName(), "linkTwitterAccount", e);
+            logger.log(Level.SEVERE, "sql exception", e);
         }
         return false;
     }
@@ -642,7 +643,7 @@ public class UserQueries {
                 preparedStatement.setString(3, JID);
                 return preparedStatement.executeUpdate() >= 0;
             } catch (SQLException e) {
-                logger.log(Level.SEVERE, "sql error", e);
+                logger.log(Level.SEVERE, "sql exception", e);
             } finally {
                 Utils.finishSQL(null, preparedStatement);
             }