cleanup

Author: rbri

src/main/java/org/htmlunit/WebRequest.java

@@ -29,7 +29,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 import java.util.regex.Pattern;
 
@@ -645,7 +644,8 @@ public Charset getDefaultResponseContentCharset() {
      * @param defaultResponseContentCharset the default character set of the response
      */
     public void setDefaultResponseContentCharset(final Charset defaultResponseContentCharset) {
-        this.defaultResponseContentCharset_ = Objects.requireNonNull(defaultResponseContentCharset);
+        WebAssert.notNull("defaultResponseContentCharset", defaultResponseContentCharset);
+        defaultResponseContentCharset_ = defaultResponseContentCharset;
     }
 
     /**

src/test/java/org/htmlunit/archunit/ArchitectureTest.java

@@ -21,6 +21,7 @@
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
 
 import java.lang.reflect.Executable;
+import java.util.Objects;
 import java.util.function.Supplier;
 
 import org.apache.commons.lang3.StringUtils;
@@ -628,4 +629,16 @@ public void check(final JavaMethod method, final ConditionEvents events) {
     @ArchTest
     public static final ArchRule jettyPackageRule = noClasses()
         .should().dependOnClassesThat().resideInAnyPackage("org.eclipse.jetty..");
+
+
+    /**
+     * Some methods should not be used.
+     */
+    @ArchTest
+    public static final ArchRule forbidObjectsRequireNonNull = noClasses()
+        .that()
+            .resideOutsideOfPackage("org.htmlunit.corejs..")
+            .and().resideOutsideOfPackage("org.htmlunit.jetty..")
+
+        .should().callMethod(Objects.class, "requireNonNull", Object.class); // Objects.requireNonNull(Object) is forbidden, always add a message
 }