Revert "use the class configuration from the cache"

rbri · rbri · commit 1a6002082214 · 2024-07-27T13:36:03.000+02:00
This reverts commit 4f6ca24.
diff --git a/src/main/java/org/htmlunit/javascript/RecursiveFunctionObject.java b/src/main/java/org/htmlunit/javascript/RecursiveFunctionObject.java
@@ -23,9 +23,9 @@
 import org.htmlunit.corejs.javascript.FunctionObject;
 import org.htmlunit.corejs.javascript.Scriptable;
 import org.htmlunit.corejs.javascript.ScriptableObject;
+import org.htmlunit.javascript.configuration.AbstractJavaScriptConfiguration;
 import org.htmlunit.javascript.configuration.ClassConfiguration;
 import org.htmlunit.javascript.configuration.ClassConfiguration.ConstantInfo;
-import org.htmlunit.javascript.configuration.JavaScriptConfiguration;
 
 /**
  * A FunctionObject that returns IDs of this object and all its parent classes.
@@ -103,8 +103,8 @@ public Object get(final String name, final Scriptable start) {
         Class<?> klass = getPrototypeProperty().getClass();
 
         while (value == NOT_FOUND && HtmlUnitScriptable.class.isAssignableFrom(klass)) {
-            final ClassConfiguration config = JavaScriptConfiguration.getInstance(browserVersion_)
-                    .getClassConfiguration(klass.getName());
+            final ClassConfiguration config = AbstractJavaScriptConfiguration.getClassConfiguration(
+                    klass.asSubclass(HtmlUnitScriptable.class), browserVersion_);
             if (config != null) {
                 final List<ConstantInfo> constants = config.getConstants();
                 if (constants != null) {
diff --git a/src/main/java/org/htmlunit/javascript/host/intl/Intl.java b/src/main/java/org/htmlunit/javascript/host/intl/Intl.java
@@ -22,8 +22,8 @@
 import org.htmlunit.javascript.HtmlUnitScriptable;
 import org.htmlunit.javascript.JavaScriptEngine;
 import org.htmlunit.javascript.RecursiveFunctionObject;
+import org.htmlunit.javascript.configuration.AbstractJavaScriptConfiguration;
 import org.htmlunit.javascript.configuration.ClassConfiguration;
-import org.htmlunit.javascript.configuration.JavaScriptConfiguration;
 
 /**
  * A JavaScript object for {@code Intl}.
@@ -47,8 +47,7 @@ public void defineProperties(final BrowserVersion browserVersion) {
 
     private void define(final Class<? extends HtmlUnitScriptable> c, final BrowserVersion browserVersion) {
         try {
-            final ClassConfiguration config = JavaScriptConfiguration.getInstance(browserVersion)
-                    .getClassConfiguration(c.getName());
+            final ClassConfiguration config = AbstractJavaScriptConfiguration.getClassConfiguration(c, browserVersion);
             final HtmlUnitScriptable prototype = JavaScriptEngine.configureClass(config, this);
             final FunctionObject functionObject =
                     new RecursiveFunctionObject(config.getJsConstructor().getKey(),
diff --git a/src/main/java/org/htmlunit/javascript/host/worker/DedicatedWorkerGlobalScope.java b/src/main/java/org/htmlunit/javascript/host/worker/DedicatedWorkerGlobalScope.java
@@ -40,8 +40,8 @@
 import org.htmlunit.javascript.RecursiveFunctionObject;
 import org.htmlunit.javascript.background.BasicJavaScriptJob;
 import org.htmlunit.javascript.background.JavaScriptJob;
+import org.htmlunit.javascript.configuration.AbstractJavaScriptConfiguration;
 import org.htmlunit.javascript.configuration.ClassConfiguration;
-import org.htmlunit.javascript.configuration.JavaScriptConfiguration;
 import org.htmlunit.javascript.configuration.JsxClass;
 import org.htmlunit.javascript.configuration.JsxConstructor;
 import org.htmlunit.javascript.configuration.JsxFunction;
@@ -121,12 +121,13 @@ public void jsConstructor() {
         context.initSafeStandardObjects(this);
         JavaScriptEngine.configureRhino(webClient, browserVersion, this);
 
-        final JavaScriptConfiguration jsConfig = JavaScriptConfiguration.getInstance(browserVersion);
-        ClassConfiguration config =
-                jsConfig.getClassConfiguration(DedicatedWorkerGlobalScope.class.getSuperclass().getName());
+        ClassConfiguration config = AbstractJavaScriptConfiguration.getClassConfiguration(
+                (Class<? extends HtmlUnitScriptable>) DedicatedWorkerGlobalScope.class.getSuperclass(),
+                browserVersion);
         final HtmlUnitScriptable parentPrototype = JavaScriptEngine.configureClass(config, this);
 
-        config = jsConfig.getClassConfiguration(DedicatedWorkerGlobalScope.class.getName());
+        config = AbstractJavaScriptConfiguration.getClassConfiguration(
+                                DedicatedWorkerGlobalScope.class, browserVersion);
         final HtmlUnitScriptable prototype = JavaScriptEngine.configureClass(config, this);
         prototype.setPrototype(parentPrototype);
         setPrototype(prototype);
