refactoring update method

Author: the-thing

quickfixj-core/src/main/java/quickfix/JdbcStore.java

@@ -27,6 +27,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.TimeZone;
+import java.util.function.IntSupplier;
 
 import javax.sql.DataSource;
 
@@ -299,38 +300,21 @@ public boolean set(int sequence, String message) throws IOException {
 
     public void setNextSenderMsgSeqNum(int next) throws IOException {
         cache.setNextSenderMsgSeqNum(next);
-        storeOutgoingSequenceNumbers();
+        storeSequenceNumber(SQL_UPDATE_OUTGOING_SEQNUM, cache::getNextSenderMsgSeqNum);
     }
 
     public void setNextTargetMsgSeqNum(int next) throws IOException {
         cache.setNextTargetMsgSeqNum(next);
-        storeIncomingSequenceNumbers();
+        storeSequenceNumber(SQL_UPDATE_INCOMING_SEQNUM, cache::getNextTargetMsgSeqNum);
     }
 
-    private void storeIncomingSequenceNumbers() throws IOException {
+    private void storeSequenceNumber(String sequenceUpdateSql, IntSupplier sequence) throws IOException {
         Connection connection = null;
         PreparedStatement update = null;
         try {
             connection = dataSource.getConnection();
-            update = connection.prepareStatement(SQL_UPDATE_INCOMING_SEQNUM);
-            update.setInt(1, cache.getNextTargetMsgSeqNum());
-            setSessionIdParameters(update, 2);
-            update.execute();
-        } catch (SQLException e) {
-            throw new IOException(e.getMessage(), e);
-        } finally {
-            JdbcUtil.close(sessionID, update);
-            JdbcUtil.close(sessionID, connection);
-        }
-    }
-
-    private void storeOutgoingSequenceNumbers() throws IOException {
-        Connection connection = null;
-        PreparedStatement update = null;
-        try {
-            connection = dataSource.getConnection();
-            update = connection.prepareStatement(SQL_UPDATE_OUTGOING_SEQNUM);
-            update.setInt(1, cache.getNextSenderMsgSeqNum());
+            update = connection.prepareStatement(sequenceUpdateSql);
+            update.setInt(1, sequence.getAsInt());
             setSessionIdParameters(update, 2);
             update.execute();
         } catch (SQLException e) {

quickfixj-core/src/main/java/quickfix/MemoryStore.java

@@ -74,15 +74,15 @@ public Calendar getCreationTimeCalendar() throws IOException {
         return creationTime;
     }
 
-    /* package */void setCreationTime(Calendar creationTime) {
+    void setCreationTime(Calendar creationTime) {
         this.creationTime = creationTime;
     }
 
-    public int getNextSenderMsgSeqNum() throws IOException {
+    public int getNextSenderMsgSeqNum() {
         return nextSenderMsgSeqNum;
     }
 
-    public int getNextTargetMsgSeqNum() throws IOException {
+    public int getNextTargetMsgSeqNum() {
         return nextTargetMsgSeqNum;
     }