Skip to content

Commit e4fffdd

Browse files
refactor: Cleanup code (address minor SonarQube issues)
1 parent dc689ed commit e4fffdd

8 files changed

Lines changed: 9 additions & 13 deletions

File tree

javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/JavascriptModuleListener.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import java.util.List;
3030
import java.util.Queue;
3131
import java.util.concurrent.ConcurrentLinkedQueue;
32-
import java.util.stream.Collectors;
3332

3433
import static org.jahia.modules.javascript.modules.engine.jshandler.JavascriptProtocolConnection.BUNDLE_HEADER_JAVASCRIPT_INIT_SCRIPT;
3534

@@ -100,14 +99,14 @@ public void bundleChanged(BundleEvent event) {
10099
}
101100
}
102101
} catch (Exception e) {
103-
logger.error("Cannot handle event {}", event.toString(), e);
102+
logger.error("Cannot handle event {}", event, e);
104103
}
105104
}
106105

107106
public List<Bundle> getJavascriptModules() {
108107
return Arrays.stream(engine.getBundleContext().getBundles())
109108
.filter(bundle -> bundle.getState() == Bundle.ACTIVE && isJavascriptModule(bundle))
110-
.collect(Collectors.toList());
109+
.toList();
111110
}
112111

113112
public boolean isJavascriptModule(Bundle bundle) {

javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/mock/MockJspWriter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.io.IOException;
2020
import java.io.PrintWriter;
2121
import java.io.StringWriter;
22-
import java.io.Writer;
2322

2423
/**
2524
* Mock implementation of the {@link javax.servlet.jsp.JspWriter} class.
@@ -48,7 +47,7 @@ private void init() {
4847
this.targetWriter = new PrintWriter(this.originalWriter);
4948
}
5049

51-
protected PrintWriter getTargetWriter() throws IOException {
50+
protected PrintWriter getTargetWriter() {
5251
return this.targetWriter;
5352
}
5453

javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/mock/MockPageContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public Object findAttribute(String name) {
106106
} else if (this.renderContext.getRequest().getSession().getAttribute(name) != null) {
107107
return this.renderContext.getRequest().getSession().getAttribute(name);
108108
} else {
109-
return this.appAttr.containsKey(name) ? this.appAttr.get(name) : null;
109+
return this.appAttr.getOrDefault(name, null);
110110
}
111111
}
112112

javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/js/server/RenderHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ private ProxyObject recursiveProxyMap(Map<String, Object> mapToProxy) {
513513
return recursiveProxyMap((Map<String, Object>) o);
514514
}
515515
return o;
516-
}).collect(Collectors.toList())));
516+
}).toList()));
517517
}
518518
}
519519
return ProxyObject.fromMap(mapToProxy);

javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/GraalVMEngine.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ public class GraalVMEngine {
5858
private static final Logger logger = LoggerFactory.getLogger(GraalVMEngine.class);
5959

6060
public static final String JS = "js";
61-
private static final String UNKNOWN_SYS_PROP = "Unknown";
6261

6362
/**
6463
* Mimetype used by Graal to identify ESM source code.

javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/JSFileSystem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
public class JSFileSystem implements FileSystem {
3434
private static final String ROOT_JS_LIBS_DIR = "/META-INF/js/libs/";
3535

36-
final private BundleContext bundleContext;
36+
private final BundleContext bundleContext;
3737

3838
JSFileSystem(BundleContext bundleContext) {
3939
this.bundleContext = bundleContext;

javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/JSNodeMapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ private static Map<String, Object> toJSNodeProperties(Node node, boolean include
111111
jsProperties.put(property.getName(),
112112
Arrays.stream(property.getValues())
113113
.map(ThrowingFunction.unchecked(value -> toJSNodePropertyValue(property, value)))
114-
.collect(Collectors.toList()));
114+
.toList());
115115
} else {
116116
jsProperties.put(property.getName(), toJSNodePropertyValue(property, property.getValue()));
117117
}
@@ -225,7 +225,7 @@ private static void toVirtualNodeProperty(JCRNodeWrapper node, String propertyNa
225225
if (epd != null && epd.isMultiple()) {
226226
if (value instanceof List && ((List) value).size() > 0) {
227227
List<?> values = (List<?>) value;
228-
List<String> stringList = values.stream().map(Object::toString).collect(Collectors.toUnmodifiableList());
228+
List<String> stringList = values.stream().map(Object::toString).toList();
229229
node.setProperty(propertyName, stringList.toArray(new String[stringList.size()]));
230230
} else {
231231
node.setProperty(propertyName, ((String) value).split(" "));

javascript-modules-engine-java/src/main/java/org/jahia/modules/javascript/modules/engine/jsengine/Registry.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.osgi.framework.Bundle;
1919

2020
import java.util.*;
21-
import java.util.stream.Collectors;
2221
import java.util.stream.Stream;
2322

2423
public class Registry {
@@ -48,7 +47,7 @@ public List<Map<String, Object>> find(Map<String, Object> filter, String orderBy
4847
Comparator.nullsFirst(Comparator.reverseOrder())));
4948
}
5049

51-
return filtered.collect(Collectors.toList());
50+
return filtered.toList();
5251
}
5352

5453
public void add(String type, String key, Map<String, Object>... arguments) {

0 commit comments

Comments
 (0)