* Renamed Validator.apply() to Validator.and().

* Added Validator.add() and Validator.or() logical operators.
* Removed all type converters from ObjectValidator and StringValidator because the concept does not scale. We can't just keep on adding methods to these centralized classes.

Author: cowwoc

README.md

@@ -20,9 +20,9 @@ To get started, add this Maven dependency:
 ```xml
 
 <dependency>
-  <groupId>com.github.cowwoc.requirements</groupId>
-  <artifactId>java</artifactId>
-  <version>10.0</version>
+	<groupId>com.github.cowwoc.requirements</groupId>
+	<artifactId>java</artifactId>
+	<version>10.0</version>
 </dependency>
 ```
 
@@ -38,32 +38,32 @@ import static com.github.cowwoc.requirements10.java.DefaultJavaValidators.requir
 
 public final class Cake
 {
-  private byte bitesTaken = 0;
-  private int piecesLeft;
-
-  public Cake(int piecesLeft)
-  {
-    requireThat(piecesLeft, "piecesLeft").isPositive();
-    this.piecesLeft = piecesLeft;
-  }
-
-  public int eat()
-  {
-    ++bitesTaken;
-    assert assumeThat(bitesTaken, "bitesTaken").isNotNegative().elseThrow();
-
-    piecesLeft -= ThreadLocalRandom.current().nextInt(5);
-
-    assert assumeThat(piecesLeft, "piecesLeft").isNotNegative().elseThrow();
-    return piecesLeft;
-  }
-
-  public List<String> getFailures()
-  {
-    return checkIf(bitesTaken, "bitesTaken").isNotNegative().
-      and(checkIf(piecesLeft, "piecesLeft").isGreaterThan(3)).
-      elseGetMessages();
-  }
+	private byte bitesTaken = 0;
+	private int piecesLeft;
+
+	public Cake(int piecesLeft)
+	{
+		requireThat(piecesLeft, "piecesLeft").isPositive();
+		this.piecesLeft = piecesLeft;
+	}
+
+	public int eat()
+	{
+		++bitesTaken;
+		assert assumeThat(bitesTaken, "bitesTaken").isNotNegative().elseThrow();
+
+		piecesLeft -= ThreadLocalRandom.current().nextInt(5);
+
+		assert assumeThat(piecesLeft, "piecesLeft").isNotNegative().elseThrow();
+		return piecesLeft;
+	}
+
+	public List<String> getFailures()
+	{
+		return checkIf(bitesTaken, "bitesTaken").isNotNegative().
+			and(checkIf(piecesLeft, "piecesLeft").isGreaterThan(3)).
+			elseGetMessages();
+	}
 }
 ```
 
@@ -84,8 +84,10 @@ If you violate a **class invariant**:
 
 ```java
 Cake cake = new Cake(1_000_000);
-while (true)
-  cake.eat();
+while(true)
+	cake.
+
+eat();
 ```
 
 You'll get:
@@ -99,8 +101,10 @@ If you violate a **postcondition**:
 
 ```java
 Cake cake = new Cake(100);
-while (true)
-  cake.eat();
+while(true)
+	cake.
+
+eat();
 ```
 
 You'll get:
@@ -114,12 +118,19 @@ If you violate **multiple** conditions at once:
 
 ```java
 Cake cake = new Cake(1);
-cake.bitesTaken = -1;
-cake.piecesLeft = 2;
+cake.bitesTaken =-1;
+cake.piecesLeft =2;
 StringJoiner failures = new StringJoiner("\n\n");
