spotlessApply

prdoyle · prdoyle · commit 89d698e2ef87 · 2026-02-03T23:01:36.000-05:00
diff --git a/boson/src/main/java/works/bosk/boson/codec/Token.java b/boson/src/main/java/works/bosk/boson/codec/Token.java
@@ -53,9 +53,9 @@ public static Token startingWith(int codePoint) {
 	public boolean hasFixedRepresentation() {
 		return switch (this) {
 			case END_TEXT,
-				 NULL, FALSE, TRUE,
-				 START_OBJECT, END_OBJECT, START_ARRAY, END_ARRAY,
-				 COMMA, COLON ->
+				NULL, FALSE, TRUE,
+				START_OBJECT, END_OBJECT, START_ARRAY, END_ARRAY,
+				COMMA, COLON ->
 				true;
 			default ->
 				false;
diff --git a/boson/src/main/java/works/bosk/boson/codec/interpreter/SpecInterpretingGenerator.java b/boson/src/main/java/works/bosk/boson/codec/interpreter/SpecInterpretingGenerator.java
@@ -16,13 +16,13 @@
 import works.bosk.boson.mapping.spec.BoxedPrimitiveSpec;
 import works.bosk.boson.mapping.spec.ComputedSpec;
 import works.bosk.boson.mapping.spec.EnumByNameNode;
-import works.bosk.boson.mapping.spec.RecognizedMember;
 import works.bosk.boson.mapping.spec.FixedObjectNode;
 import works.bosk.boson.mapping.spec.JsonValueSpec;
 import works.bosk.boson.mapping.spec.MaybeAbsentSpec;
 import works.bosk.boson.mapping.spec.MaybeNullSpec;
 import works.bosk.boson.mapping.spec.ParseCallbackSpec;
 import works.bosk.boson.mapping.spec.PrimitiveNumberNode;
+import works.bosk.boson.mapping.spec.RecognizedMember;
 import works.bosk.boson.mapping.spec.RepresentAsSpec;
 import works.bosk.boson.mapping.spec.StringNode;
 import works.bosk.boson.mapping.spec.TypeRefNode;
@@ -75,9 +75,9 @@ public void generateAny(JsonValueSpec spec, Object value) {
 			try {
 				switch (spec) {
 					case BigNumberNode _,
-						 BooleanNode _,
-						 BoxedPrimitiveSpec _,
-						 PrimitiveNumberNode _ -> out.print(value);
+						BooleanNode _,
+						BoxedPrimitiveSpec _,
+						PrimitiveNumberNode _ -> out.print(value);
 
 					case EnumByNameNode _ -> generateEnumByName(value);
 					case ArrayNode node -> generateArray(node, value);
@@ -158,10 +158,10 @@ private void generateUniformMap(UniformMapNode node, Object value) {
 				// For-loop form
 				assert next.parameterTypes().size() == 2;
 				for (var iter = start.invoke(value);
-					 Boolean.TRUE.equals((hasNext.parameterTypes().size() == 1)
-						 ? hasNext.invoke(iter)
-						 : hasNext.invoke(iter, value));
-					 iter = next.invoke(iter, value)
+					Boolean.TRUE.equals((hasNext.parameterTypes().size() == 1)
+						? hasNext.invoke(iter)
+						: hasNext.invoke(iter, value));
+					iter = next.invoke(iter, value)
 				) {
 					var memberKey = (getKey.parameterTypes().size() == 1)
 						? getKey.invoke(iter)
diff --git a/boson/src/main/java/works/bosk/boson/codec/interpreter/SpecInterpretingParser.java b/boson/src/main/java/works/bosk/boson/codec/interpreter/SpecInterpretingParser.java
@@ -28,13 +28,13 @@
 import works.bosk.boson.mapping.spec.BoxedPrimitiveSpec;
 import works.bosk.boson.mapping.spec.ComputedSpec;
 import works.bosk.boson.mapping.spec.EnumByNameNode;
-import works.bosk.boson.mapping.spec.RecognizedMember;
 import works.bosk.boson.mapping.spec.FixedObjectNode;
 import works.bosk.boson.mapping.spec.JsonValueSpec;
 import works.bosk.boson.mapping.spec.MaybeAbsentSpec;
 import works.bosk.boson.mapping.spec.MaybeNullSpec;
 import works.bosk.boson.mapping.spec.ParseCallbackSpec;
 import works.bosk.boson.mapping.spec.PrimitiveNumberNode;
+import works.bosk.boson.mapping.spec.RecognizedMember;
 import works.bosk.boson.mapping.spec.RepresentAsSpec;
 import works.bosk.boson.mapping.spec.ScalarSpec;
 import works.bosk.boson.mapping.spec.SpecNode;
diff --git a/boson/src/main/java/works/bosk/boson/codec/io/SharedParserRuntime.java b/boson/src/main/java/works/bosk/boson/codec/io/SharedParserRuntime.java
@@ -235,7 +235,7 @@ protected final void logEntry(String methodName) {
 			}
 		}
 	}
-	
+
 	protected final void logEntry(String methodName, Object arg) {
 		if (false) {
 			if (LOGGER.isTraceEnabled()) {
@@ -244,7 +244,7 @@ protected final void logEntry(String methodName, Object arg) {
 			assert !(arg instanceof JsonValueSpec) : "Why are we passing SpecNodes here instead of in the interpreter?";
 		}
 	}
-	
+
 	private static final Logger LOGGER = LoggerFactory.getLogger(SharedParserRuntime.class);
 
 }
diff --git a/boson/src/main/java/works/bosk/boson/mapping/TypeScanner.java b/boson/src/main/java/works/bosk/boson/mapping/TypeScanner.java
@@ -29,13 +29,13 @@
 import works.bosk.boson.mapping.spec.BoxedPrimitiveSpec;
 import works.bosk.boson.mapping.spec.ComputedSpec;
 import works.bosk.boson.mapping.spec.EnumByNameNode;
-import works.bosk.boson.mapping.spec.RecognizedMember;
 import works.bosk.boson.mapping.spec.FixedObjectNode;
 import works.bosk.boson.mapping.spec.JsonValueSpec;
 import works.bosk.boson.mapping.spec.MaybeAbsentSpec;
 import works.bosk.boson.mapping.spec.MaybeNullSpec;
 import works.bosk.boson.mapping.spec.ParseCallbackSpec;
 import works.bosk.boson.mapping.spec.PrimitiveNumberNode;
+import works.bosk.boson.mapping.spec.RecognizedMember;
 import works.bosk.boson.mapping.spec.RepresentAsSpec;
 import works.bosk.boson.mapping.spec.ScalarSpec;
 import works.bosk.boson.mapping.spec.SpecNode;
diff --git a/boson/src/main/java/works/bosk/boson/mapping/opt/InlineScalarRefs.java b/boson/src/main/java/works/bosk/boson/mapping/opt/InlineScalarRefs.java
@@ -12,13 +12,13 @@
 import works.bosk.boson.mapping.spec.ArrayNode;
 import works.bosk.boson.mapping.spec.ArraySpec;
 import works.bosk.boson.mapping.spec.ComputedSpec;
-import works.bosk.boson.mapping.spec.RecognizedMember;
 import works.bosk.boson.mapping.spec.FixedObjectNode;
 import works.bosk.boson.mapping.spec.JsonValueSpec;
 import works.bosk.boson.mapping.spec.MaybeAbsentSpec;
 import works.bosk.boson.mapping.spec.MaybeNullSpec;
 import works.bosk.boson.mapping.spec.ObjectSpec;
 import works.bosk.boson.mapping.spec.ParseCallbackSpec;
+import works.bosk.boson.mapping.spec.RecognizedMember;
 import works.bosk.boson.mapping.spec.RepresentAsSpec;
 import works.bosk.boson.mapping.spec.ScalarSpec;
 import works.bosk.boson.mapping.spec.SpecNode;
diff --git a/boson/src/test/java/works/bosk/boson/codec/CodecHappyParseTest.java b/boson/src/test/java/works/bosk/boson/codec/CodecHappyParseTest.java
@@ -23,12 +23,12 @@
 import works.bosk.boson.mapping.spec.BoxedPrimitiveSpec;
 import works.bosk.boson.mapping.spec.ComputedSpec;
 import works.bosk.boson.mapping.spec.EnumByNameNode;
-import works.bosk.boson.mapping.spec.RecognizedMember;
 import works.bosk.boson.mapping.spec.FixedObjectNode;
 import works.bosk.boson.mapping.spec.MaybeAbsentSpec;
 import works.bosk.boson.mapping.spec.MaybeNullSpec;
 import works.bosk.boson.mapping.spec.ParseCallbackSpec;
 import works.bosk.boson.mapping.spec.PrimitiveNumberNode;
+import works.bosk.boson.mapping.spec.RecognizedMember;
 import works.bosk.boson.mapping.spec.RepresentAsSpec;
 import works.bosk.boson.mapping.spec.StringNode;
 import works.bosk.boson.mapping.spec.UniformMapNode;
diff --git a/boson/src/test/java/works/bosk/boson/codec/RoundTripTest.java b/boson/src/test/java/works/bosk/boson/codec/RoundTripTest.java
@@ -23,12 +23,12 @@
 import works.bosk.boson.mapping.spec.BoxedPrimitiveSpec;
 import works.bosk.boson.mapping.spec.ComputedSpec;
 import works.bosk.boson.mapping.spec.EnumByNameNode;
-import works.bosk.boson.mapping.spec.RecognizedMember;
 import works.bosk.boson.mapping.spec.FixedObjectNode;
 import works.bosk.boson.mapping.spec.JsonValueSpec;
 import works.bosk.boson.mapping.spec.MaybeAbsentSpec;
 import works.bosk.boson.mapping.spec.MaybeNullSpec;
 import works.bosk.boson.mapping.spec.PrimitiveNumberNode;
+import works.bosk.boson.mapping.spec.RecognizedMember;
 import works.bosk.boson.mapping.spec.RepresentAsSpec;
 import works.bosk.boson.mapping.spec.StringNode;
 import works.bosk.boson.mapping.spec.UniformMapNode;
diff --git a/boson/src/test/java/works/bosk/boson/codec/compiler/SpecCompilerTest.java b/boson/src/test/java/works/bosk/boson/codec/compiler/SpecCompilerTest.java
@@ -14,8 +14,8 @@
 import works.bosk.boson.mapping.TypeMap;
 import works.bosk.boson.mapping.TypeScanner;
 import works.bosk.boson.mapping.spec.ComputedSpec;
-import works.bosk.boson.mapping.spec.RecognizedMember;
 import works.bosk.boson.mapping.spec.MaybeAbsentSpec;
+import works.bosk.boson.mapping.spec.RecognizedMember;
 import works.bosk.boson.mapping.spec.StringNode;
 import works.bosk.boson.mapping.spec.TypeRefNode;
 import works.bosk.boson.mapping.spec.handles.MemberPresenceCondition;
diff --git a/boson/src/test/java/works/bosk/boson/mapping/opt/InlineScalarRefsTest.java b/boson/src/test/java/works/bosk/boson/mapping/opt/InlineScalarRefsTest.java
@@ -12,9 +12,9 @@
 import works.bosk.boson.mapping.TypeScanner;
 import works.bosk.boson.mapping.spec.ArrayNode;
 import works.bosk.boson.mapping.spec.BoxedPrimitiveSpec;
-import works.bosk.boson.mapping.spec.RecognizedMember;
 import works.bosk.boson.mapping.spec.FixedObjectNode;
 import works.bosk.boson.mapping.spec.PrimitiveNumberNode;
+import works.bosk.boson.mapping.spec.RecognizedMember;
 import works.bosk.boson.mapping.spec.StringNode;
 import works.bosk.boson.mapping.spec.TypeRefNode;
 import works.bosk.boson.mapping.spec.UniformMapNode;
diff --git a/boson/src/test/java/works/bosk/boson/types/DataTypeConformanceTest.java b/boson/src/test/java/works/bosk/boson/types/DataTypeConformanceTest.java
@@ -424,10 +424,10 @@ void arrayCovariance() {
 			.isBindableFrom(DataType.of(Object[].class)));
 
 		assertTrue(new LowerBoundedWildcardType(DataType.of(String[].class))
-			.isAssignableFrom(OBJECT),
+				.isAssignableFrom(OBJECT),
 			"Object conforms to ? super String[]");
 		assertTrue(new LowerBoundedWildcardType(DataType.of(String[].class))
-				.isBindableFrom(OBJECT));
+			.isBindableFrom(OBJECT));
 	}
 
 	@Test
@@ -493,23 +493,23 @@ void parameterTypeMappingThroughInheritance() {
 
 	@Test
 	<T> void arrayOfUnboundedVariable() {
-	    var arrayOfT = DataType.of(new TypeReference<T[]>() { });
+		var arrayOfT = DataType.of(new TypeReference<T[]>() { });
 		DataType arrayOfString = DataType.of(String[].class);
 		assertFalse(arrayOfT.isAssignableFrom(arrayOfString));
-	    assertTrue(arrayOfT.isBindableFrom(arrayOfString));
+		assertTrue(arrayOfT.isBindableFrom(arrayOfString));
 	}
 
 	@Test
 	<T extends CharSequence> void arrayOfBoundedVariable() {
-	    var arrayOfT = DataType.of(new TypeReference<T[]>() { });
+		var arrayOfT = DataType.of(new TypeReference<T[]>() { });
 
 		DataType arrayOfString = DataType.of(String[].class);
-	    assertFalse(arrayOfT.isAssignableFrom(arrayOfString));
-	    assertTrue(arrayOfT.isBindableFrom(arrayOfString));
+		assertFalse(arrayOfT.isAssignableFrom(arrayOfString));
+		assertTrue(arrayOfT.isBindableFrom(arrayOfString));
 
 		DataType arrayOfObject = DataType.of(Object[].class);
-	    assertFalse(arrayOfT.isAssignableFrom(arrayOfObject));
-	    assertFalse(arrayOfT.isBindableFrom(arrayOfObject));
+		assertFalse(arrayOfT.isAssignableFrom(arrayOfObject));
+		assertFalse(arrayOfT.isBindableFrom(arrayOfObject));
 	}
 
 	@Test
@@ -582,7 +582,7 @@ void arrayOfLowerBoundedWildcard() {
 
 		var arrayOfString = DataType.of(new TypeReference<String[]>() { });
 		assertTrue(arrayOfWildcard
-			.isAssignableFrom(arrayOfString),
+				.isAssignableFrom(arrayOfString),
 			"Arrays are covariant, so the lower bound is not relevant");
 		assertFalse(arrayOfWildcard
 			.isBindableFrom(arrayOfString));
@@ -606,16 +606,16 @@ void rightErasedTypeMatches() {
 
 	@Test
 	<T> void invariantListWithTypeVariable() {
-	    var listT = DataType.of(new TypeReference<List<T>>() { });
-	    var listString = DataType.of(new TypeReference<List<String>>() { });
+		var listT = DataType.of(new TypeReference<List<T>>() { });
+		var listString = DataType.of(new TypeReference<List<String>>() { });
 
-	    // Assignment to a variable of type List<T> should NOT accept List<String>
-	    assertFalse(listT.isAssignableFrom(listString),
-	      "List<T>.isAssignableFrom(List<String>) must be false (invariant for parameterized types)");
+		// Assignment to a variable of type List<T> should NOT accept List<String>
+		assertFalse(listT.isAssignableFrom(listString),
+			"List<T>.isAssignableFrom(List<String>) must be false (invariant for parameterized types)");
 
-	    // But type-argument conformance (passing List<String> as a type-argument to List<T>) remains true
-	    assertTrue(listT.isBindableFrom(listString),
-	      "List<T>.isBindableFrom(List<String>) should be true (type-argument/bounds semantics)");
+		// But type-argument conformance (passing List<String> as a type-argument to List<T>) remains true
+		assertTrue(listT.isBindableFrom(listString),
+			"List<T>.isBindableFrom(List<String>) should be true (type-argument/bounds semantics)");
 	}
 
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ protected final void logEntry(String methodName) {`
`235`	`235`	`}`
`236`	`236`	`}`
`237`	`237`	`}`
`238`		`-`
	`238`	`+`
`239`	`239`	`protected final void logEntry(String methodName, Object arg) {`
`240`	`240`	`if (false) {`
`241`	`241`	`if (LOGGER.isTraceEnabled()) {`
`@@ -244,7 +244,7 @@ protected final void logEntry(String methodName, Object arg) {`
`244`	`244`	`assert !(arg instanceof JsonValueSpec) : "Why are we passing SpecNodes here instead of in the interpreter?";`
`245`	`245`	`}`
`246`	`246`	`}`
`247`		`-`
	`247`	`+`
`248`	`248`	`private static final Logger LOGGER = LoggerFactory.getLogger(SharedParserRuntime.class);`
`249`	`249`
`250`	`250`	`}`