Merge pull request boskworks#140 from prdoyle/gradle9

Upgrade to Gradle 9

Author: prdoyle

bosk-mongo/src/main/java/works/bosk/drivers/mongo/ChangeReceiver.java

@@ -126,49 +126,33 @@ private void connectionLoop() {
 								}
 							}
 						} catch (UnprocessableEventException | UnexpectedEventProcessingException e) {
-							addContextToException(e);
-							LOGGER.warn("Unable to process MongoDB change event; reconnecting ({})", e.getMessage(), e);
-							listener.onDisconnect(e);
+							disconnect("Unable to process MongoDB change event", REMEDY_CONTINUE, e);
 							// Reconnection will skip this event, so it's safe to try it right away
 							continue;
 						} catch (InterruptedException e) {
-							addContextToException(e);
-							LOGGER.warn("Interrupted while processing MongoDB change events; reconnecting", e);
-							listener.onDisconnect(e);
+							disconnect("Interrupted while processing MongoDB change events", REMEDY_CONTINUE, e);
 							continue;
 						} catch (IOException e) {
-							addContextToException(e);
-							LOGGER.warn("Unexpected exception while processing MongoDB change events; will wait and retry", e);
-							listener.onDisconnect(e);
+							disconnect("Unexpected exception while processing MongoDB change events", REMEDY_RETURN, e);
 							return;
 						} catch (UnrecognizedFormatException e) {
-							addContextToException(e);
-							LOGGER.warn("Unrecognized MongoDB database content format; will wait and retry", e);
-							listener.onDisconnect(e);
+							disconnect("Unrecognized MongoDB database content format", REMEDY_RETURN, e);
 							return;
 						} catch (UninitializedCollectionException e) {
-							addContextToException(e);
-							LOGGER.warn("MongoDB collection is not initialized; will wait and retry", e);
-							listener.onDisconnect(e);
+							disconnect("MongoDB collection is not initialized", REMEDY_RETURN, e);
 							return;
 						} catch (InitialRootActionException e) {
-							addContextToException(e);
-							LOGGER.warn("Unable to initialize bosk state; will wait and retry", e);
-							listener.onDisconnect(e);
+							disconnect("Unable to initialize bosk state", REMEDY_RETURN, e);
 							return;
 						} catch (TimeoutException e) {
-							addContextToException(e);
-							LOGGER.warn("Timed out waiting for bosk state to initialize; will wait and retry", e);
-							listener.onDisconnect(e);
+							disconnect("Timed out waiting for bosk state to initialize", REMEDY_RETURN, e);
 							return;
 						} catch (DisconnectedException e) {
 							addContextToException(e);
 							LOGGER.warn("Driver is disconnected; will wait and retry", e);
 							return;
 						} catch (RuntimeException | Error e) {
-							addContextToException(e);
-							LOGGER.warn("Unexpected exception after connecting to MongoDB; will wait and retry", e);
-							listener.onDisconnect(e);
+							disconnect("Unexpected exception after connecting to MongoDB", REMEDY_RETURN, e);
 							return;
 						}
 					} catch (RuntimeException e) {
@@ -194,6 +178,16 @@ private void connectionLoop() {
 		}
 	}
 
+	private void disconnect(String description, String remedy, Throwable e) {
+		addContextToException(e);
+		if (isClosed) {
+			LOGGER.debug("(Driver is already closed) {}", description, e);
+		} else {
+			LOGGER.warn("{}; {}", description, remedy, e);
+		}
+		listener.onDisconnect(e);
+	}
+
 	private void addContextToException(Throwable x) {
 		x.addSuppressed(creationPoint);
 	}
@@ -275,4 +269,14 @@ private void processEvent(ChangeStreamDocument<BsonDocument> event) throws Unpro
 
 	private static final AtomicLong EVENT_COUNTER = new AtomicLong(0);
 	private static final Logger LOGGER = LoggerFactory.getLogger(ChangeReceiver.class);
+
+	/**
+	 * Suitable for {@code continue} in {@link #connectionLoop()}
+	 */
+	private static final String REMEDY_CONTINUE = "reconnecting";
+
+	/**
+	 * Suitable for {@code return} in {@link #connectionLoop()}
+	 */
+	private static final String REMEDY_RETURN = "will wait and retry";
 }

bosk-mongo/src/main/java/works/bosk/drivers/mongo/MainDriver.java

@@ -362,12 +362,12 @@ public MongoStatus readStatus() throws Exception {
 
 	@Override
 	public void close() {
+		receiver.close();
+		formatDriver.close();
 		if (!isClosed.getAndSet(true)) {
 			// It's important we don't call this twice, or else it will throw
 			mongoClient.close();
 		}
-		receiver.close();
-		formatDriver.close();
 	}
 
 	/**

build.gradle

@@ -24,6 +24,9 @@ allprojects {
 	group = 'works.bosk'
 	// version should be set as a property with -Pversion
 
+	tasks.withType(Javadoc).configureEach {
+		options.addStringOption('Xdoclint:-missing', '-quiet')
+	}
 }
 
 configure(subprojects.findAll {
@@ -56,6 +59,7 @@ configure(subprojects.findAll {
 		options.forkOptions.jvmArgs << '--sun-misc-unsafe-memory-access=allow' // For Lombok
 	}
 
+	// It's important that bosk-annotations has no deps so other projects won't hesitate to use it
 	if (name != "bosk-annotations") {
 		dependencies {
 			annotationProcessor libs.lombok

gradle.properties

@@ -0,0 +1 @@
+org.gradle.configuration-cache=true

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME