Changeset 35719 for other-projects/the-macronizer/trunk/src/java/util/MySQLAccess.java

Timestamp:

2021-11-03T15:24:04+13:00 (2 years ago)

Author:

cstephen

Message:

Add support for JSON response to direct input queries. Cleanup other components.

File:

• other-projects/the-macronizer/trunk/src/java/util/MySQLAccess.java (modified) (10 diffs)

other-projects/the-macronizer/trunk/src/java/util/MySQLAccess.java

@@ -17 +17 @@
 
 import java.util.Properties;
-
-import java.util.List;
 
 
@@ -99 +97 @@
             statement = connect.createStatement();
 
-            int result = statement.executeUpdate("set names utf8mb4"); // should return 0 for SQL stmts that return nothing
+            statement.executeUpdate("set names utf8mb4"); // should return 0 for SQL stmts that return nothing
             System.out.println("Connected to MySQL DB " + DB_NAME);
             success = true;
@@ -210 +208 @@
 
     //Occurrence into
-    private int insertOccurrence(int wordID, int timeID, int dateID) throws SQLException {
+    private int insertOccurrence(int wordID, int timeID, int dateID)
+        throws SQLException
+    {
         String query = "INSERT INTO Occurrences (word_id, time_id, date_id) VALUES (?,?,?)";
         preparedStatement = connect.prepareStatement(query, Statement.RETURN_GENERATED_KEYS);
@@ -218 +218 @@
 
         int occurrence_id = -1;
-        try {
-            int result = preparedStatement.executeUpdate();
+
+        try
+        {
+            preparedStatement.executeUpdate();
             resultSet = preparedStatement.getGeneratedKeys();
 
-            if (resultSet.next()) {
+            if (resultSet.next())
+            {
                 occurrence_id = resultSet.getInt(1);
             }
 
-        } catch (SQLException e) {
+        }
+        catch (SQLException e)
+        {
             throw e; // any other SQLException is a bad case, so we'll handle it in the caller
-        } finally {
-            return occurrence_id;
-        }
+        }
+
+        return occurrence_id;
     }
 
@@ -269 +274 @@
 
         int word_id = -1;
-        try {
-            int result = preparedStatement.executeUpdate();
+
+        try {
+            preparedStatement.executeUpdate();
 
             resultSet = preparedStatement.getGeneratedKeys();
@@ -287 +293 @@
         } catch (SQLException e) {
             throw e; // any other SQLException is a bad case, so we'll handle it in the caller
-        } finally {
-            return word_id;
-        }
+        }
+        
+        return word_id;
     }
 
@@ -318 +324 @@
 
         int date_id = -1;
-        try {
-            int result = preparedStatement.executeUpdate();
+
+        try {
+            preparedStatement.executeUpdate();
             resultSet = preparedStatement.getGeneratedKeys();
 
@@ -333 +340 @@
         } catch (SQLException e) {
             throw e; // any other SQLException is a bad case, so we'll handle it in the caller
-        } finally {
-            return date_id;
-        }
+        }
+        
+        return date_id;
     }
 
@@ -364 +371 @@
         int time_id = -1;
         try {
-            int result = preparedStatement.executeUpdate();
+            preparedStatement.executeUpdate();
             resultSet = preparedStatement.getGeneratedKeys();
 
@@ -378 +385 @@
         } catch (SQLException e) {
             throw e; // any other SQLException is a bad case, so we'll handle it in the caller
-        } finally {
-            return time_id;
-        }
+        }
+        
+        return time_id;
     }