From 6791cbf9fd640dfeabf95c99102d391272d7fa24 Mon Sep 17 00:00:00 2001 From: Jan Lachmuth Date: Thu, 13 Jul 2023 20:10:29 +0200 Subject: [PATCH] use ownerColumn() instead of ownerColum() --- .../jdbc/GenericTokenTableFactory.java | 2 +- .../tokenstore/jdbc/JdbcTokenStore.java | 20 +++++++++---------- .../jdbc/Oracle11TokenTableFactory.java | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/messaging/src/main/java/org/axonframework/eventhandling/tokenstore/jdbc/GenericTokenTableFactory.java b/messaging/src/main/java/org/axonframework/eventhandling/tokenstore/jdbc/GenericTokenTableFactory.java index 7da8afb66e..300521d992 100644 --- a/messaging/src/main/java/org/axonframework/eventhandling/tokenstore/jdbc/GenericTokenTableFactory.java +++ b/messaging/src/main/java/org/axonframework/eventhandling/tokenstore/jdbc/GenericTokenTableFactory.java @@ -43,7 +43,7 @@ public PreparedStatement createTable(Connection connection, TokenSchema schema) schema.tokenColumn() + " " + tokenType() + " NULL,\n" + schema.tokenTypeColumn() + " VARCHAR(255) NULL,\n" + schema.timestampColumn() + " VARCHAR(255) NULL,\n" + - schema.ownerColum() + " VARCHAR(255) NULL,\n" + + schema.ownerColumn() + " VARCHAR(255) NULL,\n" + "PRIMARY KEY (" + schema.processorNameColumn() + "," + schema.segmentColumn() + ")\n" + ")"; return connection.prepareStatement(sql); diff --git a/messaging/src/main/java/org/axonframework/eventhandling/tokenstore/jdbc/JdbcTokenStore.java b/messaging/src/main/java/org/axonframework/eventhandling/tokenstore/jdbc/JdbcTokenStore.java index 179b06ff46..ee7910ce06 100644 --- a/messaging/src/main/java/org/axonframework/eventhandling/tokenstore/jdbc/JdbcTokenStore.java +++ b/messaging/src/main/java/org/axonframework/eventhandling/tokenstore/jdbc/JdbcTokenStore.java @@ -470,7 +470,7 @@ protected PreparedStatement select(Connection connection, String processorName, int segment, boolean forUpdate) throws SQLException { final String sql = "SELECT " + String.join(", ", schema.processorNameColumn(), schema.segmentColumn(), schema.tokenColumn(), - schema.tokenTypeColumn(), schema.timestampColumn(), schema.ownerColum()) + " FROM " + + schema.tokenTypeColumn(), schema.timestampColumn(), schema.ownerColumn()) + " FROM " + schema.tokenTable() + " WHERE " + schema.processorNameColumn() + " = ? AND " + schema.segmentColumn() + " = ? " + (forUpdate ? "FOR UPDATE" : ""); PreparedStatement preparedStatement = connection.prepareStatement(sql); @@ -493,7 +493,7 @@ protected PreparedStatement select(Connection connection, String processorName, */ protected void updateToken(Connection connection, ResultSet resultSet, TrackingToken token, String processorName, int segment) throws SQLException { - final String sql = "UPDATE " + schema.tokenTable() + " SET " + schema.ownerColum() + " = ?, " + + final String sql = "UPDATE " + schema.tokenTable() + " SET " + schema.ownerColumn() + " = ?, " + schema.tokenColumn() + " = ?, " + schema.tokenTypeColumn() + " = ?, " + schema.timestampColumn() + " = ? WHERE " + schema.processorNameColumn() + " = ? AND " + schema.segmentColumn() + " = ?"; if (resultSet.next()) { @@ -536,7 +536,7 @@ protected void updateToken(Connection connection, ResultSet resultSet, TrackingT * @throws SQLException when an exception occurs while claiming the token entry */ protected TrackingToken claimToken(Connection connection, AbstractTokenEntry entry) throws SQLException { - final String sql = "UPDATE " + schema.tokenTable() + " SET " + schema.ownerColum() + " = ?, " + + final String sql = "UPDATE " + schema.tokenTable() + " SET " + schema.ownerColumn() + " = ?, " + schema.timestampColumn() + " = ? WHERE " + schema.processorNameColumn() + " = ? AND " + schema.segmentColumn() + " = ?"; if (!entry.claim(nodeId, claimTimeout)) { @@ -641,12 +641,12 @@ protected void validateSegment(String processorName, Segment segment) { } /** - * Returns a {@link PreparedStatement} for the count of segments that can be found after searching for the {@code splitSegmentId} and {@code mergableSegmetnId}. + * Returns a {@link PreparedStatement} for the count of segments that can be found after searching for the {@code splitSegmentId} and {@code mergeableSegmentId}. * * @param connection the connection to the underlying database * @param processorName the name of the processor to load or insert a token entry for * @param splitSegmentId the id of the split candidate segment - * @param mergeableSegmentId the id of the merge candiate segment + * @param mergeableSegmentId the id of the merge candidate segment * @return The PreparedStatement to execute * @throws SQLException when an Exception occurs in building the {@link PreparedStatement} */ @@ -700,7 +700,7 @@ protected TrackingToken insertTokenEntry(Connection connection, TrackingToken to int segment) throws SQLException { final String sql = "INSERT INTO " + schema.tokenTable() + " (" + schema.processorNameColumn() + "," + schema.segmentColumn() + "," + schema.timestampColumn() + "," + schema.tokenColumn() + "," + - schema.tokenTypeColumn() + "," + schema.ownerColum() + ") VALUES (?,?,?,?,?,?)"; + schema.tokenTypeColumn() + "," + schema.ownerColumn() + ") VALUES (?,?,?,?,?,?)"; AbstractTokenEntry entry = new GenericTokenEntry<>(token, serializer, contentType, processorName, segment); try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) { @@ -727,7 +727,7 @@ protected AbstractTokenEntry readTokenEntry(ResultSet resultSet) throws SQLEx return new GenericTokenEntry<>(readSerializedData(resultSet, schema.tokenColumn()), resultSet.getString(schema.tokenTypeColumn()), resultSet.getString(schema.timestampColumn()), - resultSet.getString(schema.ownerColum()), + resultSet.getString(schema.ownerColumn()), resultSet.getString(schema.processorNameColumn()), resultSet.getInt(schema.segmentColumn()), contentType); } @@ -745,9 +745,9 @@ protected AbstractTokenEntry readTokenEntry(ResultSet resultSet) throws SQLEx protected PreparedStatement releaseClaim(Connection connection, String processorName, int segment) throws SQLException { final String sql = - "UPDATE " + schema.tokenTable() + " SET " + schema.ownerColum() + " = ?, " + schema.timestampColumn() + + "UPDATE " + schema.tokenTable() + " SET " + schema.ownerColumn() + " = ?, " + schema.timestampColumn() + " = ? WHERE " + schema.processorNameColumn() + " = ? AND " + schema.segmentColumn() + - " = ? AND " + schema.ownerColum() + " = ?"; + " = ? AND " + schema.ownerColumn() + " = ?"; PreparedStatement preparedStatement = connection.prepareStatement(sql); preparedStatement.setString(1, null); preparedStatement.setString(2, formatInstant(AbstractTokenEntry.clock.instant())); @@ -772,7 +772,7 @@ protected PreparedStatement deleteToken(Connection connection, String processorN final String sql = "DELETE FROM " + schema.tokenTable() + " WHERE " + schema.processorNameColumn() + " = ? AND " + schema.segmentColumn() + - " = ? AND " + schema.ownerColum() + " = ?"; + " = ? AND " + schema.ownerColumn() + " = ?"; PreparedStatement preparedStatement = connection.prepareStatement(sql); preparedStatement.setString(1, processorName); preparedStatement.setInt(2, segment); diff --git a/messaging/src/main/java/org/axonframework/eventhandling/tokenstore/jdbc/Oracle11TokenTableFactory.java b/messaging/src/main/java/org/axonframework/eventhandling/tokenstore/jdbc/Oracle11TokenTableFactory.java index fd79bac2ec..b69ffb1a90 100644 --- a/messaging/src/main/java/org/axonframework/eventhandling/tokenstore/jdbc/Oracle11TokenTableFactory.java +++ b/messaging/src/main/java/org/axonframework/eventhandling/tokenstore/jdbc/Oracle11TokenTableFactory.java @@ -43,7 +43,7 @@ public PreparedStatement createTable(Connection connection, TokenSchema schema) schema.tokenColumn() + " " + " BLOB NULL,\n" + schema.tokenTypeColumn() + " VARCHAR(255) NULL,\n" + schema.timestampColumn() + " VARCHAR(255) NULL,\n" + - schema.ownerColum() + " VARCHAR(255) NULL,\n" + + schema.ownerColumn() + " VARCHAR(255) NULL,\n" + "PRIMARY KEY (" + schema.processorNameColumn() + "," + schema.segmentColumn() + ")\n" + ")"; return connection.prepareStatement(sql);