Refine script handling and improve runtime safety

- Improve null-safety in ScriptsPlugin by throwing an exception for null input.
- Replace unsafe toString() call in AbstractScript constructor with a safer internal ID generation.
- Adjust test cases to align with code changes and project conventions.
- Update OSGi @Version annotation to 2.26.0 for the next release cycle.

Author: jhl221123

log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/ScriptsPluginTest.java

@@ -18,7 +18,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
@@ -28,18 +27,18 @@
 class ScriptsPluginTest {
 
     @Test
-    public void testCreateScriptsNullInput() {
-        assertNull(ScriptsPlugin.createScripts(null), "Should return null");
+    void testCreateScriptsNullInput() {
+        assertThrows(NullPointerException.class, () -> ScriptsPlugin.createScripts(null));
     }
 
     @Test
-    public void testCreateScriptsEmptyInput() {
+    void testCreateScriptsEmptyInput() {
         AbstractScript[] emptyArray = new AbstractScript[0];
         assertSame(emptyArray, ScriptsPlugin.createScripts(emptyArray), "Should return empty array");
     }
 
     @Test
-    public void testCreateScriptsAllExplicitNames() {
+    void testCreateScriptsAllExplicitNames() {
         AbstractScript script1 = new MockScript("script1", "JavaScript", "text");
         AbstractScript script2 = new MockScript("script2", "Groovy", "text");
         AbstractScript[] input = {script1, script2};
@@ -49,21 +48,21 @@ public void testCreateScriptsAllExplicitNames() {
     }
 
     @Test
-    public void testCreateScriptsImplicitName() {
+    void testCreateScriptsImplicitName() {
         AbstractScript script = new MockScript(null, "JavaScript", "text");
         AbstractScript[] input = {script};
         assertThrows(ConfigurationException.class, () -> ScriptsPlugin.createScripts(input));
     }
 
     @Test
-    public void testCreateScriptsBlankName() {
+    void testCreateScriptsBlankName() {
         AbstractScript script = new MockScript("  ", "JavaScript", "text");
         AbstractScript[] input = {script};
         assertThrows(ConfigurationException.class, () -> ScriptsPlugin.createScripts(input));
     }
 
     @Test
-    public void testCreateScriptsMixedExplicitAndImplicitNames() {
+    void testCreateScriptsMixedExplicitAndImplicitNames() {
         AbstractScript explicitScript = new MockScript("script", "Python", "text");
         AbstractScript implicitScript = new MockScript(null, "JavaScript", "text");
         AbstractScript[] input = {explicitScript, implicitScript};

log4j-core-test/src/test/java/org/apache/logging/log4j/core/script/AbstractScriptTest.java

@@ -17,14 +17,15 @@
 package org.apache.logging.log4j.core.script;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import org.junit.jupiter.api.Test;
 
 class AbstractScriptTest {
 
     @Test
-    public void testConstructorAndGettersWithExplicitName() {
+    void testConstructorAndGettersWithExplicitName() {
         final String lang = "JavaScript";
         final String text = "text";
         final String name = "script";
@@ -37,19 +38,19 @@ public void testConstructorAndGettersWithExplicitName() {
     }
 
     @Test
-    public void testConstructorAndGettersWithImplicitName() {
+    void testConstructorAndGettersWithImplicitName() {
         final String lang = "JavaScript";
         final String text = "text";
         final AbstractScript script = new MockScript(null, lang, text);
 
         assertEquals(lang, script.getLanguage(), "Language should match");
         assertEquals(text, script.getScriptText(), "Script text should match");
         assertNull(script.getName(), "Name should be null");
-        assertEquals(script.toString(), script.getId(), "Id should match its toString()");
+        assertNotNull(script.getId(), "Id should not be null");
     }
 
     @Test
-    public void testConstructorAndGettersWithBlankName() {
+    void testConstructorAndGettersWithBlankName() {
         final String lang = "JavaScript";
         final String text = "text";
         final String name = "  ";
@@ -58,7 +59,7 @@ public void testConstructorAndGettersWithBlankName() {
         assertEquals(lang, script.getLanguage(), "Language should match");
         assertEquals(text, script.getScriptText(), "Script text should match");
         assertEquals(name, script.getName(), "Name should be blank");
-        assertEquals(script.toString(), script.getId(), "Id should match its toString()");
+        assertNotNull(script.getId(), "Id should not be null");
     }
 
     private class MockScript extends AbstractScript {

log4j-core/src/main/java/org/apache/logging/log4j/core/config/ScriptsPlugin.java

@@ -18,16 +18,19 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import org.apache.logging.log4j.core.Core;
 import org.apache.logging.log4j.core.config.plugins.Plugin;
 import org.apache.logging.log4j.core.config.plugins.PluginElement;
 import org.apache.logging.log4j.core.config.plugins.PluginFactory;
 import org.apache.logging.log4j.core.script.AbstractScript;
 import org.apache.logging.log4j.util.Strings;
+import org.jspecify.annotations.NullMarked;
 
 /**
  * A  container of Scripts.
  */
+@NullMarked
 @Plugin(name = "Scripts", category = Core.CATEGORY_NAME)
 public final class ScriptsPlugin {
 
@@ -40,7 +43,8 @@ private ScriptsPlugin() {}
      */
     @PluginFactory
     public static AbstractScript[] createScripts(@PluginElement("Scripts") final AbstractScript[] scripts) {
-        if (scripts == null || scripts.length == 0) {
+        Objects.requireNonNull(scripts, "Scripts array cannot be null");
+        if (scripts.length == 0) {
             return scripts;
         }
 

log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java

@@ -16,6 +16,7 @@
  */
 package org.apache.logging.log4j.core.script;
 
+import java.util.Objects;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.status.StatusLogger;
 import org.apache.logging.log4j.util.Strings;
@@ -37,7 +38,7 @@ public AbstractScript(final String name, final String language, final String scr
         this.language = language;
         this.scriptText = scriptText;
         this.name = name;
-        this.id = Strings.isBlank(name) ? this.toString() : name;
+        this.id = Strings.isBlank(name) ? Integer.toHexString(Objects.hashCode(this)) : name;
     }
 
     public String getLanguage() {

log4j-core/src/main/java/org/apache/logging/log4j/core/script/package-info.java

@@ -18,7 +18,7 @@
  * Log4j 2 Script support.
  */
 @Export
-@Version("2.25.0")
+@Version("2.26.0")
 package org.apache.logging.log4j.core.script;
 
 import org.osgi.annotation.bundle.Export;