Merge pull request boskworks#170 from prdoyle/mucho-cleanup

Lots of minor cleanup

Author: prdoyle

README.md

@@ -171,11 +171,6 @@ provide integrations with other technologies.
 
 The subprojects are listed in [settings.gradle](settings.gradle), and each has its own `README.md` describing what it is.
 
-### Gradle setup
-
-Each project has its own `build.gradle`.
-Common settings across projects are in custom plugins under the [buildSrc directory](buildSrc/src/main/groovy).
-
 ### Versioning
 
 In the long run, we'll use the usual semantic versioning.

bosk-core/src/main/java/works/bosk/BoskDriver.java

@@ -4,7 +4,6 @@
 import java.lang.reflect.Type;
 import works.bosk.drivers.ForwardingDriver;
 import works.bosk.exceptions.FlushFailureException;
-import works.bosk.exceptions.InitializationFailureException;
 import works.bosk.exceptions.InvalidTypeException;
 
 /**
@@ -43,8 +42,6 @@ public interface BoskDriver {
 	 * an initial root. Such a driver cannot be used on its own to initialize a Bosk,
 	 * but it can be used downstream of a {@link ForwardingDriver} provided there is
 	 * another downstream driver that can provide the initial root instead.
-	 *
-	 * @see InitializationFailureException
 	 */
 	StateTreeNode initialRoot(Type rootType) throws InvalidTypeException, IOException, InterruptedException;
 

bosk-core/src/main/java/works/bosk/Catalog.java

@@ -1,6 +1,5 @@
 package works.bosk;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -14,7 +13,6 @@
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableCollection;
-import static java.util.Collections.unmodifiableList;
 import static java.util.Collections.unmodifiableMap;
 import static java.util.LinkedHashMap.newLinkedHashMap;
 import static java.util.Objects.requireNonNull;
