feat: added check on null for function and constant manager

Author: MEFRREEX

script-js-graalvm/src/main/java/com/instancify/scriptify/js/graalvm/script/JsScript.java

@@ -17,6 +17,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 public class JsScript implements Script<Value> {
 
@@ -42,12 +43,12 @@ public ScriptFunctionManager getFunctionManager() {
 
     @Override
     public void setFunctionManager(ScriptFunctionManager functionManager) {
-        this.functionManager = functionManager;
+        this.functionManager = Objects.requireNonNull(functionManager, "functionManager cannot be null");
     }
 
     @Override
     public void setConstantManager(ScriptConstantManager constantManager) {
-        this.constantManager = constantManager;
+        this.constantManager = Objects.requireNonNull(constantManager, "constantManager cannot be null");
     }
 
     @Override
@@ -81,16 +82,12 @@ public Value eval(String script) throws ScriptException {
 
         Value bindings = context.getBindings("js");
 
-        if (functionManager != null) {
-            for (ScriptFunctionDefinition definition : functionManager.getFunctions().values()) {
-                bindings.putMember(definition.getFunction().getName(), new JsFunction(this, definition));
-            }
+        for (ScriptFunctionDefinition definition : functionManager.getFunctions().values()) {
+            bindings.putMember(definition.getFunction().getName(), new JsFunction(this, definition));
         }
 
-        if (constantManager != null) {
-            for (ScriptConstant constant : constantManager.getConstants().values()) {
-                bindings.putMember(constant.getName(), constant.getValue());
-            }
+        for (ScriptConstant constant : constantManager.getConstants().values()) {
+            bindings.putMember(constant.getName(), constant.getValue());
         }
 
         // Building full script including extra script code

script-js-rhino/src/main/java/com/instancify/scriptify/js/rhino/script/JsScript.java

@@ -15,6 +15,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 public class JsScript implements Script<Object> {
 
@@ -40,7 +41,7 @@ public ScriptFunctionManager getFunctionManager() {
 
     @Override
     public void setFunctionManager(ScriptFunctionManager functionManager) {
-        this.functionManager = functionManager;
+        this.functionManager = Objects.requireNonNull(functionManager, "functionManager cannot be null");
     }
 
     @Override
@@ -50,7 +51,7 @@ public ScriptConstantManager getConstantManager() {
 
     @Override
     public void setConstantManager(ScriptConstantManager constantManager) {
-        this.constantManager = constantManager;
+        this.constantManager = Objects.requireNonNull(constantManager, "constantManager cannot be null");
     }
 
     @Override
@@ -68,16 +69,12 @@ public Object eval(String script) throws ScriptException {
             context.setClassShutter(new JsSecurityClassAccessor(securityManager.getExcludes()));
         }
 
-        if (functionManager != null) {
-            for (ScriptFunctionDefinition definition : functionManager.getFunctions().values()) {
-                scope.put(definition.getFunction().getName(), scope, new JsFunction(this, definition));
-            }
+        for (ScriptFunctionDefinition definition : functionManager.getFunctions().values()) {
+            scope.put(definition.getFunction().getName(), scope, new JsFunction(this, definition));
         }
 
-        if (constantManager != null) {
-            for (ScriptConstant constant : constantManager.getConstants().values()) {
-                ScriptableObject.putConstProperty(scope, constant.getName(), constant.getValue());
-            }
+        for (ScriptConstant constant : constantManager.getConstants().values()) {
+            ScriptableObject.putConstProperty(scope, constant.getName(), constant.getValue());
         }
 
         // Building full script including extra script code