Remove effectively unused process attach callback

Author: mrotteveel

src/docs/asciidoc/release_notes.adoc

@@ -591,6 +591,9 @@ If you are confronted with such a change, let us know on {firebird-java}[firebir
 
 * `FbWireAsynchronousChannel`
 ** `connect(String, int, int)` was replaced by `connect(String, int)`
+* `FbWireOperations`
+** The `ProcessAttachCallback` parameter of `authReceiveResponse` was removed, as all implementations did nothing, and since protocol 13, it wasn't only called for the attach response
+** Interface `ProcessAttachCallback` was removed
 
 [#breaking-changes-unlikely]
 === Unlikely breaking changes

src/main/org/firebirdsql/gds/ng/wire/FbWireOperations.java

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2015-2023 Mark Rotteveel
+// SPDX-FileCopyrightText: Copyright 2015-2025 Mark Rotteveel
 // SPDX-License-Identifier: LGPL-2.1-or-later OR BSD-3-Clause
 package org.firebirdsql.gds.ng.wire;
 
@@ -212,26 +212,18 @@ default void processDeferredActions() { }
 
     /**
      * Receive authentication response from the server.
-     * <p>
-     * This method is only relevant for protocol V13 or higher.
-     * </p>
      *
      * @param acceptPacket
-     *         Packet with {@code op_cond_accept} data, or {@code null} when the data should be read from the
-     *         connection.
+     *         packet with {@code op_cond_accept} data, or {@code null} when the data should be read from the
+     *         connection
      * @param dbCryptCallback
-     *         Database encryption callback (ignored by protocols v12 and lower)
-     * @param processAttachCallback
-     *         Callback for processing the final attach response
+     *         database encryption callback (ignored by protocols v12 and lower)
      * @throws IOException
-     *         For errors reading the response from the connection.
+     *         for errors reading the response from the connection
      * @throws SQLException
-     *         For errors returned from the server, or when attempting to
-     *         read.
+     *         for errors returned from the server, or when attempting to read
      */
-    void authReceiveResponse(FbWireAttachment.AcceptPacket acceptPacket,
-            DbCryptCallback dbCryptCallback,
-            ProcessAttachCallback processAttachCallback)
+    void authReceiveResponse(FbWireAttachment.AcceptPacket acceptPacket, DbCryptCallback dbCryptCallback)
             throws IOException, SQLException;
 
     /**
@@ -248,7 +240,4 @@ void authReceiveResponse(FbWireAttachment.AcceptPacket acceptPacket,
      */
     void setNetworkTimeout(int milliseconds) throws SQLException;
 
-    interface ProcessAttachCallback {
-        void processAttachResponse(GenericResponse response);
-    }
 }

src/main/org/firebirdsql/gds/ng/wire/version10/V10Database.java

@@ -10,7 +10,6 @@
 import org.firebirdsql.gds.ng.FbTransaction;
 import org.firebirdsql.gds.ng.LockCloseable;
 import org.firebirdsql.gds.ng.TransactionState;
-import org.firebirdsql.gds.ng.dbcrypt.DbCryptCallback;
 import org.firebirdsql.gds.ng.fields.BlrCalculator;
 import org.firebirdsql.gds.ng.wire.*;
 import org.firebirdsql.jdbc.SQLStateConstants;
@@ -143,17 +142,6 @@ protected Encoding getFilenameEncoding(DatabaseParameterBuffer dpb) {
         return getEncoding();
     }
 
-    /**
-     * Processes the response from the server to the attach or create operation.
-     *
-     * @param genericResponse
-     *         GenericResponse received from the server.
-     */
-    @SuppressWarnings("unused")
-    protected final void processAttachOrCreateResponse(GenericResponse genericResponse) {
-        // nothing to do
-    }
-
     /**
      * Additional tasks to execute directly after attach operation.
      * <p>
@@ -422,7 +410,7 @@ private void sendExecuteImmediate(String statementText, FbTransaction transactio
     private void receiveExecuteImmediateResponse() throws SQLException {
         try {
             if (!isAttached()) {
-                processAttachOrCreateResponse(readGenericResponse(null));
+                readGenericResponse(null);
             }
             readGenericResponse(null);
         } catch (IOException e) {
@@ -517,7 +505,6 @@ public final BlrCalculator getBlrCalculator() {
 
     @Override
     public final void authReceiveResponse(AcceptPacket acceptPacket) throws IOException, SQLException {
-        final DbCryptCallback dbCryptCallback = connection.createDbCryptCallback();
-        wireOperations.authReceiveResponse(acceptPacket, dbCryptCallback, this::processAttachOrCreateResponse);
+        wireOperations.authReceiveResponse(acceptPacket, connection.createDbCryptCallback());
     }
 }

src/main/org/firebirdsql/gds/ng/wire/version10/V10Service.java

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2015-2024 Mark Rotteveel
+// SPDX-FileCopyrightText: Copyright 2015-2025 Mark Rotteveel
 // SPDX-License-Identifier: LGPL-2.1-or-later
 package org.firebirdsql.gds.ng.wire.version10;
 
@@ -7,7 +7,6 @@
 import org.firebirdsql.gds.impl.wire.XdrOutputStream;
 import org.firebirdsql.gds.ng.FbExceptionBuilder;
 import org.firebirdsql.gds.ng.LockCloseable;
-import org.firebirdsql.gds.ng.dbcrypt.DbCryptCallback;
 import org.firebirdsql.gds.ng.wire.*;
 
 import java.io.IOException;
@@ -67,17 +66,6 @@ private void receiveAttachResponse() throws SQLException {
         }
     }
 
-    /**
-     * Processes the response from the server to the attach or create operation.
-     *
-     * @param genericResponse
-     *         GenericResponse received from the server.
-     */
-    @SuppressWarnings("unused")
-    protected void processAttachResponse(GenericResponse genericResponse) {
-        // nothing to do
-    }
-
     protected void afterAttachActions() throws SQLException {
         getServiceInfo(null, getDescribeServiceRequestBuffer(), 1024, getServiceInformationProcessor());
         // During connect and attach the socketTimeout might be set to the connectTimeout, now reset to 'normal' socketTimeout
@@ -226,7 +214,6 @@ private void receiveServiceStartResponse() throws SQLException {
 
     @Override
     public final void authReceiveResponse(AcceptPacket acceptPacket) throws IOException, SQLException {
-        final DbCryptCallback dbCryptCallback = connection.createDbCryptCallback();
-        wireOperations.authReceiveResponse(acceptPacket, dbCryptCallback, V10Service.this::processAttachResponse);
+        wireOperations.authReceiveResponse(acceptPacket, connection.createDbCryptCallback());
     }
 }

src/main/org/firebirdsql/gds/ng/wire/version10/V10WireOperations.java

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2015-2024 Mark Rotteveel
+// SPDX-FileCopyrightText: Copyright 2015-2025 Mark Rotteveel
 // SPDX-License-Identifier: LGPL-2.1-or-later
 package org.firebirdsql.gds.ng.wire.version10;
 
@@ -25,12 +25,11 @@ public V10WireOperations(WireConnection<?, ?> connection, WarningMessageCallback
 
     @Override
     @SuppressWarnings("java:S4274")
-    public void authReceiveResponse(FbWireAttachment.AcceptPacket acceptPacket, DbCryptCallback dbCryptCallback,
-            ProcessAttachCallback processAttachCallback) throws IOException, SQLException {
+    public void authReceiveResponse(FbWireAttachment.AcceptPacket acceptPacket, DbCryptCallback dbCryptCallback)
+            throws IOException, SQLException {
         assert acceptPacket == null : "Should not be called with non-null acceptPacket in V12 or earlier";
-        GenericResponse response = readGenericResponse(null);
+        readGenericResponse(null);
         getClientAuthBlock().setAuthComplete(true);
-        processAttachCallback.processAttachResponse(response);
 
         // fbclient also ignores REQUIRED when connecting to FB 2.5 or lower, apply same
         if (getAttachProperties().getWireCryptAsEnum() == WireCrypt.REQUIRED) {

src/main/org/firebirdsql/gds/ng/wire/version13/V13WireOperations.java

@@ -13,7 +13,6 @@
 import org.firebirdsql.gds.ng.dbcrypt.DbCryptCallback;
 import org.firebirdsql.gds.ng.dbcrypt.DbCryptData;
 import org.firebirdsql.gds.ng.wire.FbWireAttachment;
-import org.firebirdsql.gds.ng.wire.FbWireOperations;
 import org.firebirdsql.gds.ng.wire.GenericResponse;
 import org.firebirdsql.gds.ng.wire.WireConnection;
 import org.firebirdsql.gds.ng.wire.auth.ClientAuthBlock;
@@ -56,8 +55,8 @@ public V13WireOperations(WireConnection<?, ?> connection, WarningMessageCallback
     }
 
     @Override
-    public void authReceiveResponse(FbWireAttachment.AcceptPacket acceptPacket, DbCryptCallback dbCryptCallback,
-            FbWireOperations.ProcessAttachCallback processAttachCallback) throws SQLException, IOException {
+    public void authReceiveResponse(FbWireAttachment.AcceptPacket acceptPacket, DbCryptCallback dbCryptCallback)
+            throws SQLException, IOException {
         assert acceptPacket == null || acceptPacket.operation == op_cond_accept
                 : "Unexpected operation in AcceptPacket";
         final XdrInputStream xdrIn = getXdrIn();
@@ -103,7 +102,6 @@ public void authReceiveResponse(FbWireAttachment.AcceptPacket acceptPacket, DbCr
                     GenericResponse response = (GenericResponse) readOperationResponse(operation, null);
                     boolean wasAuthComplete = clientAuthBlock.isAuthComplete();
                     clientAuthBlock.setAuthComplete(true);
-                    processAttachCallback.processAttachResponse(response);
                     addServerKeys(response.data());
 
                     WireCrypt wireCrypt = getAttachProperties().getWireCryptAsEnum();