@@ -52,7 +50,7 @@ public E get(Identifier key) {
 
 	@Override
 	public List<Identifier> ids() {
-		return unmodifiableList(new ArrayList<>(contents.keySet()));
+		return List.copyOf(contents.keySet());
 	}
 
 	/**

bosk-core/src/main/java/works/bosk/Listing.java

@@ -120,7 +120,7 @@ public Listing<E> withoutEntity(E entity) {
 	@Override
 	public Iterator<Reference<E>> iterator() {
 		Iterator<Identifier> idIter = ids.iterator();
-		return new Iterator<Reference<E>>() {
+		return new Iterator<>() {
 			@Override
 			public boolean hasNext() {
 				return idIter.hasNext();
@@ -170,7 +170,7 @@ public Iterable<E> values() {
 		// we know a Listing qualifies for Spliterator.IMMUTABLE. And let's give
 		// a nice toString too, for debugging.
 		AddressableByIdentifier<E> domain = this.domain.value();
-		return new Iterable<E>() {
+		return new Iterable<>() {
 			@Override
 			public Iterator<E> iterator() {
 				return valueIteratorImpl(domain);
@@ -183,7 +183,7 @@ public Spliterator<E> spliterator() {
 
 			@Override
 			public String toString() {
-				return StreamSupport.stream(spliterator(), false).collect(toList()).toString();
+				return StreamSupport.stream(spliterator(), false).toList().toString();
 			}
 		};
 	}
@@ -248,9 +248,16 @@ public Listing<E> filteredBy(Listing<E> other) {
 
 	private Iterator<E> valueIteratorImpl(AddressableByIdentifier<E> domain) {
 		Iterator<Identifier> iter = ids.iterator();
-		return new Iterator<E>() {
-			@Override public boolean hasNext() { return iter.hasNext(); }
-			@Override public E next() { return getOrThrow(domain, iter.next()); }
+		return new Iterator<>() {
+			@Override
+			public boolean hasNext() {
+				return iter.hasNext();
+			}
+
+			@Override
+			public E next() {
+				return getOrThrow(domain, iter.next());
+			}
 		};
 	}
 

bosk-core/src/main/java/works/bosk/Path.java

@@ -149,10 +149,10 @@ public final Path then(String... segments) {
 	 * @throws MalformedPathException if <code>segments</code> contains an invalid path segment.
 	 */
 	public final Path then(List<String> segments) {
-		if (segments.size() == 0) {
+		if (segments.isEmpty()) {
 			return this;
 		} else {
-			String firstSegment = validSegment(segments.get(0));
+			String firstSegment = validSegment(segments.getFirst());
 			if (isParameterSegment(firstSegment)) {
 				if (segmentStream().anyMatch(firstSegment::equals)) {
 					throw new MalformedPathException("Duplicate path parameter \"" + firstSegment + "\"");
@@ -372,7 +372,7 @@ public static boolean isParameterSegment(String segment) {
 	}
 
 	public static boolean isValidParameterName(String name) {
-		if (name.length() == 0) {
+		if (name.isEmpty()) {
 			return false;
 		} else if (!isValidFirstCharacter(name.codePointAt(0))) {
 			return false;

bosk-core/src/main/java/works/bosk/ReferenceUtils.java

@@ -180,18 +180,7 @@ public static Type parameterType(Type parameterizedType, Class<?> genericClass,
 			// interfaces must have consistent types, so any occurrence of the
 			// interface will serve.
 			//
-			Type supertype = actualClass.getGenericSuperclass();
-			if (supertype == null || !genericClass.isAssignableFrom(rawClass(supertype))) {
-				// Must come from interface inheritance
-				supertype = null; // Help catch errors
-				for (Type candidate: actualClass.getGenericInterfaces()) {
-					if (genericClass.isAssignableFrom(rawClass(candidate))) {
-						supertype = candidate;
-						break;
-					}
-				}
-				assert supertype != null: "If genericClass isAssignableFrom actualClass, and they're not equal, then it must be assignable from something actualClass inherits";
-			}
+			Type supertype = lowestCompatibleSupertype(genericClass, actualClass);
 
 			// Recurse with supertype
 			Type returned = parameterType(supertype, genericClass, index);
@@ -203,6 +192,22 @@ public static Type parameterType(Type parameterizedType, Class<?> genericClass,
 		}
 	}
 
+	private static Type lowestCompatibleSupertype(Class<?> requiredSupertype, Class<?> givenClass) {
+		Type supertype = givenClass.getGenericSuperclass();
+		if (supertype == null || !requiredSupertype.isAssignableFrom(rawClass(supertype))) {
+			// Must come from interface inheritance
+			supertype = null; // Help catch errors
+			for (Type candidate: givenClass.getGenericInterfaces()) {
+				if (requiredSupertype.isAssignableFrom(rawClass(candidate))) {
+					supertype = candidate;
+					break;
+				}
+			}
+			assert supertype != null: "If requiredSupertype isAssignableFrom givenClass, and they're not equal, then it must be assignable from something givenClass inherits";
+		}
+		return supertype;
+	}
+
 	/**
 	 * @param typeWithVariables a {@link Type} that may or may not contain references to {@link TypeVariable}s.
 	 * @param environmentType the type that defines what those variables mean
@@ -244,10 +249,6 @@ public static Class<?> rawClass(Type sourceType) {
 		}
 	}
 
-	public static Type referenceTypeFor(Type targetType) {
-		return Types.parameterizedType(Reference.class, targetType);
-	}
-
 	public static Method getterMethod(Class<?> objectClass, String fieldName) throws InvalidTypeException {
 		String methodName = fieldName; // fluent
 		for (Class<?> c = objectClass; c != Object.class; c = c.getSuperclass()) {
@@ -283,7 +284,7 @@ public static <T> Constructor<T> theOnlyConstructorFor(Class<T> nodeClass) {
 			throw new IllegalArgumentException("Ambiguous constructor list for " + nodeClass.getSimpleName() + ": " + constructors);
 		}
 		@SuppressWarnings("unchecked")
-		Constructor<T> theConstructor = (Constructor<T>) constructors.get(0);
+		Constructor<T> theConstructor = (Constructor<T>) constructors.getFirst();
 		return theConstructor;
 	}
 

bosk-core/src/main/java/works/bosk/SideTable.java

@@ -1,7 +1,6 @@
 package works.bosk;
 
 import java.util.AbstractMap.SimpleImmutableEntry;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -21,7 +20,6 @@
 import org.pcollections.OrderedPMap;
 import org.pcollections.OrderedPSet;
 
-import static java.util.Collections.unmodifiableList;
 import static java.util.Objects.requireNonNull;
 
 @EqualsAndHashCode
@@ -39,7 +37,7 @@ public final class SideTable<K extends Entity, V> implements EnumerableByIdentif
 
 	public boolean isEmpty() { return valuesById.isEmpty(); }
 	public int size() { return valuesById.size(); }
-	public List<Identifier> ids() { return unmodifiableList(new ArrayList<>(valuesById.keySet())); }
+	public List<Identifier> ids() { return List.copyOf(valuesById.keySet()); }
 	public Listing<K> keys() { return new Listing<>(domain, OrderedPSet.from(valuesById.keySet())); }
 	public Collection<V> values() { return valuesById.values(); }
 	public Set<Entry<Identifier, V>> idEntrySet() { return valuesById.entrySet(); }

bosk-core/src/main/java/works/bosk/exceptions/InitializationFailureException.java

@@ -13,7 +13,6 @@
 import works.bosk.SideTableReference;
 import works.bosk.TaggedUnion;
 import works.bosk.VariantCase;
-import works.bosk.exceptions.InvalidTypeException;
 
 /**
  * An imperfect, non-idiomatic way to describe complex parameterized types.
@@ -64,7 +63,7 @@ public static <V> Class<MapValue<V>> mapValue(Class<V> valueClass) {
 		return (Class)MapValue.class;
 	}
 
-	public static <V extends VariantCase> Class<TaggedUnion<V>> taggedUnion(Class<V> variantCaseClass, String... segments) throws InvalidTypeException {
+	public static <V extends VariantCase> Class<TaggedUnion<V>> taggedUnion(Class<V> variantCaseClass, String... segments) {
 		return (Class)TaggedUnion.class;
 	}
 }