logger, diamond and arraylist refactoring

1 files changed, 22 insertions, 15 deletions

diff --git a/src/main/java/com/juick/server/TagQueries.java b/src/main/java/com/juick/server/TagQueries.java
index 493e8675..1c5e27d1 100644
--- a/src/main/java/com/juick/server/TagQueries.java
+++ b/src/main/java/com/juick/server/TagQueries.java
@@ -17,12 +17,17 @@
  */
 package com.juick.server;
 
+import com.juick.Tag;
+
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  *
@@ -30,6 +35,8 @@ import java.util.ArrayList;
  */
 public class TagQueries {
 
+    private static final Logger logger = Logger.getLogger(TagQueries.class.getName());
+
     public static com.juick.Tag getTag(Connection sql, int tid) {
         com.juick.Tag ret = null;
 
@@ -46,7 +53,7 @@ public class TagQueries {
                 ret.Name = rs.getString(2);
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -70,7 +77,7 @@ public class TagQueries {
                 ret.Name = rs.getString(3);
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -84,12 +91,12 @@ public class TagQueries {
         return ret;
     }
 
-    public static ArrayList<com.juick.Tag> getTags(Connection sql, String[] tags, boolean autoCreate) {
-        ArrayList<com.juick.Tag> ret = new ArrayList<com.juick.Tag>();
+    public static List<com.juick.Tag> getTags(Connection sql, String[] tags, boolean autoCreate) {
+        List<Tag> ret = new ArrayList<>();
 
-        for (int i = 0; i < tags.length; i++) {
-            if (!tags[i].isEmpty()) {
-                com.juick.Tag t = getTag(sql, tags[i], autoCreate);
+        for (String tag : tags) {
+            if (!tag.isEmpty()) {
+                Tag t = getTag(sql, tag, autoCreate);
                 if (t != null) {
                     ret.add(t);
                 }
@@ -112,7 +119,7 @@ public class TagQueries {
                 ret = rs.getInt(1) == 1;
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -134,7 +141,7 @@ public class TagQueries {
                 ret = rs.getInt(1);
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
@@ -142,8 +149,8 @@ public class TagQueries {
         return ret;
     }
 
-    public static ArrayList<com.juick.Tag> getUserTagsAll(Connection sql, int uid) {
-        ArrayList<com.juick.Tag> tags = new ArrayList<com.juick.Tag>();
+    public static List<com.juick.Tag> getUserTagsAll(Connection sql, int uid) {
+        List<com.juick.Tag> tags = new ArrayList<>();
 
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -159,15 +166,15 @@ public class TagQueries {
                 tags.add(t);
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }
         return tags;
     }
 
-    public static ArrayList<String> getUserBLTags(Connection sql, int uid) {
-        ArrayList<String> tags = new ArrayList<String>();
+    public static List<String> getUserBLTags(Connection sql, int uid) {
+        List<String> tags = new ArrayList<>();
 
         PreparedStatement stmt = null;
         ResultSet rs = null;
@@ -180,7 +187,7 @@ public class TagQueries {
                 tags.add(rs.getString(1));
             }
         } catch (SQLException e) {
-            System.err.println(e);
+            logger.log(Level.SEVERE, "sql exception", e);
         } finally {
             Utils.finishSQL(rs, stmt);
         }