When referencing to a variable number of elements, always use the plural form of a type (e.g. actual must contain X entries even if X is one).

Author: cowwoc

LICENSE-3RD-PARTY.md

@@ -7,6 +7,7 @@
     * [core](https://github.com/cowwoc/pouch/core/)
     * [annotation](https://github.com/cowwoc/requirements.java/annotation/)
     * [guava](https://github.com/cowwoc/requirements.java/guava/)
+    * [jackson](https://github.com/cowwoc/requirements.java/jackson/)
     * [java](https://github.com/cowwoc/requirements.java/java/)
     * [FindBugs-jsr305](http://findbugs.sourceforge.net/)
     * [error-prone annotations](https://errorprone.info/error_prone_annotations)

docs/Changelog.md

@@ -2,6 +2,12 @@
 
 See https://github.com/cowwoc/requirements.java/commits/master for a full list.
 
+## Version 10.1 - ?
+
+* Improvements
+    * When referencing to a variable number of elements, always use the plural form of a type (e.g.
+      `actual must contain X entries` even if `X` is one).
+
 ## Version 10.0 - 2024/10/31
 
 * Breaking changes:

java/src/main/java/com/github/cowwoc/requirements10/java/internal/message/CollectionMessages.java

@@ -44,7 +44,7 @@ public static MessageBuilder containsSizeFailed(AbstractObjectValidator<?, ?> va
 		String name = validator.getName();
 		MessageBuilder messageBuilder = new MessageBuilder(validator,
 			quoteName(name) + " " + relationship + " " + expectedNameOrSize + " " +
-				pluralizer.nameOf(expectedSize) + ".");
+				pluralizer.nameOf(expectedSize, expectedSizeName) + ".");
 
 		validator.value.nullToInvalid().ifValid(v ->
 			messageBuilder.withContext(v, name));
@@ -80,7 +80,8 @@ public static MessageBuilder sizeIsBetweenFailed(AbstractObjectValidator<?, ?> v
 			// The size is undefined (e.g. the collection is null)
 			//
 			//  "actual" must contain [1, 3] elements
-			message.append(" must contain ").append(bounds).append(' ').append(pluralizer.nameOf(2)).append('.');
+			message.append(" must contain ").append(bounds).append(' ').
+				append(pluralizer.nameOf(2, null)).append('.');
 			return new MessageBuilder(validator, message.toString());
 		}
 
@@ -111,7 +112,7 @@ else if (actualSize >= exclusiveMaximum)
 				"actual: " + actualSize + "\n" +
 				"bounds: " + bounds);
 		}
-		message.append(pluralizer.nameOf(2)).append('.');
+		message.append(pluralizer.nameOf(2, null)).append('.');
 		return new MessageBuilder(validator, message.toString()).
 			withContext(validator.getValue(), name).
 			withContext(actualSize, actualSizeName).
@@ -206,7 +207,7 @@ public static <C extends Collection<E>, E> MessageBuilder containsAnyFailed(
 
 		String name = validator.getName();
 		MessageBuilder messageBuilder = new MessageBuilder(validator,
-			quoteName(name) + " must contain any of the " + pluralizer.nameOf(2) +
+			quoteName(name) + " must contain any of the " + pluralizer.nameOf(2, null) +
 				" present in " + expectedNameOrValue + ".");
 
 		validator.value.nullToInvalid().ifValid(v -> messageBuilder.withContext(v, name));
@@ -237,7 +238,7 @@ public static <C extends Collection<E>, E> MessageBuilder doesNotContainAnyFaile
 
 		String name = validator.getName();
 		MessageBuilder messageBuilder = new MessageBuilder(validator,
-			quoteName(name) + " may not contain any of the " + pluralizer.nameOf(2) +
+			quoteName(name) + " may not contain any of the " + pluralizer.nameOf(2, null) +
 				" present in " + unwantedNameOrValue + ".");
 
 		validator.value.nullToInvalid().ifValid(v -> messageBuilder.withContext(v, name));
@@ -274,7 +275,7 @@ public static <E> MessageBuilder containsExactlyFailed(AbstractObjectValidator<?
 		StringBuilder message = new StringBuilder(quoteName(name)).append(" must consist of the ");
 		if (expectedName != null)
 			message.append("same ");
-		message.append(pluralizer.nameOf(2)).append(' ');
+		message.append(pluralizer.nameOf(2, null)).append(' ');
 
 		String expectedNameOrValue = validator.getNameOrValue("as ", expectedName, "", expected);
 		message.append(expectedNameOrValue).append(", regardless of their order.");
@@ -311,7 +312,7 @@ public static <C extends Collection<E>, E> MessageBuilder doesNotContainExactlyF
 			append(" may not consist of the ");
 		if (unwantedName != null)
 			message.append("same ");
-		message.append(pluralizer.nameOf(2)).append(' ');
+		message.append(pluralizer.nameOf(2, null)).append(' ');
 		String unwantedNameOrValue = validator.getNameOrValue("as ", unwantedName, "", unwanted);
 		message.append(unwantedNameOrValue).append(", regardless of their order.");
 
@@ -343,7 +344,7 @@ public static <C extends Collection<E>, E> MessageBuilder containsAllFailed(
 
 		String name = validator.getName();
 		MessageBuilder messageBuilder = new MessageBuilder(validator,
-			quoteName(name) + " must contain all the " + pluralizer.nameOf(2) + " present in " +
+			quoteName(name) + " must contain all the " + pluralizer.nameOf(2, null) + " present in " +
 				expectedNameOrValue + ".");
 
 		validator.value.nullToInvalid().ifValid(v -> messageBuilder.withContext(v, name));
@@ -372,7 +373,7 @@ public static <C extends Collection<E>, E> MessageBuilder doesNotContainAllFaile
 		String unwantedNameOrValue = validator.getNameOrValue("", unwantedName, "the set ", unwanted);
 		String name = validator.getName();
 		MessageBuilder messageBuilder = new MessageBuilder(validator,
-			quoteName(name) + " may contain some, but not all, the " + pluralizer.nameOf(2) +
+			quoteName(name) + " may contain some, but not all, the " + pluralizer.nameOf(2, null) +
 				" present in " + unwantedNameOrValue + ".");
 
 		validator.value.nullToInvalid().ifValid(v -> messageBuilder.withContext(v, name));
@@ -393,7 +394,7 @@ public static <E> MessageBuilder doesNotContainDuplicatesFailed(AbstractObjectVa
 	{
 		String name = validator.getName();
 		MessageBuilder messageBuilder = new MessageBuilder(validator,
-			quoteName(name) + " may not contain any duplicate " + pluralizer.nameOf(2) + ".");
+			quoteName(name) + " may not contain any duplicate " + pluralizer.nameOf(2, null) + ".");
 		if (duplicates != null)
 			messageBuilder.withContext(duplicates, "duplicates");
 		validator.value.nullToInvalid().ifValid(v -> messageBuilder.withContext(v, name));

java/src/main/java/com/github/cowwoc/requirements10/java/internal/util/Pluralizer.java

@@ -12,72 +12,46 @@ public enum Pluralizer
 	/**
 	 * The names of one or more characters.
 	 */
-	CHARACTER
-		{
-			@Override
-			public String nameOf(int count)
-			{
-				if (count == 1)
-					return "character";
-				return "characters";
-			}
-		},
+	CHARACTER("character", "characters"),
 	/**
 	 * The names of one or more keys.
 	 */
-	KEY
-		{
-			@Override
-			public String nameOf(int count)
-			{
-				if (count == 1)
-					return "key";
-				return "keys";
-			}
-		},
+	KEY("key", "keys"),
 	/**
 	 * The names of one or more values.
 	 */
-	VALUE
-		{
-			@Override
-			public String nameOf(int count)
-			{
-				if (count == 1)
-					return "value";
-				return "values";
-			}
-		},
+	VALUE("value", "values"),
 	/**
 	 * The names of one or more entries.
 	 */
-	ENTRY
-		{
-			@Override
-			public String nameOf(int count)
-			{
-				if (count == 1)
-					return "entry";
-				return "entries";
-			}
-		},
+	ENTRY("entry", "entries"),
 	/**
 	 * The names of one or more elements.
 	 */
-	ELEMENT
-		{
-			@Override
-			public String nameOf(int count)
-			{
-				if (count == 1)
-					return "element";
-				return "elements";
-			}
-		};
+	ELEMENT("element", "elements");
+
+	private final String singular;
+	private final String plural;
+
+	/**
+	 * @param singular - the singular form of the element
+	 * @param plural   - the plural form of the element
+	 */
+	Pluralizer(String singular, String plural)
+	{
+		this.singular = singular;
+		this.plural = plural;
+	}
 
 	/**
 	 * @param count the number of elements
+	 * @param name  the name of the parameter containing the number of elements ({@code null} if absent)
 	 * @return the singular or plural form of the element type (in lowercase)
 	 */
-	public abstract String nameOf(int count);
+	public String nameOf(int count, String name)
+	{
+		if (count == 1 && name == null)
+			return singular;
+		return plural;
+	}
 }