#112: A bit of clean up in ExtensionPointSorter

Author: jlink

junit5-api/src/main/java/org/junit/gen5/api/extension/ExtensionPointRegistry.java

@@ -10,6 +10,11 @@
 
 package org.junit.gen5.api.extension;
 
+import java.lang.reflect.Field;
+import java.util.Optional;
+
+import org.junit.gen5.commons.util.ReflectionUtils;
+
 import static org.junit.gen5.commons.meta.API.Usage.Experimental;
 
 import org.junit.gen5.commons.meta.API;
@@ -108,6 +113,17 @@ enum ApplicationOrder {
 	 */
 	static class Position {
 
+		public static <T extends ExtensionPoint> Position[] getAllowedPositionsFor(Class<T> extensionPointType) {
+			Optional<Field> allowedPositionsField = ReflectionUtils.findField(extensionPointType, "ALLOWED_POSITIONS");
+
+			Position[] positions = new Position[] { Position.DEFAULT };
+			if (allowedPositionsField.isPresent()) {
+				//TODO: Check for correct type of field etc.
+				positions = (Position[]) ReflectionUtils.getFieldValue(allowedPositionsField.get(), null);
+			}
+			return positions;
+		}
+
 		/**
 		 * Apply first.
 		 *
@@ -117,7 +133,7 @@ static class Position {
 		 */
 		public static Position OUTERMOST = new Position(1, true);
 
-		public static Position FIRST = OUTERMOST;
+		public static Position FIRST = new Position(1, true);
 
 		/**
 		 * Apply after {@link #OUTERMOST} but before {@link #DEFAULT},
@@ -141,7 +157,7 @@ static class Position {
 		// TODO Document INNERMOST position.
 		public static Position INNERMOST = new Position(5, true);
 
-		public static Position LAST = INNERMOST;
+		public static Position LAST = new Position(5, true);
 
 		private final int ordinalValue;
 

junit5-engine/src/main/java/org/junit/gen5/engine/junit5/extension/ExtensionPointSorter.java

@@ -10,17 +10,14 @@
 
 package org.junit.gen5.engine.junit5.extension;
 
-import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.junit.gen5.api.extension.ExtensionConfigurationException;
 import org.junit.gen5.api.extension.ExtensionPoint;
 import org.junit.gen5.api.extension.ExtensionPointRegistry.Position;
-import org.junit.gen5.commons.util.ReflectionUtils;
 
 /**
  * Utility for sorting {@linkplain RegisteredExtensionPoint extension points}
@@ -52,15 +49,9 @@ public <T extends ExtensionPoint> void sort(Class<T> extensionPointType,
 	}
 
 	private <T extends ExtensionPoint> List<Position> getUniquePositions(Class<T> extensionPointType) {
-		Optional<Field> allowedPositionsField = ReflectionUtils.findField(extensionPointType, "ALLOWED_POSITIONS");
+		Position[] positions = Position.getAllowedPositionsFor(extensionPointType);
 
-		if (allowedPositionsField.isPresent()) {
-			//TODO: Check for correct type of field etc.
-			Position[] positions = (Position[]) ReflectionUtils.getFieldValue(allowedPositionsField.get(), null);
-			return Arrays.stream(positions).filter(position -> position.shouldBeUnique()).collect(Collectors.toList());
-		}
-
-		return Arrays.asList();
+		return Arrays.stream(positions).filter(Position::shouldBeUnique).collect(Collectors.toList());
 	}
 
 	private <T extends ExtensionPoint> void checkPositionUnique(

junit5-engine/src/main/java/org/junit/gen5/engine/junit5/extension/ExtensionRegistry.java

@@ -184,6 +184,9 @@ public void registerExtensionPoint(ExtensionPoint extension, Object source) {
 	private void registerExtensionPoint(ExtensionPoint extension, Object source, Position position) {
 		LOG.finer(() -> String.format("Registering extension point [%s] from source [%s] with position [%s].",
 			extension, source, position));
+
+		//TODO: Check if position is allowed for the current ExtensionPoint
+
 		this.registeredExtensionPoints.add(new RegisteredExtensionPoint<>(extension, source, position));
 	}