-for (String failure : cake.getFailures())
-    failures.add(failure);
-System.out.println(failures);
+for(
+String failure :cake.
+
+getFailures())
+	failures.
+
+add(failure);
+System.out.
+
+println(failures);
 ```
 
 You'll get:
@@ -144,6 +155,8 @@ This library offers the following features:
 * [Multiple validation failures](docs/Features.md#multiple-validation-failures) that report all the errors at
   once
 * [Nested validations](docs/Features.md#nested-validations) that allow you to validate complex objects
+* [Logical operators](docs/Features.md#logical-operators) that allow you to combine the validation of
+  unrelated values
 * [String diff](docs/Features.md#string-diff) that shows the differences between two strings
 * [Performant and robust](docs/Performance.md)
 
@@ -152,28 +165,35 @@ This library offers the following features:
 Designed for discovery using your favorite IDE's auto-complete feature.
 The main entry points are:
 
-* [requireThat(value, name)](https://cowwoc.github.io/requirements.java/10.0/docs/api/com.github.cowwoc.requirements.java/com/github/cowwoc/requirements10/java/DefaultJavaValidators.html#requireThat(T,java.lang.String)) for method preconditions.
-* [assumeThat(value, name)](https://cowwoc.github.io/requirements.java/10.0/docs/api/com.github.cowwoc.requirements.java/com/github/cowwoc/requirements10/java/DefaultJavaValidators.html#assumeThat(T,java.lang.String)) for class invariants, method postconditions and private methods.
-* [checkIfThat(value, name)](https://cowwoc.github.io/requirements.java/10.0/docs/api/com.github.cowwoc.requirements.java/com/github/cowwoc/requirements10/java/DefaultJavaValidators.html#checkIf(T,java.lang.String)) for multiple failures and customized error handling.
-* [JavaValidators](https://cowwoc.github.io/requirements.java/10.0/docs/api/com.github.cowwoc.requirements.java/com/github/cowwoc/requirements10/java/JavaValidators.html) for custom configurations.
+* [requireThat(value, name)](https://cowwoc.github.io/requirements.java/10.0/docs/api/com.github.cowwoc.requirements.java/com/github/cowwoc/requirements10/java/DefaultJavaValidators.html#requireThat(T,java.lang.String))
+  for method preconditions.
+* [assumeThat(value, name)](https://cowwoc.github.io/requirements.java/10.0/docs/api/com.github.cowwoc.requirements.java/com/github/cowwoc/requirements10/java/DefaultJavaValidators.html#assumeThat(T,java.lang.String))
+  for class invariants, method postconditions and private methods.
+* [checkIfThat(value, name)](https://cowwoc.github.io/requirements.java/10.0/docs/api/com.github.cowwoc.requirements.java/com/github/cowwoc/requirements10/java/DefaultJavaValidators.html#checkIf(T,java.lang.String))
+  for multiple failures and customized error handling.
+* [JavaValidators](https://cowwoc.github.io/requirements.java/10.0/docs/api/com.github.cowwoc.requirements.java/com/github/cowwoc/requirements10/java/JavaValidators.html)
+  for custom configurations.
 
 The first three methods use a shared configuration, while `JavaValidators` allows you to create an independent
 configuration.
 
 * `requireThat()` and `assumeThat()` throw an exception on the first validation failure.
-* `checkIf()` returns multiple validation failures at once. It is more flexible than the others, but its syntax
-is more verbose.
+* `checkIf()` returns multiple validation failures at once. It is more flexible than the others, but its
+  syntax
+  is more verbose.
 
-Thrown exceptions may be configured using [ConfigurationUpdater.exceptionTransformer(Function)](https://cowwoc.github.io/requirements.java/10.0/docs/api/com.github.cowwoc.requirements.java/com/github/cowwoc/requirements10/java/ConfigurationUpdater.html#exceptionTransformer(java.util.function.Function)).
+Thrown exceptions may be configured
+using [ConfigurationUpdater.exceptionTransformer(Function)](https://cowwoc.github.io/requirements.java/10.0/docs/api/com.github.cowwoc.requirements.java/com/github/cowwoc/requirements10/java/ConfigurationUpdater.html#exceptionTransformer(java.util.function.Function)).
 
 See the [API documentation](https://cowwoc.github.io/requirements.java/10.0/docs/api/) for more details.
 
 ## Tips
 
-* Use `assert` with `assumeThat().elseThrow()` for sanity checks. When assertions are disabled, the checks will get removed.
+* Use `assert` with `assumeThat().elseThrow()` for sanity checks. When assertions are disabled, the checks
+  will get removed.
 * Use `checkIf().elseGetMessages()` to return failure messages without throwing an exception.
   This is the fastest validation approach, ideal for web services.
-* To enhance the clarity of failure messages, you should provide parameter names, even when they are optional. 
+* To enhance the clarity of failure messages, you should provide parameter names, even when they are optional.
   In other words, favor `assumeThat(value, name)` to `assumeThat(value)`.
 
 ## Third-party libraries and tools

docs/Changelog.md

@@ -12,6 +12,9 @@ See https://github.com/cowwoc/requirements.java/commits/master for a full list.
     * Renamed `Configuration.mayDiff()` to `allowDiff()`.
     * Parameter names may not contain whitespace (previously only leading or trailing whitespace was
       disallowed).
+    * Moved `com.github.cowwoc.requirements10.java.terminal.TerminalEncoding`
+      to `com.github.cowwoc.requirements10.java.TerminalEncoding`.
+    * Renamed `Validator.apply()` to `Validator.validate()`.
 * New features:
     * Added `GenericType` to represent types with type parameters.
     * Added `ClassValidator.isPrimitive()`.

docs/Features.md

@@ -148,30 +148,46 @@ Actual: [Ontario, Quebec, Nova Scotia, New Brunswick, Manitoba, British Columbia
 
 ## Nested validations
 
-Nested validations facilitate checking multiple properties of a value. For example, given
+Nested validations facilitate checking multiple properties of a value. For example,
 
 ```java
 Map<String, Integer> nameToAge = new HashMap<>();
 nameToAge.put("Leah", 3);
 nameToAge.put("Nathaniel", 1);
