enforce @JsxConstructor method

Author: rbri

src/main/java/org/htmlunit/javascript/JavaScriptEngine.java

@@ -328,19 +328,13 @@ public static void configureScope(final HtmlUnitScriptable jsScope,
                 continue;
             }
 
-            final Map.Entry<String, Member> jsConstructor = config.getJsConstructor();
             if (prototype != null && config.isJsObject()) {
-                if (jsConstructor == null) {
-                    final ScriptableObject constructor = config.getHostClass().getDeclaredConstructor().newInstance();
-                    ((HtmlUnitScriptable) constructor).setClassName(jsClassName);
-                    defineConstructor(jsScope, prototype, constructor);
-                    configureConstantsStaticPropertiesAndStaticFunctions(config, constructor);
-                }
-                else {
-                    final FunctionObject function = new RecursiveFunctionObject(jsConstructor.getKey(), jsConstructor.getValue(), jsScope, browserVersion);
-                    addAsConstructorAndAlias(function, jsScope, prototype, config);
-                    configureConstantsStaticPropertiesAndStaticFunctions(config, function);
-                }
+                final Map.Entry<String, Member> jsConstructor = config.getJsConstructor();
+
+                // we have an Architecture test to make sure this is never null (jsxClassesShouldHaveJsxConstructor)
+                final FunctionObject function = new RecursiveFunctionObject(jsConstructor.getKey(), jsConstructor.getValue(), jsScope, browserVersion);
+                addAsConstructorAndAlias(function, jsScope, prototype, config);
+                configureConstantsStaticPropertiesAndStaticFunctions(config, function);
             }
         }
     }

src/main/java/org/htmlunit/javascript/host/arrays/Atomics.java

@@ -16,6 +16,7 @@
 
 import org.htmlunit.javascript.HtmlUnitScriptable;
 import org.htmlunit.javascript.configuration.JsxClass;
+import org.htmlunit.javascript.configuration.JsxConstructor;
 
 /**
  * A JavaScript object for {@code Atomics}.
@@ -24,4 +25,12 @@
  */
 @JsxClass
 public class Atomics extends HtmlUnitScriptable {
+
+    /**
+     * JavaScript constructor.
+     */
+    @JsxConstructor
+    public void jsConstructor() {
+        // nothing to do
+    }
 }

src/main/java/org/htmlunit/javascript/host/css/CSS.java

@@ -17,6 +17,7 @@
 import org.htmlunit.corejs.javascript.Scriptable;
 import org.htmlunit.javascript.HtmlUnitScriptable;
 import org.htmlunit.javascript.configuration.JsxClass;
+import org.htmlunit.javascript.configuration.JsxConstructor;
 import org.htmlunit.javascript.configuration.JsxStaticFunction;
 
 /**
@@ -28,6 +29,14 @@
 @JsxClass
 public class CSS extends HtmlUnitScriptable {
 
+    /**
+     * JavaScript constructor.
+     */
+    @JsxConstructor
+    public void jsConstructor() {
+        // nothing to do
+    }
+
     /**
      * {@inheritDoc}
      */

src/main/java/org/htmlunit/javascript/proxyautoconfig/ProxyAutoConfig.java

@@ -24,6 +24,7 @@
 import org.htmlunit.javascript.HtmlUnitScriptable;
 import org.htmlunit.javascript.JavaScriptEngine;
 import org.htmlunit.javascript.configuration.JsxClass;
+import org.htmlunit.javascript.configuration.JsxConstructor;
 import org.htmlunit.javascript.configuration.JsxFunction;
 import org.htmlunit.util.SubnetUtils;
 
@@ -46,6 +47,14 @@ private ProxyAutoConfig() {
         super();
     }
 
+    /**
+     * JavaScript constructor.
+     */
+    @JsxConstructor
+    public void jsConstructor() {
+        // nothing to do
+    }
+
     /**
      * Returns true if there is no domain name in the hostname (no dots).
      * @param host the hostname from the URL (excluding port number).

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

@@ -290,6 +290,39 @@ public boolean test(final JavaClass javaClass) {
             .orShould().haveRawReturnType("void")
             .orShould().haveRawReturnType(isAssignableToScriptable);
 
+    private static final ArchCondition<JavaClass> haveJsxConstructorMethod =
+            new ArchCondition<JavaClass>("have at least one method annotated with @JsxConstructor") {
+                @Override
+                public void check(final JavaClass javaClass, final ConditionEvents events) {
+                    final boolean hasJsxConstructor = javaClass.getAllMethods().stream()
+                            .anyMatch(method -> method.isAnnotatedWith(JsxConstructor.class));
+
+                    if (!hasJsxConstructor) {
+                        events.add(SimpleConditionEvent.violated(javaClass,
+                            String.format("Class %s does not contain any method annotated with @JsxConstructor",
+                                        javaClass.getName())));
+                    }
+                }
+            };
+
+    private static final DescribedPredicate<JavaClass> haveJsxClassWithPropertyIsJSObjectTrue =
+            new DescribedPredicate<JavaClass>("@JsxClass isJSObject == true") {
+                @Override
+                public boolean test(final JavaClass clazz) {
+                    return clazz.getAnnotationOfType(JsxClass.class).isJSObject();
+                }
+            };
+
+    /**
+     * Every JsxClass needs an implementation of JsxConstructor.
+     */
+    @ArchTest
+    public static final ArchRule jsxClassesShouldHaveJsxConstructor = classes()
+                .that().areAnnotatedWith(JsxClass.class)
+                    .and(haveJsxClassWithPropertyIsJSObjectTrue)
+                    .or().areAnnotatedWith(JsxClasses.class)
+                .should(haveJsxConstructorMethod);
+
     /**
      * JsxConstructor should not used for constructors.
      */