Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8258147: Modernize Nashorn code #5

Closed
wants to merge 22 commits into from
Closed

8258147: Modernize Nashorn code #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
06c49f6
Use lambdas instead of anonymous inner classes
szegedi Nov 30, 2020
6418f3e
Use Set.of, List.of, List.sort, and Array.fill where possible
szegedi Nov 30, 2020
e81cd2c
Use diamonds where possible, and avoid unnecessary casts.
szegedi Dec 6, 2020
5c70272
MAke vars final
szegedi Dec 6, 2020
0626b40
Optimize string operations
szegedi Dec 6, 2020
60d9c91
unused imports
szegedi Dec 6, 2020
fa49f81
Use ConcurrentMap.computeIfAbsent and optimize list vs. array use
szegedi Dec 6, 2020
8f801e6
Simplify expressions
szegedi Dec 6, 2020
2e4d635
Remove a try/catch that only rethrows
szegedi Dec 6, 2020
4b7b0cb
Use try with resources
szegedi Dec 6, 2020
9f09664
Remove unnecessary "throws Exception" declarations (and one unused pa…
szegedi Dec 6, 2020
7541124
Dead code elimination
szegedi Dec 6, 2020
cc2cc83
Avoid boxing and explicit valueOf calls
szegedi Dec 6, 2020
759ffdc
Don't use C-style array types
szegedi Dec 6, 2020
31d7e5a
Remove unnecessary variable alias
szegedi Dec 6, 2020
cccf8f9
If condition always true
szegedi Dec 6, 2020
4f8777e
Extract sb.append(ch) from both branches
szegedi Dec 6, 2020
249a371
isEval flag in Context.compile is unused
szegedi Dec 6, 2020
5bed0d8
Don't return values from methods when they're always discarded
szegedi Dec 6, 2020
fd4c333
Javadoc fixes
szegedi Dec 6, 2020
4e62355
Don't use a single-case switch
szegedi Dec 6, 2020
768be72
Use enhanced for loop
szegedi Dec 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...org.openjdk.nashorn/share/classes/org/openjdk/nashorn/api/scripting/NashornException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ protected NashornException(final String msg, final String fileName, final int li
* @param column column number
*/
protected NashornException(final String msg, final Throwable cause, final String fileName, final int line, final int column) {
super(msg, cause == null ? null : cause);
super(msg, cause);
this.fileName = fileName;
this.line = line;
this.column = column;
Expand All @@ -94,7 +94,7 @@ protected NashornException(final String msg, final Throwable cause, final String
* @param cause exception cause
*/
protected NashornException(final String msg, final Throwable cause) {
super(msg, cause == null ? null : cause);
super(msg, cause);
// Hard luck - no column number info
this.column = -1;
// We can retrieve the line number and file name from the stack trace if needed
Expand Down
34 changes: 14 additions & 20 deletions ....openjdk.nashorn/share/classes/org/openjdk/nashorn/api/scripting/NashornScriptEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,17 +121,14 @@ private static String getMessage(final String msgId, final String... args) {
// throw ParseException on first error from script
final ErrorManager errMgr = new Context.ThrowErrorManager();
// create new Nashorn Context
this.nashornContext = AccessController.doPrivileged(new PrivilegedAction<Context>() {
@Override
public Context run() {
try {
return new Context(options, errMgr, appLoader, classFilter);
} catch (final RuntimeException e) {
if (Context.DEBUG) {
e.printStackTrace();
}
throw e;
this.nashornContext = AccessController.doPrivileged((PrivilegedAction<Context>) () -> {
try {
return new Context(options, errMgr, appLoader, classFilter);
} catch (final RuntimeException e) {
if (Context.DEBUG) {
e.printStackTrace();
}
throw e;
}
}, CREATE_CONTEXT_ACC_CTXT);

Expand Down Expand Up @@ -342,17 +339,14 @@ private ScriptObjectMirror createGlobalMirror() {

// Create a new Nashorn Global object
private Global createNashornGlobal() {
final Global newGlobal = AccessController.doPrivileged(new PrivilegedAction<Global>() {
@Override
public Global run() {
try {
return nashornContext.newGlobal();
} catch (final RuntimeException e) {
if (Context.DEBUG) {
e.printStackTrace();
}
throw e;
final Global newGlobal = AccessController.doPrivileged((PrivilegedAction<Global>) () -> {
try {
return nashornContext.newGlobal();
} catch (final RuntimeException e) {
if (Context.DEBUG) {
e.printStackTrace();
}
throw e;
}
}, CREATE_GLOBAL_ACC_CTXT);

Expand Down
3 changes: 1 addition & 2 deletions ...k.nashorn/share/classes/org/openjdk/nashorn/api/scripting/NashornScriptEngineFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

package org.openjdk.nashorn.api.scripting;

import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
Expand Down Expand Up @@ -272,7 +271,7 @@ private static void checkConfigPermission() {
}

private static List<String> immutableList(final String... elements) {
return Collections.unmodifiableList(Arrays.asList(elements));
return List.of(elements);
}

private static ClassLoader getAppClassLoader() {
Expand Down
Loading