Round 2

Author: Absolutionism

src/main/java/ch/njol/skript/test/runner/StructTestSubValidators.java

@@ -11,7 +11,8 @@
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.entry.EntryContainer;
 import org.skriptlang.skript.lang.entry.EntryValidator;
-import org.skriptlang.skript.lang.entry.EntryValidator.EntryValidatorBuilder;
+import org.skriptlang.skript.lang.entry.EntryValidator.SubContainerBuilder;
+import org.skriptlang.skript.lang.entry.SubContainerEntryData;
 import org.skriptlang.skript.lang.script.Script;
 import org.skriptlang.skript.lang.structure.Structure;
 
@@ -23,11 +24,17 @@ public class StructTestSubValidators extends Structure {
 		if (TestMode.ENABLED)
 			Skript.registerStructure(StructTestSubValidators.class,
 				EntryValidator.builder()
-					.addEntryData(new EntryValidatorBuilder("sub validator 1", false)
-						.addSection("sub section", false))
-					.addEntryData(new EntryValidatorBuilder("sub validator 2", false)
-						.addEntryData(new EntryValidatorBuilder("sub sub validator", false)
-							.addSection("sub sub section", false)))
+					.addEntryData(new SubContainerEntryData("sub validator 1", false,
+						new SubContainerBuilder()
+							.addSection("sub section", false)
+					))
+					.addEntryData(new SubContainerEntryData("sub validator 2", false,
+						new SubContainerBuilder()
+							.addEntryData(new SubContainerEntryData("sub sub validator", false,
+								new SubContainerBuilder()
+									.addSection("sub sub section", false)
+							))
+					))
 				.build(),
 				"test sub validators"
 			);

src/main/java/org/skriptlang/skript/lang/entry/EntryValidator.java

@@ -85,8 +85,8 @@ public List<EntryData<?>> getEntryData() {
 			while (iterator.hasNext()) {
 				EntryData<?> data = iterator.next();
 				if (data.canCreateWith(node)) { // Determine if it's a match
-					if (data instanceof EntryValidatorBuilder subValidator) {
-						if (!subValidator.validate((SectionNode) node)) {
+					if (data instanceof SubContainerEntryData subContainer) {
+						if (!subContainer.validate((SectionNode) node)) {
 							ok = false;
 							continue;
 						}
@@ -124,20 +124,14 @@ public List<EntryData<?>> getEntryData() {
 	 * A utility builder for creating an entry validator that can be used to parse and validate a {@link SectionNode}.
 	 * @see EntryValidator#builder()
 	 */
-	public static class EntryValidatorBuilder extends EntryData<EntryContainer> {
+	public static class EntryValidatorBuilder {
 
 		/**
 		 * The default separator used for all {@link KeyValueEntryData}.
 		 */
 		public static final String DEFAULT_ENTRY_SEPARATOR = ": ";
 
-		private EntryValidatorBuilder() {
-			super("", null, false);
-		}
-
-		public EntryValidatorBuilder(String key, boolean optional) {
-			super(key, null, optional);
-		}
+		private EntryValidatorBuilder() { }
 
 		private final List<EntryData<?>> entryData = new ArrayList<>();
 		private String entrySeparator = DEFAULT_ENTRY_SEPARATOR;
@@ -235,8 +229,6 @@ public EntryValidatorBuilder addSection(String key, boolean optional) {
 		 * @return The builder instance.
 		 */
 		public EntryValidatorBuilder addEntryData(EntryData<?> entryData) {
-			if (entryData == this)
-				throw new IllegalArgumentException("Cannot add EntryValidatorBuilder to itself.");
 			this.entryData.add(entryData);
 			return this;
 		}
@@ -250,31 +242,12 @@ public EntryValidator build() {
 			);
 		}
 
-		private EntryContainer entryContainer = null;
-
-		private boolean validate(SectionNode sectionNode) {
-			EntryValidator validator = new EntryValidator(
-				entryData, unexpectedNodeTester, unexpectedEntryMessage, missingRequiredEntryMessage
-			);
-			EntryContainer container = validator.validate(sectionNode);
-			entryContainer = container;
-			return container != null;
-		}
+	}
 
-		@Override
-		public @Nullable EntryContainer getValue(Node node) {
-			return entryContainer;
-		}
+	public static class SubContainerBuilder extends EntryValidatorBuilder {
 
-		@Override
-		public boolean canCreateWith(Node node) {
-			if (!(node instanceof SectionNode))
-				return false;
-			String key = node.getKey();
-			if (key == null)
-				return false;
-			key = ScriptLoader.replaceOptions(key);
-			return getKey().equalsIgnoreCase(key);
+		public SubContainerBuilder() {
+			super();
 		}
 
 	}

src/main/java/org/skriptlang/skript/lang/entry/SubContainerEntryData.java

@@ -0,0 +1,46 @@
+package org.skriptlang.skript.lang.entry;
+
+import ch.njol.skript.ScriptLoader;
+import ch.njol.skript.config.Node;
+import ch.njol.skript.config.SectionNode;
+import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.lang.entry.EntryValidator.EntryValidatorBuilder;
+
+public class SubContainerEntryData extends EntryData<EntryContainer> {
+
+	private final EntryValidator entryValidator;
+	private EntryContainer entryContainer;
+
+	public SubContainerEntryData(String key, boolean optional, EntryValidator entryValidator) {
+		super(key, null, optional);
+		this.entryValidator = entryValidator;
+	}
+
+	public SubContainerEntryData(String key, boolean optional, EntryValidatorBuilder validatorBuilder) {
+		super(key, null, optional);
+		this.entryValidator = validatorBuilder.build();
+	}
+
+	public boolean validate(SectionNode sectionNode) {
+		EntryContainer container = entryValidator.validate(sectionNode);
+		entryContainer = container;
+		return container != null;
+	}
+
+	@Override
+	public @Nullable EntryContainer getValue(Node node) {
+		return entryContainer;
+	}
+
+	@Override
+	public boolean canCreateWith(Node node) {
+		if (!(node instanceof SectionNode))
+			return false;
+		String key = node.getKey();
+		if (key == null)
+			return false;
+		key = ScriptLoader.replaceOptions(key);
+		return getKey().equalsIgnoreCase(key);
+	}
+
+}