minor cleanup, modernizing for J21

Author: andrus

bootique-jdbc-hikaricp-instrumented/src/main/java/io/bootique/jdbc/instrumented/hikaricp/HikariCPInstrumentedDataSourceFactory.java

@@ -60,7 +60,7 @@ protected ManagedDataSourceStarter createDataSourceStarter(
             Consumer<DataSource> shutdown) {
 
         HealthCheckGroup healthChecks = healthChecks(dataSourceName);
-        return new InstrumentedManagedDataSourceStarter(() -> getJdbcUrl(), startup, shutdown, healthChecks);
+        return new InstrumentedManagedDataSourceStarter(this::getJdbcUrl, startup, shutdown, healthChecks);
     }
 
     @BQConfigProperty

bootique-jdbc-hikaricp-instrumented/src/main/java/io/bootique/jdbc/instrumented/hikaricp/HikariCPMetricsInitializer.java

@@ -34,7 +34,7 @@ public class HikariCPMetricsInitializer implements DataSourceListener {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(HikariCPMetricsInitializer.class);
 
-    private MetricRegistry metricRegistry;
+    private final MetricRegistry metricRegistry;
 
     public HikariCPMetricsInitializer(MetricRegistry metricRegistry) {
         this.metricRegistry = metricRegistry;

bootique-jdbc-hikaricp-instrumented/src/main/java/io/bootique/jdbc/instrumented/hikaricp/healthcheck/HikariCPConnectivityCheck.java

@@ -68,14 +68,12 @@ public HealthCheckOutcome check() {
 
         HealthCheckOutcome warningOutcome = checkThreshold(ThresholdType.WARNING, HealthCheckOutcome::warning);
 
-        switch (warningOutcome.getStatus()) {
-            case WARNING:
-                return warningOutcome;
-            case UNKNOWN:
-                return checkThreshold(ThresholdType.CRITICAL, HealthCheckOutcome::critical);
-        }
+        return switch (warningOutcome.getStatus()) {
+            case WARNING -> warningOutcome;
+            case UNKNOWN -> checkThreshold(ThresholdType.CRITICAL, HealthCheckOutcome::critical);
+            default -> HealthCheckOutcome.ok();
+        };
 
-        return HealthCheckOutcome.ok();
     }
 
     protected HealthCheckOutcome checkThreshold(ThresholdType type, Function<SQLException, HealthCheckOutcome> onFailure) {

bootique-jdbc-hikaricp-instrumented/src/main/java/io/bootique/jdbc/instrumented/hikaricp/healthcheck/HikariCPConnectivityCheckFactory.java

@@ -28,7 +28,7 @@
 
 class HikariCPConnectivityCheckFactory {
 
-    private DurationRangeFactory thresholdsFactory;
+    private final DurationRangeFactory thresholdsFactory;
 
     HikariCPConnectivityCheckFactory(DurationRangeFactory thresholdsFactory) {
         this.thresholdsFactory = thresholdsFactory;

bootique-jdbc-hikaricp-instrumented/src/main/java/io/bootique/jdbc/instrumented/hikaricp/healthcheck/HikariCPHealthChecks.java

@@ -33,7 +33,7 @@
  */
 public class HikariCPHealthChecks implements HealthCheckGroup {
 
-    private Map<String, ManagedDataSourceStarter> starters;
+    private final Map<String, ManagedDataSourceStarter> starters;
 
     public HikariCPHealthChecks(Map<String, ManagedDataSourceStarter> starters) {
         this.starters = starters;

bootique-jdbc-hikaricp-instrumented/src/main/java/io/bootique/jdbc/instrumented/hikaricp/healthcheck/Wait99PercentCheck.java

@@ -28,7 +28,7 @@
 
 /**
  * The health check checks that, on average, 99% of all calls to {@code getConnection()} obtain a
- * {@link java.sql.Connection} within a specified  number of milliseconds.
+ * {@link java.sql.Connection} within a specified number of milliseconds.
  */
 public class Wait99PercentCheck extends ValueRangeCheck<Duration> {
 

bootique-jdbc-hikaricp-instrumented/src/main/java/io/bootique/jdbc/instrumented/hikaricp/healthcheck/Wait99PercentCheckFactory.java

@@ -33,7 +33,7 @@
 
 class Wait99PercentCheckFactory {
 
-    private DurationRangeFactory thresholdsFactory;
+    private final DurationRangeFactory thresholdsFactory;
 
     public Wait99PercentCheckFactory(DurationRangeFactory thresholdsFactory) {
         this.thresholdsFactory = thresholdsFactory;
@@ -73,13 +73,10 @@ private Duration readConnection99Percent(MetricRegistry registry, String metricN
     private Timer findTimer(MetricRegistry registry, String name) {
 
         Collection<Timer> timers = registry.getTimers((n, m) -> name.equals(n)).values();
-        switch (timers.size()) {
-            case 0:
-                throw new IllegalArgumentException("Timer not found: " + name);
-            case 1:
-                return timers.iterator().next();
-            default:
-                throw new IllegalArgumentException("More than one Timer matching the name: " + name);
-        }
+        return switch (timers.size()) {
+            case 0 -> throw new IllegalArgumentException("Timer not found: " + name);
+            case 1 -> timers.iterator().next();
+            default -> throw new IllegalArgumentException("More than one Timer matching the name: " + name);
+        };
     }
 }

bootique-jdbc-hikaricp-instrumented/src/main/java/io/bootique/jdbc/instrumented/hikaricp/managed/InstrumentedManagedDataSourceStarter.java

@@ -28,7 +28,7 @@
 
 public class InstrumentedManagedDataSourceStarter extends ManagedDataSourceStarter {
 
-    private HealthCheckGroup healthChecks;
+    private final HealthCheckGroup healthChecks;
 
     public InstrumentedManagedDataSourceStarter(
             Supplier<String> url,

bootique-jdbc-hikaricp/src/main/java/io/bootique/jdbc/hikaricp/HikariCPManagedDataSourceFactory.java

@@ -61,7 +61,7 @@ public class HikariCPManagedDataSourceFactory implements ManagedDataSourceFactor
     private long connectionTimeout;
     private String dataSourceClassName;
     private String dataSourceJNDI;
-    private Properties dataSourceProperties;
+    private final Properties dataSourceProperties;
     private String driverClassName;
     private long idleTimeout;
     private long initializationFailTimeout;
@@ -338,7 +338,7 @@ protected HikariConfig toConfiguration(String dataSourceName) {
 
     private static class HikariThreadFactory implements ThreadFactory {
 
-        private AtomicInteger counter = new AtomicInteger();
+        private final AtomicInteger counter = new AtomicInteger();
 
         @Override
         public Thread newThread(Runnable r) {

bootique-jdbc-junit5/src/main/java/io/bootique/jdbc/junit5/connector/ArrayReader.java

@@ -33,7 +33,7 @@
  */
 public abstract class ArrayReader implements RowReader {
 
-    public static <T> RowReader create(DbColumnMetadata... columns) {
+    public static RowReader create(DbColumnMetadata... columns) {
 
         if (columns.length == 0) {
             return ResultSetRowReader.instance;
@@ -50,19 +50,17 @@ public static <T> RowReader create(DbColumnMetadata... columns) {
     static ColumnReader forJdbcType(int type, int pos) {
         // TODO: add conversions to java.time types?
 
-        switch (type) {
-            // only care about types requiring special handling.. Let the driver handle the rest via "getObject"
-            case Types.TIME:
-                // MySQL 8 requires a Calendar instance to save local time without undesired TZ conversion.
-                // Other DBs work fine with or without the calendar
-                return rs -> rs.getTime(pos, Calendar.getInstance());
-            case Types.TIMESTAMP:
-                // MySQL 8 requires a Calendar instance to save local time without undesired TZ conversion.
-                // Other DBs work fine with or without the calendar
-                return rs -> rs.getTimestamp(pos, Calendar.getInstance());
-            default:
-                return rs -> rs.getObject(pos);
-        }
+        return switch (type) {
+            // We only care about types requiring special handling. Let the driver handle the rest via "getObject"
+
+            // MySQL 8 requires a Calendar instance to save local time without undesired TZ conversion.
+            // Other DBs work fine with or without the calendar
+            case Types.TIME -> rs -> rs.getTime(pos, Calendar.getInstance());
+            // MySQL 8 requires a Calendar instance to save local time without undesired TZ conversion.
+            // Other DBs work fine with or without the calendar
+            case Types.TIMESTAMP -> rs -> rs.getTimestamp(pos, Calendar.getInstance());
+            default -> rs -> rs.getObject(pos);
+        };
     }
 
     protected ArrayReader() {