#954 Use checkAttached instead of checkConnected

Author: mrotteveel

jaybird-native/src/main/java/org/firebirdsql/gds/ng/jna/JnaDatabase.java

@@ -173,7 +173,7 @@ public void createDatabase() throws SQLException {
     @Override
     public void dropDatabase() throws SQLException {
         try {
-            checkConnected();
+            checkAttached();
             try (LockCloseable ignored = withLock()) {
                 try {
                     clientLibrary.isc_drop_database(statusVector, handle);
@@ -211,7 +211,7 @@ public void cancelOperation(int kind) throws SQLException {
     @Override
     public JnaTransaction startTransaction(final TransactionParameterBuffer tpb) throws SQLException {
         try {
-            checkConnected();
+            checkAttached();
             var transactionHandle = new IntByReference(0);
             byte[] tpbArray = tpb.toBytesWithType();
             try (LockCloseable ignored = withLock()) {
@@ -232,7 +232,7 @@ public JnaTransaction startTransaction(final TransactionParameterBuffer tpb) thr
     @Override
     public FbTransaction startTransaction(String statementText) throws SQLException {
         try {
-            checkConnected();
+            checkAttached();
             var transactionHandle = new IntByReference(0);
             byte[] statementArray = getEncoding().encodeToCharset(statementText);
             try (LockCloseable ignored = withLock()) {
@@ -253,7 +253,7 @@ public FbTransaction startTransaction(String statementText) throws SQLException
     @Override
     public FbTransaction reconnectTransaction(long transactionId) throws SQLException {
         try {
-            checkConnected();
+            checkAttached();
             final byte[] transactionIdBuffer = getTransactionIdBuffer(transactionId);
 
             final IntByReference transactionHandle = new IntByReference(0);
@@ -276,7 +276,7 @@ public FbTransaction reconnectTransaction(long transactionId) throws SQLExceptio
     @Override
     public JnaStatement createStatement(@Nullable FbTransaction transaction) throws SQLException {
         try {
-            checkConnected();
+            checkAttached();
             final JnaStatement stmt = new JnaStatement(this);
             stmt.addExceptionListener(exceptionListenerDispatcher);
             stmt.setTransaction(transaction);
@@ -423,7 +423,7 @@ public void countEvents(EventHandle eventHandle) throws SQLException {
     @Override
     public void queueEvent(EventHandle eventHandle) throws SQLException {
         try {
-            checkConnected();
+            checkAttached();
             final JnaEventHandle jnaEventHandle = validateEventHandle(eventHandle);
 
             try (LockCloseable ignored = withLock()) {
@@ -451,7 +451,7 @@ public void queueEvent(EventHandle eventHandle) throws SQLException {
     @Override
     public void cancelEvent(EventHandle eventHandle) throws SQLException {
         try {
-            checkConnected();
+            checkAttached();
             final JnaEventHandle jnaEventHandle = validateEventHandle(eventHandle);
 
             try (LockCloseable ignored = withLock()) {

src/main/org/firebirdsql/gds/ng/AbstractFbAttachment.java

@@ -150,20 +150,25 @@ public final void removeExceptionListener(ExceptionListener listener) {
     /**
      * Checks if the attachment is connected, and throws a {@link SQLException} if it isn't connected.
      * <p>
-     * Implementations where connected and attached are indistinguishable may call {@link #checkAttached()} or
-     * vice versa.
+     * In general, {@link #checkAttached()} should be used. An attachment might be connected (e.g. TCP/IP connection
+     * established to the server), but not (yet) attached to a database or service.
      * </p>
+     *
+     * @see #checkAttached()
      */
     protected abstract void checkConnected() throws SQLException;
 
     /**
-     * Returns if this attachment is connected as checked by {@link #checkConnected()}.
+     * Returns {@code true} if this attachment is connected as checked by {@link #checkConnected()}.
      * <p>
      * In general, {@link #isAttached()} should be used. An attachment might be connected (e.g. TCP/IP connection
      * established to the server), but not (yet) attached to a database or service.
      * </p>
      *
      * @return {@code true} if connected
+     * @see #isAttached()
+     * @see #checkAttached()
+     * @see #checkConnected()
      * @since 7
      */
     protected abstract boolean isConnected();