Various code cleanup/fixes as suggested by Sonarlint

internal-tools/src/main/java/org/firebirdsql/internal/tools/PerFacilityStore.java

@@ -20,10 +20,10 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.function.Function;
+import java.util.function.IntFunction;
 
 import static java.lang.String.format;
 import static org.firebirdsql.internal.tools.MessageConverter.toJaybirdMessageFormat;
@@ -36,13 +36,11 @@
  */
 class PerFacilityStore extends MessageStore {
 
+    @SuppressWarnings("unused")
     private static final int MAX_FACILITY = 25; // NOTE: This is Firebird max, Jaybird has facility 26
-    static final int FACILITY_SIZE = MAX_FACILITY + 1;
 
-    private final Map<Facility, Map<Integer, String>> messagesPerFacility =
-            new HashMap<>((int) (FACILITY_SIZE / 0.75f));
-    private final Map<Facility, Map<Integer, String>> sqlStatesPerFacility =
-            new HashMap<>((int) (FACILITY_SIZE / 0.75f));
+    private final Map<Facility, Map<Integer, String>> messagesPerFacility = new EnumMap<>(Facility.class);
+    private final Map<Facility, Map<Integer, String>> sqlStatesPerFacility = new EnumMap<>(Facility.class);
     private final SymbolStore symbolStore = new SymbolStore();
 
     @Override
@@ -79,8 +77,8 @@ public void save() throws IOException {
         symbolStore.save();
     }
 
-    private void save(Map<Facility, Map<Integer, String>> facilityMap,
-            Function<Integer, String> filenameGenerator) throws IOException {
+    private void save(Map<Facility, Map<Integer, String>> facilityMap, IntFunction<String> filenameGenerator)
+            throws IOException {
         for (Map.Entry<Facility, Map<Integer, String>> facilityEntry : facilityMap.entrySet()) {
             Map<Integer, String> facilityData = facilityEntry.getValue();
             if (facilityData.isEmpty()) {

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

@@ -106,9 +106,9 @@ private List<String> findLibrariesToTry() {
         if (optionalFbEmbeddedInstance.isPresent()) {
             FirebirdEmbeddedLibrary firebirdEmbeddedLibrary = optionalFbEmbeddedInstance.get();
             log.log(INFO, "Found Firebird Embedded {0} on classpath", firebirdEmbeddedLibrary.getVersion());
-            if (firebirdEmbeddedLibrary instanceof DisposableFirebirdEmbeddedLibrary) {
-                NativeResourceTracker.strongRegisterNativeResource(new FirebirdEmbeddedLibraryNativeResource(
-                        (DisposableFirebirdEmbeddedLibrary) firebirdEmbeddedLibrary));
+            if (firebirdEmbeddedLibrary instanceof DisposableFirebirdEmbeddedLibrary disposableLibrary) {
+                NativeResourceTracker.strongRegisterNativeResource(
+                        new FirebirdEmbeddedLibraryNativeResource(disposableLibrary));
             }
 
             Path entryPointPath = firebirdEmbeddedLibrary.getEntryPointPath().toAbsolutePath();

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

@@ -46,7 +46,7 @@
 public abstract class JnaConnection<T extends IAttachProperties<T>, C extends JnaAttachment>
         extends AbstractConnection<T, C> {
 
-    private static final boolean bigEndian = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN;
+    private static final boolean BIG_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN;
 
     private final FbClientLibrary clientLibrary;
     private final String attachUrl;
@@ -152,16 +152,16 @@ protected void processStatusVector(ISC_STATUS[] statusVector, WarningMessageCall
 
         if (!builder.isEmpty()) {
             SQLException exception = builder.toFlatSQLException();
-            if (exception instanceof SQLWarning) {
-                warningMessageCallback.processWarning((SQLWarning) exception);
+            if (exception instanceof SQLWarning warning) {
+                warningMessageCallback.processWarning(warning);
             } else {
                 throw exception;
             }
         }
     }
 
     final DatatypeCoder createDatatypeCoder() {
-        if (bigEndian) {
+        if (BIG_ENDIAN) {
             return BigEndianDatatypeCoder.forEncodingFactory(getEncodingFactory());
         }
         return LittleEndianDatatypeCoder.forEncodingFactory(getEncodingFactory());

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

@@ -64,11 +64,9 @@ public class JnaDatabase extends AbstractFbDatabase<JnaDatabaseConnection>
     public JnaDatabase(JnaDatabaseConnection connection) {
         super(connection, connection.createDatatypeCoder());
         clientLibrary = connection.getClientLibrary();
-        if (clientLibrary instanceof FbClientFeatureAccess) {
-            clientFeatures = ((FbClientFeatureAccess) clientLibrary).getFeatures();
-        } else {
-            clientFeatures = emptySet();
-        }
+        clientFeatures = clientLibrary instanceof FbClientFeatureAccess featureAccess
+                ? featureAccess.getFeatures()
+                : emptySet();
     }
 
     /**

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

@@ -128,10 +128,9 @@ public static void shutdownNativeResources() {
     }
 
     static void disableShutdownHook() {
-        Object currentShutdownThread = shutdownThread.getAndSet(new Object());
-        if (currentShutdownThread instanceof Thread) {
+        if (shutdownThread.getAndSet(new Object()) instanceof Thread thread) {
             try {
-                Runtime.getRuntime().removeShutdownHook((Thread) currentShutdownThread);
+                Runtime.getRuntime().removeShutdownHook(thread);
             } catch (IllegalStateException e) {
                 // ignore
             } catch (SecurityException e) {
@@ -182,7 +181,7 @@ public void run() {
     /**
      * A native resource that can be registered with {@link NativeResourceTracker}.
      */
-    static abstract class NativeResource {
+    abstract static class NativeResource {
         /**
          * Dispose method to clean up the native resource.
          * <p>

jaybird-native/src/main/java/org/firebirdsql/jna/embedded/FirebirdEmbeddedLookup.java

@@ -35,10 +35,14 @@
  * @author Mark Rotteveel
  * @since 5
  */
-public class FirebirdEmbeddedLookup {
+public final class FirebirdEmbeddedLookup {
 
     private static final System.Logger log = System.getLogger(FirebirdEmbeddedLookup.class.getName());
 
+    private FirebirdEmbeddedLookup() {
+        // no instances
+    }
+
     /**
      * Tries to find a Firebird Embedded library service provider for the current platform and install it.
      * <p>

src/main/org/firebirdsql/ds/AbstractConnectionPropertiesDataSource.java

@@ -457,14 +457,14 @@ public void setUseCatalogAsPackage(boolean useCatalogAsPackage) {
     }
 
     @SuppressWarnings("deprecation")
-    @Deprecated
+    @Deprecated(since = "5")
     @Override
     public String getUserName() {
         return FirebirdConnectionProperties.super.getUserName();
     }
 
     @SuppressWarnings("deprecation")
-    @Deprecated
+    @Deprecated(since = "5")
     @Override
     public void setUserName(String userName) {
         FirebirdConnectionProperties.super.setUserName(userName);

src/main/org/firebirdsql/ds/StatementHandler.java

@@ -163,14 +163,14 @@ public boolean isClosed() {
     }
 
     // Statement methods
-    private final static Method STATEMENT_IS_CLOSED = findMethod(Statement.class, "isClosed", new Class[0]);
-    private final static Method FIREBIRD_STATEMENT_IS_CLOSED = findMethod(FirebirdStatement.class, "isClosed",
+    private static final Method STATEMENT_IS_CLOSED = findMethod(Statement.class, "isClosed", new Class[0]);
+    private static final Method FIREBIRD_STATEMENT_IS_CLOSED = findMethod(FirebirdStatement.class, "isClosed",
             new Class[0]);
-    private final static Method STATEMENT_CLOSE = findMethod(Statement.class, "close", new Class[0]);
-    private final static Method GET_CONNECTION = findMethod(Statement.class, "getConnection", new Class[0]);
+    private static final Method STATEMENT_CLOSE = findMethod(Statement.class, "close", new Class[0]);
+    private static final Method GET_CONNECTION = findMethod(Statement.class, "getConnection", new Class[0]);
 
     // Object Methods
-    private final static Method TO_STRING = findMethod(Object.class, "toString", new Class[0]);
-    private final static Method EQUALS = findMethod(Object.class, "equals", new Class[] { Object.class });
-    private final static Method HASH_CODE = findMethod(Object.class, "hashCode", new Class[0]);
+    private static final Method TO_STRING = findMethod(Object.class, "toString", new Class[0]);
+    private static final Method EQUALS = findMethod(Object.class, "equals", new Class[] { Object.class });
+    private static final Method HASH_CODE = findMethod(Object.class, "hashCode", new Class[0]);
 }

src/main/org/firebirdsql/ds/XAConnectionHandler.java

@@ -35,7 +35,8 @@ final class XAConnectionHandler extends PooledConnectionHandler {
         super(connection, owner);
         xaOwner = owner;
     }
-
+
+    @Override
     boolean isRollbackAllowed() throws SQLException {
         return !(xaOwner.inDistributedTransaction() || connection.getAutoCommit());
     }

src/main/org/firebirdsql/encodings/EncodingFactory.java

@@ -63,7 +63,7 @@ private static class DefaultEncodingFactory {
         }
     }
 
-    // Linked HashMap because we need to preserve insertion order for the lazy initialization;
+    // Linked HashMap because we need to preserve insertion order for the lazy initialization.
     // Initial capacity of 128 should prevent resizing during loading (if only DefaultEncodingSet is present)
     private final Map<String, EncodingDefinition> firebirdEncodingToDefinition = new LinkedHashMap<>(128);
     private final EncodingDefinition[] firebirdCharacterSetIdToDefinition =

src/main/org/firebirdsql/event/FBEventManager.java

@@ -205,6 +205,7 @@ private void terminateDispatcher() throws SQLException {
             try {
                 dispatchThread.join();
             } catch (InterruptedException ex) {
+                Thread.currentThread().interrupt();
                throw new SQLException(ex);
             } finally {
                 this.eventDispatcher = null;

src/main/org/firebirdsql/gds/impl/GDSFactory.java

@@ -30,8 +30,6 @@
 import org.firebirdsql.jaybird.util.PluginLoader;
 import org.firebirdsql.util.InternalApi;
 
-import java.io.Serial;
-import java.io.Serializable;
 import java.sql.SQLException;
 import java.util.*;
 import java.util.Map.Entry;

src/main/org/firebirdsql/gds/impl/GDSServerVersion.java

@@ -158,7 +158,7 @@ public String getFullVersion() {
      * @return Protocol version of the connection, or {@code -1} if this information is not available.
      */
     public int getProtocolVersion() {
-        // We assume the protocol information is in the second version string;
+        // We assume the protocol information is in the second version string,
         // this assumption may be wrong for multi-hop connections
         if (rawVersions.length == 1 || rawVersions[1] == null) return -1;
         Matcher connectionMetadataMatcher = CONNECTION_METADATA_PATTERN.matcher(rawVersions[1]);
@@ -181,7 +181,7 @@ public boolean isWireCompressionUsed() {
     }
 
     private String getConnectionOptions() {
-        // We assume the protocol information is in the second version string;
+        // We assume the protocol information is in the second version string,
         // this assumption may be wrong for multi-hop connections
         if (rawVersions.length == 1 || rawVersions[1] == null) return "";
         Matcher connectionMetadataMatcher = CONNECTION_METADATA_PATTERN.matcher(rawVersions[1]);

src/main/org/firebirdsql/gds/impl/wire/FbCipherInputStream.java

@@ -90,7 +90,7 @@ public int read() throws IOException {
             } while (i == 0);
             if (i == -1) return -1;
         }
-        return (int) outBuf[outPos++] & 0xFF;
+        return outBuf[outPos++] & 0xFF;
     }
 
     @Override

src/main/org/firebirdsql/gds/impl/wire/XdrInputStream.java

@@ -235,8 +235,8 @@ public void setCipher(Cipher cipher) throws IOException {
             throw new IOException("Input stream already encrypted");
         }
         InputStream currentStream = in;
-        if (currentStream instanceof EncryptedStreamSupport) {
-            ((EncryptedStreamSupport) currentStream).setCipher(cipher);
+        if (currentStream instanceof EncryptedStreamSupport encryptedStreamSupport) {
+            encryptedStreamSupport.setCipher(cipher);
         } else {
             in = new FbCipherInputStream(currentStream, cipher);
         }

src/main/org/firebirdsql/gds/impl/wire/XdrOutputStream.java

@@ -368,8 +368,8 @@ public void setCipher(Cipher cipher) throws IOException {
         }
         flush();
         OutputStream currentStream = out;
-        if (currentStream instanceof EncryptedStreamSupport) {
-            ((EncryptedStreamSupport) currentStream).setCipher(cipher);
+        if (currentStream instanceof EncryptedStreamSupport encryptedStreamSupport) {
+            encryptedStreamSupport.setCipher(cipher);
         } else {
             out = new CipherOutputStream(currentStream, cipher);
         }

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

@@ -283,7 +283,7 @@ public final void transactionStateChanged(FbTransaction transaction, Transaction
                This is acceptable as commit/rollback failure should be limited to situations were the database
                is either inaccessible and the transaction is likely already rolled back or pending rollback by
                the server, or the transaction was already committed or rolled back.
-            */
+             */
             // TODO "register" transaction as pendingEnd for debugging?
         case PREPARED:
             try (LockCloseable ignored = withLock()) {

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

@@ -28,7 +28,6 @@
 
 import java.sql.SQLException;
 import java.sql.SQLNonTransientException;
-import java.sql.SQLWarning;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.Set;
@@ -56,13 +55,9 @@ public abstract class AbstractFbStatement implements FbStatement {
     private static final int IN_CURSOR = 0;
     private static final int AFTER_LAST = 1;
 
-    private final WarningMessageCallback warningCallback = new WarningMessageCallback() {
-        @Override
-        public void processWarning(SQLWarning warning) {
-            statementListenerDispatcher.warningReceived(AbstractFbStatement.this, warning);
-        }
-    };
     protected final StatementListenerDispatcher statementListenerDispatcher = new StatementListenerDispatcher();
+    private final WarningMessageCallback warningCallback = warning ->
+            statementListenerDispatcher.warningReceived(AbstractFbStatement.this, warning);
     protected final ExceptionListenerDispatcher exceptionListenerDispatcher = new ExceptionListenerDispatcher(this);
     private volatile int cursorPosition = BEFORE_FIRST;
     // Indicates whether at least one fetch was done for the current cursor

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

@@ -128,7 +128,7 @@ protected void populateDefaultProperties(final S connection, final ServiceParame
         if (props.getRoleName() != null) {
             spb.addArgument(isc_spb_sql_role_name, props.getRoleName());
         }
-        if (props.getConnectTimeout() != IConnectionProperties.DEFAULT_CONNECT_TIMEOUT) {
+        if (props.getConnectTimeout() != IAttachProperties.DEFAULT_CONNECT_TIMEOUT) {
             spb.addArgument(isc_spb_connect_timeout, props.getConnectTimeout());
         }
     }

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

@@ -33,7 +33,6 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.Calendar;
 
 /**
  * Interface defining the encoding and decoding for Firebird (numerical) data types.

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

@@ -114,8 +114,7 @@ public boolean equals(Object o) {
         if (o == this) {
             return true;
         }
-        if (o instanceof EncodingSpecificDatatypeCoder) {
-            EncodingSpecificDatatypeCoder other = (EncodingSpecificDatatypeCoder) o;
+        if (o instanceof EncodingSpecificDatatypeCoder other) {
             return encodingDefinition.equals(other.encodingDefinition)
                    && parentCoder.getClass() == other.parentCoder.getClass();
         } else {

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

@@ -167,8 +167,8 @@ default void populateBatchParameterBuffer(BatchParameterBuffer batchPb) {
         if (batchBufferSize() >= 0) {
             batchPb.addArgument(TAG_BUFFER_BYTES_SIZE, batchBufferSize());
         }
-        // Doesn't seem to make a difference in current implementation;
-        // in practice we register existing blobs under their own id (see registerBlobs in V16Statement)
+        // Doesn't seem to make a difference in current implementation, in practice we register existing blobs under
+        // their own id (see registerBlobs in V16Statement)
         // TODO Might need to change when implementing batching of blobs
         batchPb.addArgument(TAG_BLOB_POLICY, BLOB_ID_USER);
     }

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

@@ -138,8 +138,8 @@ public static ServerVersionInformation getForVersion(GDSServerVersion serverVers
         return getForVersion(serverVersion.getMajorVersion(), serverVersion.getMinorVersion());
     }
 
-    private static class Constants {
-        public static final byte[] V1_0_STATEMENT_INFO = new byte[] {
+    private static final class Constants {
+        static final byte[] V1_0_STATEMENT_INFO = new byte[] {
                 isc_info_sql_stmt_type,
                 isc_info_sql_select,
                 isc_info_sql_describe_vars,
@@ -165,7 +165,7 @@ private static class Constants {
                 //isc_info_sql_owner,
                 isc_info_sql_describe_end
         };
-        public static final byte[] V_1_0_PARAMETER_INFO = new byte[] {
+        static final byte[] V_1_0_PARAMETER_INFO = new byte[] {
                 isc_info_sql_describe_vars,
                 isc_info_sql_sqlda_seq,
                 isc_info_sql_type, isc_info_sql_sub_type,
@@ -176,7 +176,7 @@ private static class Constants {
                 isc_info_sql_owner,
                 isc_info_sql_describe_end
         };
-        public static final byte[] V_2_0_STATEMENT_INFO = new byte[] {
+        static final byte[] V_2_0_STATEMENT_INFO = new byte[] {
                 isc_info_sql_stmt_type,
                 isc_info_sql_select,
                 isc_info_sql_describe_vars,
@@ -203,7 +203,7 @@ private static class Constants {
                 //isc_info_sql_owner,
                 isc_info_sql_describe_end
         };
-        public static final byte[] V_2_0_PARAMETER_INFO = new byte[] {
+        static final byte[] V_2_0_PARAMETER_INFO = new byte[] {
                 isc_info_sql_describe_vars,
                 isc_info_sql_sqlda_seq,
                 isc_info_sql_type, isc_info_sql_sub_type,
@@ -215,5 +215,9 @@ private static class Constants {
                 isc_info_sql_owner,
                 isc_info_sql_describe_end
         };
+
+        private Constants() {
+            // no instances
+        }
     }
 }

src/main/org/firebirdsql/gds/ng/tz/TimeZoneDatatypeCoder.java

@@ -191,7 +191,7 @@ private OffsetTime decodeTimeTzToOffsetTime(byte[] timeTzBytes) {
                     .withOffsetSameInstant((ZoneOffset) zoneId);
         }
 
-        // We need to base on a date to determine value, we use the 2020-01-01 date;
+        // We need to base on a date to determine value, we use the 2020-01-01 date,
         // this aligns closest with Firebird behaviour
 
         return ZonedDateTime.of(TIME_TZ_BASE_DATE, utcTime, ZoneOffset.UTC)
@@ -225,7 +225,7 @@ private ZonedDateTime decodeTimeTzToZonedDateTime(byte[] timeTzBytes) {
     }
 
     private ZonedDateTime decodeTimeTzToZonedDateTime(LocalTime utcTime, ZoneId zoneId) {
-        // We need to base on a date to determine value, we use the 2020-01-01 date;
+        // We need to base on a date to determine value, we use the 2020-01-01 date,
         // this aligns closest with Firebird behaviour
 
         ZonedDateTime timeAtBaseDate = ZonedDateTime.of(TIME_TZ_BASE_DATE, utcTime, ZoneOffset.UTC)