Refactor: remove HookScanner dependency on Bosk

Author: prdoyle

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

@@ -640,7 +640,7 @@ private <T> void localRegisterHook(String name, @NotNull Reference<T> scope, @No
 	}
 
 	public void registerHooks(Object receiver) throws InvalidTypeException {
-		HookScanner.registerHooks(receiver, this);
+		HookScanner.registerHooks(receiver, this.rootReference(), this.hookRegistrar());
 	}
 
 	@Override

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

@@ -21,7 +21,7 @@
  * Finds methods annotated with {@link Hook} in the given {@code object} and registers them in the given {@link Bosk}.
  */
 final class HookScanner {
-	static <T> void registerHooks(T receiverObject, Bosk<?> bosk) throws InvalidTypeException {
+	static <T> void registerHooks(T receiverObject, RootReference<?> rootReference, HookRegistrar hookRegistrar) throws InvalidTypeException {
 		int hookCounter = 0;
 		for (
 			Class<?> receiverClass = receiverObject.getClass();
@@ -40,7 +40,7 @@ static <T> void registerHooks(T receiverObject, Bosk<?> bosk) throws InvalidType
 				}
 
 				try {
-					registerOneHookMethod(receiverObject, bosk, method, Path.parseParameterized(hookAnnotation.value()));
+					registerOneHookMethod(receiverObject, method, Path.parseParameterized(hookAnnotation.value()), rootReference, hookRegistrar);
 					hookCounter++;
 				} catch (InvalidTypeException e) {
 					throw new InvalidTypeException("Unable to register hook method " + receiverClass.getSimpleName() + "." + method.getName() + ": " + e.getMessage(), e);
@@ -54,23 +54,23 @@ static <T> void registerHooks(T receiverObject, Bosk<?> bosk) throws InvalidType
 		}
 	}
 
-	private static <T> void registerOneHookMethod(T receiverObject, Bosk<?> bosk, Method method, Path path) throws InvalidTypeException {
-		Reference<?> plainRef = bosk.rootReference().then(Object.class, path);
+	private static <T> void registerOneHookMethod(T receiverObject, Method method, Path path, RootReference<?> rootReference, HookRegistrar hookRegistrar) throws InvalidTypeException {
+		Reference<?> plainRef = rootReference.then(Object.class, path);
 
 		// Now substitute one of the handy Reference subtypes where possible
 		Reference<?> scope;
 		if (Catalog.class.isAssignableFrom(plainRef.targetClass())) {
-			scope = bosk.rootReference().thenCatalog(Entity.class, path);
+			scope = rootReference.thenCatalog(Entity.class, path);
 		} else if (Listing.class.isAssignableFrom(plainRef.targetClass())) {
-			scope = bosk.rootReference().thenListing(Entity.class, path);
+			scope = rootReference.thenListing(Entity.class, path);
 		} else if (SideTable.class.isAssignableFrom(plainRef.targetClass())) {
-			scope = bosk.rootReference().thenSideTable(Entity.class, Object.class, path);
+			scope = rootReference.thenSideTable(Entity.class, Object.class, path);
 		} else {
 			scope = plainRef;
 		}
 
 		List<Function<Reference<?>, Object>> argumentFunctions = new ArrayList<>(method.getParameterCount());
-		argumentFunctions.add(ref -> receiverObject); // The "this" pointer
+		argumentFunctions.add(_ -> receiverObject); // The "this" pointer
 		for (Parameter p : method.getParameters()) {
 			if (Reference.class.isAssignableFrom(p.getType())) {
 				Type referenceType = ReferenceUtils.parameterType(p.getParameterizedType(), Reference.class, 0);
@@ -92,7 +92,7 @@ private static <T> void registerOneHookMethod(T receiverObject, Bosk<?> bosk, Me
 		} catch (IllegalAccessException e) {
 			throw new IllegalArgumentException(e);
 		}
-		bosk.hookRegistrar().registerHook(method.getName(), scope, ref -> {
+		hookRegistrar.registerHook(method.getName(), scope, ref -> {
 			try {
 				List<Object> arguments = new ArrayList<>(argumentFunctions.size());
 				argumentFunctions.forEach(f -> arguments.add(f.apply(ref)));
@@ -103,5 +103,7 @@ private static <T> void registerOneHookMethod(T receiverObject, Bosk<?> bosk, Me
 		});
 	}
 
+	private HookScanner() {}
+
 	private static final Logger LOGGER = LoggerFactory.getLogger(HookScanner.class);
 }