From 43e7c79319c3b65f46f55168b463c7d5585f08e5 Mon Sep 17 00:00:00 2001 From: Baptiste Grimaud Date: Mon, 22 Dec 2025 09:38:21 +0100 Subject: [PATCH] refactor: Cleanup code (address minor SonarQube issues) --- .../javascript/modules/engine/JavascriptModuleListener.java | 5 ++--- .../javascript/modules/engine/js/mock/MockBodyContent.java | 6 +++--- .../javascript/modules/engine/js/mock/MockJspWriter.java | 3 +-- .../javascript/modules/engine/js/mock/MockPageContext.java | 2 +- .../javascript/modules/engine/js/server/RenderHelper.java | 2 +- .../javascript/modules/engine/jsengine/GraalVMEngine.java | 1 - .../javascript/modules/engine/jsengine/JSFileSystem.java | 2 +- .../javascript/modules/engine/jsengine/JSNodeMapper.java | 4 ++-- .../javascript/modules/engine/jsengine/Registry.java | 3 +-- 9 files changed, 12 insertions(+), 16 deletions(-) diff --git a/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/JavascriptModuleListener.java b/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/JavascriptModuleListener.java index 9c79172e..ce8cba2a 100644 --- a/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/JavascriptModuleListener.java +++ b/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/JavascriptModuleListener.java @@ -29,7 +29,6 @@ import java.util.List; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.stream.Collectors; import static org.jahia.modules.javascript.modules.engine.jshandler.JavascriptProtocolConnection.BUNDLE_HEADER_JAVASCRIPT_INIT_SCRIPT; @@ -100,14 +99,14 @@ public void bundleChanged(BundleEvent event) { } } } catch (Exception e) { - logger.error("Cannot handle event {}", event.toString(), e); + logger.error("Cannot handle event {}", event, e); } } public List getJavascriptModules() { return Arrays.stream(engine.getBundleContext().getBundles()) .filter(bundle -> bundle.getState() == Bundle.ACTIVE && isJavascriptModule(bundle)) - .collect(Collectors.toList()); + .toList(); } public boolean isJavascriptModule(Bundle bundle) { diff --git a/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/mock/MockBodyContent.java b/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/mock/MockBodyContent.java index aa520d50..e17108eb 100644 --- a/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/mock/MockBodyContent.java +++ b/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/mock/MockBodyContent.java @@ -8,7 +8,7 @@ public class MockBodyContent extends BodyContent { - private MockJspWriter writer; + private final MockJspWriter writer; public MockBodyContent(MockJspWriter writer) { @@ -25,10 +25,10 @@ public String getString() { return writer.getString(); } - public void writeOut(Writer writer) throws IOException { + public void writeOut(Writer writer) { + // not used } - //--------------------------------------------------------------------- // Delegating implementations of JspWriter's abstract methods //--------------------------------------------------------------------- diff --git a/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/mock/MockJspWriter.java b/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/mock/MockJspWriter.java index a7cda4c9..149519df 100644 --- a/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/mock/MockJspWriter.java +++ b/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/mock/MockJspWriter.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; -import java.io.Writer; /** * Mock implementation of the {@link javax.servlet.jsp.JspWriter} class. @@ -48,7 +47,7 @@ private void init() { this.targetWriter = new PrintWriter(this.originalWriter); } - protected PrintWriter getTargetWriter() throws IOException { + protected PrintWriter getTargetWriter() { return this.targetWriter; } diff --git a/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/mock/MockPageContext.java b/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/mock/MockPageContext.java index 9a5d018e..31ed7514 100644 --- a/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/mock/MockPageContext.java +++ b/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/mock/MockPageContext.java @@ -106,7 +106,7 @@ public Object findAttribute(String name) { } else if (this.renderContext.getRequest().getSession().getAttribute(name) != null) { return this.renderContext.getRequest().getSession().getAttribute(name); } else { - return this.appAttr.containsKey(name) ? this.appAttr.get(name) : null; + return this.appAttr.getOrDefault(name, null); } } diff --git a/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/server/RenderHelper.java b/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/server/RenderHelper.java index 08da5727..958ab807 100644 --- a/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/server/RenderHelper.java +++ b/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/server/RenderHelper.java @@ -513,7 +513,7 @@ private ProxyObject recursiveProxyMap(Map mapToProxy) { return recursiveProxyMap((Map) o); } return o; - }).collect(Collectors.toList()))); + }).toList())); } } return ProxyObject.fromMap(mapToProxy); diff --git a/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/GraalVMEngine.java b/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/GraalVMEngine.java index ef48ef8d..350a2363 100644 --- a/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/GraalVMEngine.java +++ b/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/GraalVMEngine.java @@ -58,7 +58,6 @@ public class GraalVMEngine { private static final Logger logger = LoggerFactory.getLogger(GraalVMEngine.class); public static final String JS = "js"; - private static final String UNKNOWN_SYS_PROP = "Unknown"; /** * Mimetype used by Graal to identify ESM source code. diff --git a/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/JSFileSystem.java b/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/JSFileSystem.java index 386d5386..ea4deca9 100644 --- a/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/JSFileSystem.java +++ b/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/JSFileSystem.java @@ -33,7 +33,7 @@ public class JSFileSystem implements FileSystem { private static final String ROOT_JS_LIBS_DIR = "/META-INF/js/libs/"; - final private BundleContext bundleContext; + private final BundleContext bundleContext; JSFileSystem(BundleContext bundleContext) { this.bundleContext = bundleContext; diff --git a/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/JSNodeMapper.java b/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/JSNodeMapper.java index 28a6098e..37fa5677 100644 --- a/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/JSNodeMapper.java +++ b/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/JSNodeMapper.java @@ -111,7 +111,7 @@ private static Map toJSNodeProperties(Node node, boolean include jsProperties.put(property.getName(), Arrays.stream(property.getValues()) .map(ThrowingFunction.unchecked(value -> toJSNodePropertyValue(property, value))) - .collect(Collectors.toList())); + .toList()); } else { jsProperties.put(property.getName(), toJSNodePropertyValue(property, property.getValue())); } @@ -225,7 +225,7 @@ private static void toVirtualNodeProperty(JCRNodeWrapper node, String propertyNa if (epd != null && epd.isMultiple()) { if (value instanceof List && ((List) value).size() > 0) { List values = (List) value; - List stringList = values.stream().map(Object::toString).collect(Collectors.toUnmodifiableList()); + List stringList = values.stream().map(Object::toString).toList(); node.setProperty(propertyName, stringList.toArray(new String[stringList.size()])); } else { node.setProperty(propertyName, ((String) value).split(" ")); diff --git a/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/Registry.java b/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/Registry.java index abfeeef3..461d3aae 100644 --- a/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/Registry.java +++ b/javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/Registry.java @@ -18,7 +18,6 @@ import org.osgi.framework.Bundle; import java.util.*; -import java.util.stream.Collectors; import java.util.stream.Stream; public class Registry { @@ -48,7 +47,7 @@ public List> find(Map filter, String orderBy Comparator.nullsFirst(Comparator.reverseOrder()))); } - return filtered.collect(Collectors.toList()); + return filtered.toList(); } public void add(String type, String key, Map... arguments) {