Merge pull request #22 from prdoyle/newer-java

Upgrade to JDK 22

.github/workflows/build-and-test.yml

@@ -23,8 +23,10 @@ jobs:
 
       - uses: actions/setup-java@v4
         with:
-          java-version: '17'
           distribution: temurin
+          java-version: |
+            22
+            17
 
       - uses: gradle/actions/setup-gradle@v3
         with:

.github/workflows/release.yml

@@ -19,12 +19,10 @@ jobs:
 
       - uses: actions/setup-java@v4
         with:
-          java-version: '17'
           distribution: temurin
-          server-id: ossrh
-          server-username: ${{ secrets.OSSRH_USERNAME }}
-          server-password: ${{ secrets.OSSRH_TOKEN }}
-          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          java-version: |
+            22
+            17
 
       - uses: gradle/actions/setup-gradle@v3
 

bosk-annotations/build.gradle

@@ -5,8 +5,17 @@ plugins {
 }
 
 java {
-	sourceCompatibility = '17'
-	targetCompatibility = '17'
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(22)
+	}
+}
+
+compileJava {
+	options.release = 17
+}
+
+compileTestJava {
+	options.release = null
 }
 
 repositories {

bosk-core/build.gradle

@@ -7,8 +7,17 @@ plugins {
 }
 
 java {
-	sourceCompatibility = '17'
-	targetCompatibility = '17'
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(22)
+	}
+}
+
+compileJava {
+	options.release = 17
+}
+
+compileTestJava {
+	options.release = null
 }
 
 dependencies {

bosk-core/src/test/java/works/bosk/BoskConstructorTest.java

@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.concurrent.atomic.AtomicReference;
-import lombok.val;
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.Test;
 import works.bosk.Bosk.DefaultRootFunction;
@@ -37,7 +36,7 @@ void basicProperties_correctValues() {
 		Bosk<StateTreeNode> bosk = new Bosk<StateTreeNode>(
 			name,
 			rootType,
-			__ -> root,
+			_ -> root,
 			(b,d)-> {
 				driver.set(new ForwardingDriver<>(singleton(d)));
 				return driver.get();
@@ -50,7 +49,7 @@ void basicProperties_correctValues() {
 
 		assertSame(driver.get(), bosk.getDriver(ForwardingDriver.class));
 
-		try (val __ = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			assertSame(root, bosk.rootReference().value());
 		}
 	}
@@ -81,9 +80,9 @@ void badDriverInitialRoot_throws() {
 
 	@Test
 	void badDefaultRootFunction_throws() {
-		assertDefaultRootThrows(NullPointerException.class, __ -> null);
-		assertDefaultRootThrows(ClassCastException.class, __ -> new TypeValidationTest.CatalogOfInvalidType(Identifier.from("whoops"), Catalog.empty()));
-		assertDefaultRootThrows(IllegalArgumentException.class, __ -> { throw new InvalidTypeException("Whoopsie"); });
+		assertDefaultRootThrows(NullPointerException.class, _ -> null);
+		assertDefaultRootThrows(ClassCastException.class, _ -> new TypeValidationTest.CatalogOfInvalidType(Identifier.from("whoops"), Catalog.empty()));
+		assertDefaultRootThrows(IllegalArgumentException.class, _ -> { throw new InvalidTypeException("Whoopsie"); });
 	}
 
 	@Test
@@ -104,9 +103,9 @@ void driverInitialRoot_matches() {
 		Bosk<StateTreeNode> bosk = new Bosk<StateTreeNode>(
 			boskName(),
 			SimpleTypes.class,
-			__ -> {throw new AssertionError("Shouldn't be called");},
+			_ -> {throw new AssertionError("Shouldn't be called");},
 			initialRootDriver(()->root));
-		try (val __ = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			assertSame(root, bosk.rootReference().value());
 		}
 	}
@@ -116,14 +115,14 @@ void defaultRoot_matches() {
 		SimpleTypes root = newEntity();
 		{
 			Bosk<StateTreeNode> valueBosk = new Bosk<>(boskName(), SimpleTypes.class, root, Bosk::simpleDriver);
-			try (val __ = valueBosk.readContext()) {
+			try (var _ = valueBosk.readContext()) {
 				assertSame(root, valueBosk.rootReference().value());
 			}
 		}
 
 		{
-			Bosk<StateTreeNode> functionBosk = new Bosk<StateTreeNode>(boskName(), SimpleTypes.class, __ -> root, Bosk::simpleDriver);
-			try (val __ = functionBosk.readContext()) {
+			Bosk<StateTreeNode> functionBosk = new Bosk<StateTreeNode>(boskName(), SimpleTypes.class, _ -> root, Bosk::simpleDriver);
+			try (var _ = functionBosk.readContext()) {
 				assertSame(root, functionBosk.rootReference().value());
 			}
 		}

bosk-core/src/test/java/works/bosk/BoskDiagnosticContextTest.java

@@ -40,7 +40,7 @@ void setupBosk() throws InvalidTypeException {
 	void hookRegistration_propagatesDiagnosticContext() throws IOException, InterruptedException {
 		Semaphore diagnosticsVerified = new Semaphore(0);
 		bosk.driver().flush();
-		try (var __ = bosk.diagnosticContext().withAttribute("attributeName", "attributeValue")) {
+		try (var _ = bosk.diagnosticContext().withAttribute("attributeName", "attributeValue")) {
 			bosk.registerHook("contextPropagatesToHook", bosk.rootReference(), ref -> {
 				assertEquals("attributeValue", bosk.diagnosticContext().getAttribute("attributeName"));
 				assertEquals(MapValue.singleton("attributeName", "attributeValue"), bosk.diagnosticContext().getAttributes());

bosk-core/src/test/java/works/bosk/BoskLocalReferenceTest.java

@@ -18,7 +18,6 @@
 import lombok.experimental.Delegate;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
-import lombok.val;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import works.bosk.annotations.ReferencePath;
@@ -163,7 +162,7 @@ void testListingReference() throws Exception {
 				// Check references to the Listing contents
 				Listing<TestEntity> listing;
 				Map<Identifier, TestEntity> entries;
-				try (val __ = bosk.readContext()) {
+				try (var _ = bosk.readContext()) {
 					listing = listingRef.value();
 					entries = listing.valueMap();
 				}
@@ -206,7 +205,7 @@ void testSideTableReference() throws InvalidTypeException {
 				} catch (AssertionError e) {
 					throw new AssertionError("Failed checkRefence on id " + id + ", sideTableRef " + sideTableRef);
 				}
-				try (val __ = bosk.readContext()) {
+				try (var _ = bosk.readContext()) {
 					for (Entry<Identifier, String> entry: sideTable.idEntrySet()) {
 						Identifier key = entry.getKey();
 						Reference<String> entryRef = sideTableRef.then(key);
@@ -290,7 +289,7 @@ private <T> void checkReferenceProperties(Reference<T> ref, Path expectedPath, T
 		assertEquals(expectedPath.urlEncoded(), ref.pathString());
 
 		assertThrows(IllegalStateException.class, ref::value, "Can't read before ReadContext");
-		try (val __ = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			T actualValue = ref.valueIfExists();
 			assertSame(expectedValue, actualValue);
 
@@ -322,7 +321,7 @@ private void checkEntityReference(Reference<TestEntity> ref, Path expectedPath,
 		assertEquals(expectedPath.then(TestEntity.Fields.listing), ref.then(Listing.class, TestEntity.Fields.listing).path());
 		assertEquals(expectedPath.then(TestEntity.Fields.sideTable), ref.then(SideTable.class, TestEntity.Fields.sideTable).path());
 
-		try (val __ = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			if (expectedValue == null) {
 				assertNull(ref.then(Catalog.class, TestEntity.Fields.catalog).valueIfExists());
 				assertNull(ref.then(Listing.class, TestEntity.Fields.listing).valueIfExists());
@@ -339,33 +338,33 @@ private <T> void checkUpdates(Reference<T> ref, UnaryOperator<T> updater) throws
 		Root originalRoot;
 		T firstValue;
 		assertThrows(IllegalStateException.class, ref::value, "Can't read from Bosk before ReadContext");
-		try (val __ = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			originalRoot = bosk.rootReference().value();
 			firstValue = ref.value();
 		}
 		assertThrows(IllegalStateException.class, ref::value, "Can't read from Bosk between ReadContexts");
 
 		T secondValue = updater.apply(firstValue);
 		T thirdValue = updater.apply(secondValue);
-		try (val __ = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			assertSame(firstValue, ref.value(), "New ReadContext sees same value as before");
 			bosk.driver().submitReplacement(ref, secondValue);
 			assertSame(firstValue, ref.value(), "Bosk updates not visible during the same ReadContext");
 
-			try (val ___ = bosk.supersedingReadContext()) {
+			try (var _ = bosk.supersedingReadContext()) {
 				assertSame(secondValue, ref.value(), "Superseding context sees the latest state");
-				try (val ____ = bosk.readContext()) {
+				try (var _ = bosk.readContext()) {
 					assertSame(secondValue, ref.value(), "Nested context matches outer context");
 				}
 			}
 
-			try (val ___ = bosk.readContext()) {
+			try (var _ = bosk.readContext()) {
 				assertSame(firstValue, ref.value(), "Nested context matches original outer context");
 			}
 		}
 
 		try (
-			val context = bosk.readContext();
+			var context = bosk.readContext();
 		) {
 			assertSame(secondValue, ref.value(), "New value is visible in next ReadContext");
 			bosk.driver().submitReplacement(ref, thirdValue);
@@ -382,13 +381,13 @@ private <T> void checkUpdates(Reference<T> ref, UnaryOperator<T> updater) throws
 						fail("Unexpected exception: ", e);
 					}
 					assertNotNull(caught, "New thread should not have any scope by default, so an exception should be thrown");
-					try (val unrelatedContext = bosk.readContext()) {
+					try (var _ = bosk.readContext()) {
 						assertSame(thirdValue, ref.value(), "Separate thread should see the latest state");
 					}
-					try (val inheritedContext = context.adopt()) {
+					try (var inheritedContext = context.adopt()) {
 						assertSame(secondValue, ref.value(), "Inherited scope should see the same state");
 
-						try (val reinheritedContext = inheritedContext.adopt()) {
+						try (var _ = inheritedContext.adopt()) {
 							// Harmless to re-assert a scope you're already in
 							assertSame(secondValue, ref.value(), "Inner scope should see the same state");
 						}
@@ -408,13 +407,13 @@ private <T> void checkUpdates(Reference<T> ref, UnaryOperator<T> updater) throws
 
 	private <T> void checkDeletion(Reference<T> ref, T expectedValue) {
 		Root originalRoot;
-		try (val __ = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			originalRoot = bosk.rootReference().value();
 			assertSame(expectedValue, ref.valueIfExists(), "Value is present before deletion");
 			bosk.driver().submitDeletion(ref);
 			assertSame(expectedValue, ref.valueIfExists(), "Bosk deletions not visible during the same ReadContext");
 		}
-		try (val __ = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			assertThrows(NonexistentReferenceException.class, ref::value);
 			if (expectedValue != null) {
 				bosk.driver().submitReplacement(ref, expectedValue);

bosk-core/src/test/java/works/bosk/BoskUpdateTest.java

@@ -1,7 +1,6 @@
 package works.bosk;
 
 import java.io.IOException;
-import lombok.val;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import works.bosk.annotations.ReferencePath;
@@ -47,7 +46,7 @@ void createBosk() throws InvalidTypeException {
 			Bosk::simpleDriver
 		);
 		refs = bosk.buildReferences(Refs.class);
-		try (val __ = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			originalRoot = bosk.rootReference().value();
 			originalParent = refs.entity(PARENT_ID).value();
 			originalChild1 = refs.child(PARENT_ID, CHILD_1_ID).value();
@@ -153,7 +152,7 @@ void conditionalReplaceIDMismatchesNonNull_nothingChanged() throws IOException,
 
 	<T> void assertValueEquals(T expected, Reference<T> ref) throws IOException, InterruptedException {
 		bosk.driver().flush();
-		try (val __ = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			assertEquals(expected, ref.valueIfExists());
 		}
 	}

bosk-core/src/test/java/works/bosk/HooksTest.java

@@ -5,7 +5,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
-import lombok.val;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -49,7 +48,7 @@ public interface Refs {
 	void setupBosk() throws InvalidTypeException {
 		bosk = setUpBosk(Bosk::simpleDriver);
 		refs = bosk.rootReference().buildReferences(Refs.class);
-		try (val __ = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			originalRoot = bosk.rootReference().value();
 			originalParent = refs.parent().value();
 			originalChild1 = refs.child(child1).value();
@@ -449,7 +448,7 @@ void nestedMultipleUpdates_breadthFirst() {
 			recorder.events(),
 			"All hooks for an update should be called before any hooks for subsequent updates");
 
-		try (val __ = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			assertEquals(expectedParent, refs.parent().value());
 		}
 	}
@@ -461,7 +460,7 @@ void nested_correctReadContext() {
 		recorder.restart();
 		String expectedString = "expected string";
 
-		try (val __ = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			bosk.driver().submitReplacement(refs.childString(child2), expectedString);
 			// If the hook were to run accidentally in this ReadContext, it would
 			// see originalChild2.string() instead of expectedString.
@@ -473,7 +472,7 @@ void nested_correctReadContext() {
 			"Hooks run in the right ReadContext regardless of active read scope at submission or execution time");
 
 
-		try (val __ = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			assertEquals(expectedString, refs.childString(child2).value(), "Correct value got copied");
 		}
 	}

bosk-core/src/test/java/works/bosk/ListingTest.java

@@ -17,7 +17,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
-import lombok.val;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -107,7 +106,7 @@ public static class TestEntity implements Entity {
 	@ParameterizedTest
 	@ArgumentsSource(ListingArgumentProvider.class)
 	void testGet(Listing<TestEntity> listing, List<TestEntity> children, Bosk<TestEntity> bosk) throws InvalidTypeException {
-		try (val context = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			for (TestEntity child: children) {
 				TestEntity actual = listing.getValue(child.id());
 				assertSame(child, actual, "All expected entities should be present in the Listing");
@@ -129,7 +128,7 @@ void testGet(Listing<TestEntity> listing, List<TestEntity> children, Bosk<TestEn
 	void testValueIterator(Listing<TestEntity> listing, List<TestEntity> children, Bosk<TestEntity> bosk) {
 		Iterator<TestEntity> expected = children.iterator();
 		Iterator<TestEntity> actual;
-		try (val context = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			// ReadContext is needed only when creating the iterator
 			actual = listing.valueIterator();
 		}
@@ -169,7 +168,7 @@ void testIdStream(Listing<TestEntity> listing, List<TestEntity> children, Bosk<T
 	void testStream(Listing<TestEntity> listing, List<TestEntity> children, Bosk<TestEntity> bosk) {
 		Iterator<TestEntity> expected = children.iterator();
 		Stream<TestEntity> stream;
-		try (val context = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			// ReadContext is needed only when creating the stream
 			stream = listing.valueStream();
 		}
@@ -180,7 +179,7 @@ void testStream(Listing<TestEntity> listing, List<TestEntity> children, Bosk<Tes
 	@ArgumentsSource(ListingArgumentProvider.class)
 	void testAsCollection(Listing<TestEntity> listing, List<TestEntity> children, Bosk<TestEntity> bosk) {
 		Collection<TestEntity> actual;
-		try (val context = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			// ReadContext is needed only when creating the collection
 			actual = listing.valueList();
 		}
@@ -208,7 +207,7 @@ void testSpliterator(Listing<TestEntity> listing, List<TestEntity> children, Bos
 		}
 
 		Spliterator<TestEntity> newSplit;
-		try (val context = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			newSplit = listing.values().spliterator();
 		}
 
@@ -257,7 +256,7 @@ void testEmpty() throws InvalidTypeException {
 		assertEquals(0, actual.size());
 
 		Iterator<TestEntity> iterator;
-		try (val context = bosk.readContext()) {
+		try (var _ = bosk.readContext()) {
 			// iterator() needs a ReadContext at creation time
 			iterator = actual.valueIterator();
 		}