+
+requireThat(nameToAge, "nameToAge").
+keySet().containsAll(Arrays.asList("Leah", "Nathaniel"));
+
+requireThat(nameToAge, "nameToAge").
+values().containsAll(Arrays.asList(3, 1));
 ```
 
-To validate that `nameToAge` has the keys "Leah" and "Nathaniel" and the values 3 and 1, you can write:
+can be converted to:
 
 ```java
 requireThat(nameToAge, "nameToAge").
-  apply(v -> v.keySet().containsAll(Arrays.asList("Leah", "Nathaniel"))).
-  apply(v -> v.values().containsAll(Arrays.asList(3, 1)));
+  and(v -> v.keySet().containsAll(Arrays.asList("Leah", "Nathaniel"))).
+  and(v -> v.values().containsAll(Arrays.asList(3, 1)));
 ```
 
-instead of:
+## Logical operators
+
+Logical operators combine the validation of unrelated values. For example,
 
 ```java
-requireThat(nameToAge, "nameToAge").
-  keySet().containsAll(Arrays.asList("Leah", "Nathaniel"));
+Set<String> activeUsers = Set.of("Alice", "Bob");
+Set<String> suspendedUsers = Set.of("Charlie");
 
-requireThat(nameToAge, "nameToAge").
-  values().containsAll(Arrays.asList(3, 1));
+String currentUser = "Alice";
+var userCheck = checkIf(currentUser, "currentUser");
+for (String user : activeUsers)
+{
+  var yetAnotherUserCheck = checkIf(currentUser, "currentUser").isEqualTo(user);
+  userCheck.or(yetAnotherUserCheck);
+}
+var userNotSuspended = checkIf(suspendedUsers, "suspendedUsers").
+  doesNotContain(currentUser, "currentUser");
+userCheck.and(userNotSuspended).elseThrow();
 ```
 
 ## String diff
@@ -191,7 +207,7 @@ terminal.
 
 The use of colors is disabled by default if stdin or stdout are redirected, even if ANSI colors are supported.
 To enable colors,
-invoke [GlobalConfiguration.terminalEncoding(TerminalEncoding)](https://cowwoc.github.io/requirements.java/10.0/docs/api/com.github.cowwoc.requirements.java/com/github/cowwoc/requirements10/java/GlobalConfiguration.html#terminalEncoding(com.github.cowwoc.requirements10.java.terminal.TerminalEncoding)).
+invoke [GlobalConfiguration.terminalEncoding(TerminalEncoding)](https://cowwoc.github.io/requirements.java/10.0/docs/api/com.github.cowwoc.requirements.java/com/github/cowwoc/requirements10/java/GlobalConfiguration.html#terminalEncoding(com.github.cowwoc.requirements10.java.TerminalEncoding)).
 
 ## Returning the value after validation
 

guava/src/main/java/com/github/cowwoc/requirements10/guava/internal/validator/GuavaValidatorsImpl.java

@@ -6,7 +6,6 @@
 import com.github.cowwoc.requirements10.java.ValidationFailure;
 import com.github.cowwoc.requirements10.java.internal.scope.ApplicationScope;
 import com.github.cowwoc.requirements10.java.internal.util.MaybeUndefined;
-import com.github.cowwoc.requirements10.java.internal.validator.AbstractValidator;
 import com.github.cowwoc.requirements10.java.internal.validator.AbstractValidators;
 import com.google.common.collect.Multimap;
 
@@ -15,6 +14,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static com.github.cowwoc.requirements10.java.internal.validator.JavaValidatorsImpl.DEFAULT_NAME;
+
 public class GuavaValidatorsImpl extends AbstractValidators<GuavaValidators>
 	implements GuavaValidators
 {
@@ -57,7 +58,7 @@ public <K, V, T extends Multimap<K, V>> MultimapValidator<T, K, V> assumeThat(T
 	@Override
 	public <K, V, T extends Multimap<K, V>> MultimapValidator<T, K, V> assumeThat(T value)
 	{
-		return assumeThat(value, AbstractValidator.DEFAULT_NAME);
+		return assumeThat(value, DEFAULT_NAME);
 	}
 
 	@Override
@@ -69,7 +70,7 @@ public <K, V, T extends Multimap<K, V>> MultimapValidator<T, K, V> checkIf(T val
 	@Override
 	public <K, V, T extends Multimap<K, V>> MultimapValidator<T, K, V> checkIf(T value)
 	{
-		return checkIf(value, AbstractValidator.DEFAULT_NAME);
+		return checkIf(value, DEFAULT_NAME);
 	}
 
 	private <K, V, T extends Multimap<K, V>> MultimapValidator<T, K, V> newInstance(T value, String name,

guava/src/main/java/com/github/cowwoc/requirements10/guava/internal/validator/MultimapValidatorImpl.java

@@ -60,7 +60,7 @@ public MultimapValidator<T, K, V> isEmpty()
 		switch (value.test(Multimap::isEmpty))
 		{
 			case UNDEFINED, FALSE -> addIllegalArgumentException(
-				ObjectMessages.isEmpty(scope, this).toString());
+				ObjectMessages.isEmpty(this).toString());
 		}
 		return self();
 	}
@@ -73,7 +73,7 @@ public MultimapValidator<T, K, V> isNotEmpty()
 		switch (value.test(value -> !value.isEmpty()))
 		{
 			case UNDEFINED, FALSE -> addIllegalArgumentException(
-				ObjectMessages.isNotEmpty(scope, this).toString());
+				ObjectMessages.isNotEmpty(this).toString());
 		}
 		return self();
 	}

jackson/pom.xml

@@ -56,7 +56,7 @@
 								<option>summary</option>
 							</additionalOptions>
 							<links>
-								<link>https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/2.17.1/</link>
+								<link>https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/2.17.2/</link>
 							</links>
 							<offlineLinks>
 								<!--

jackson/src/main/java/com/github/cowwoc/requirements10/jackson/internal/message/JsonNodeMessages.java

@@ -6,9 +6,8 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.cowwoc.requirements10.java.internal.message.section.MessageBuilder;
-import com.github.cowwoc.requirements10.java.internal.scope.ApplicationScope;
 import com.github.cowwoc.requirements10.java.internal.util.MaybeUndefined;
-import com.github.cowwoc.requirements10.java.validator.component.ValidatorComponent;
+import com.github.cowwoc.requirements10.java.internal.validator.AbstractValidator;
 
 import static com.github.cowwoc.requirements10.java.internal.message.section.MessageBuilder.quoteName;
 
@@ -22,32 +21,28 @@ private JsonNodeMessages()
 	}
 
 	/**
-	 * @param scope     the application configuration
 	 * @param validator the validator
 	 * @param name      the name of a property
 	 * @return a message for the validation failure
 	 */
-	public static MessageBuilder property(ApplicationScope scope,
-		ValidatorComponent<?, ? extends JsonNode> validator, MaybeUndefined<? extends JsonNode> value,
-		String name)
+	public static MessageBuilder property(AbstractValidator<?, ? extends JsonNode> validator,
+		MaybeUndefined<? extends JsonNode> value, String name)
 	{
-		MessageBuilder messageBuilder = new MessageBuilder(scope, validator,
+		MessageBuilder messageBuilder = new MessageBuilder(validator,
 			quoteName(validator.getName()) + " must contain a property named " + quoteName(name) + ".");
 		value.ifDefined(v -> messageBuilder.withContext(v, name));
 		return messageBuilder;
 	}
 
 	/**
-	 * @param scope     the application configuration
 	 * @param validator the validator
 	 * @param type      a description of the expected type (e.g. "a string")
 	 * @return a message for the validation failure
 	 */
-	public static MessageBuilder isType(ApplicationScope scope,
-		ValidatorComponent<?, ? extends JsonNode> validator, MaybeUndefined<? extends JsonNode> value,
-		String type)
+	public static MessageBuilder isType(AbstractValidator<?, ? extends JsonNode> validator,
+		MaybeUndefined<? extends JsonNode> value, String type)
 	{
-		MessageBuilder messageBuilder = new MessageBuilder(scope, validator,
+		MessageBuilder messageBuilder = new MessageBuilder(validator,
 			quoteName(validator.getName()) + " must contain " + type + ".");
 		value.ifDefined(v -> messageBuilder.withContext(v, "actual"));
 		return messageBuilder;

jackson/src/main/java/com/github/cowwoc/requirements10/jackson/internal/validator/JacksonValidatorsImpl.java

@@ -7,14 +7,15 @@
 import com.github.cowwoc.requirements10.java.ValidationFailure;
 import com.github.cowwoc.requirements10.java.internal.scope.ApplicationScope;
 import com.github.cowwoc.requirements10.java.internal.util.MaybeUndefined;
-import com.github.cowwoc.requirements10.java.internal.validator.AbstractValidator;
 import com.github.cowwoc.requirements10.java.internal.validator.AbstractValidators;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.github.cowwoc.requirements10.java.internal.validator.JavaValidatorsImpl.DEFAULT_NAME;
+
 public class JacksonValidatorsImpl extends AbstractValidators<JacksonValidators>
 	implements JacksonValidators
 {
@@ -57,7 +58,7 @@ public <T extends JsonNode> JsonNodeValidator<T> assumeThat(T value, String name
 	@Override
 	public <T extends JsonNode> JsonNodeValidator<T> assumeThat(T value)
 	{
-		return assumeThat(value, AbstractValidator.DEFAULT_NAME);
+		return assumeThat(value, DEFAULT_NAME);
 	}
 
 	@Override
@@ -69,7 +70,7 @@ public <T extends JsonNode> JsonNodeValidator<T> checkIf(T value, String name)
 	@Override
 	public <T extends JsonNode> JsonNodeValidator<T> checkIf(T value)
 	{
-		return checkIf(value, AbstractValidator.DEFAULT_NAME);
+		return checkIf(value, DEFAULT_NAME);
 	}
 
 	private <T extends JsonNode> JsonNodeValidator<T> newInstance(T value, String name,