From 835cac35faefcb38cd7d10cf3b98f444549067e4 Mon Sep 17 00:00:00 2001 From: Tony Germano Date: Thu, 5 Sep 2024 15:49:05 -0400 Subject: [PATCH] spotlessApply --- .../org/mozilla/javascript/NativeDate.java | 33 ++++++++------- .../org/mozilla/javascript/ScriptRuntime.java | 42 ++++++++++--------- 2 files changed, 42 insertions(+), 33 deletions(-) diff --git a/rhino/src/main/java/org/mozilla/javascript/NativeDate.java b/rhino/src/main/java/org/mozilla/javascript/NativeDate.java index f5b1029177..b231de28b2 100644 --- a/rhino/src/main/java/org/mozilla/javascript/NativeDate.java +++ b/rhino/src/main/java/org/mozilla/javascript/NativeDate.java @@ -298,7 +298,8 @@ public Object execIdCall( final String toISOString = "toISOString"; Scriptable o = ScriptRuntime.toObject(cx, scope, thisObj); - Object tv = ScriptRuntime.toPrimitive(o, Optional.of(ScriptRuntime.NumberClass)); + Object tv = + ScriptRuntime.toPrimitive(o, Optional.of(ScriptRuntime.NumberClass)); if (tv instanceof Number) { double d = ((Number) tv).doubleValue(); if (Double.isNaN(d) || Double.isInfinite(d)) { @@ -332,19 +333,23 @@ public Object execIdCall( Scriptable o = ScriptRuntime.toObject(cx, scope, thisObj); final Object arg0 = args.length > 0 ? args[0] : Undefined.instance; final Optional hint = - Optional.ofNullable(arg0 instanceof CharSequence ? arg0.toString() : null); - final Class tryFirst = hint - .map(h -> { - if (h.equals("string") || h.equals("default")) { - return ScriptRuntime.StringClass; - } else if (h.equals("number")) { - return ScriptRuntime.NumberClass; - } - return null; - }) - .orElseThrow(() -> ScriptRuntime.typeErrorById( - "msg.invalid.toprimitive.hint", - ScriptRuntime.toString(arg0))); + Optional.ofNullable( + arg0 instanceof CharSequence ? arg0.toString() : null); + final Class tryFirst = + hint.map( + h -> { + if (h.equals("string") || h.equals("default")) { + return ScriptRuntime.StringClass; + } else if (h.equals("number")) { + return ScriptRuntime.NumberClass; + } + return null; + }) + .orElseThrow( + () -> + ScriptRuntime.typeErrorById( + "msg.invalid.toprimitive.hint", + ScriptRuntime.toString(arg0))); return ScriptableObject.getDefaultValue(o, tryFirst); } } diff --git a/rhino/src/main/java/org/mozilla/javascript/ScriptRuntime.java b/rhino/src/main/java/org/mozilla/javascript/ScriptRuntime.java index ea09453b45..611f02a7ca 100644 --- a/rhino/src/main/java/org/mozilla/javascript/ScriptRuntime.java +++ b/rhino/src/main/java/org/mozilla/javascript/ScriptRuntime.java @@ -18,7 +18,6 @@ import java.util.Optional; import java.util.ResourceBundle; import java.util.function.BiConsumer; - import org.mozilla.javascript.ast.FunctionNode; import org.mozilla.javascript.v8dtoa.DoubleConversion; import org.mozilla.javascript.v8dtoa.FastDtoa; @@ -722,15 +721,13 @@ public static BigInteger toBigInt(Object val) { } else { double d = ((Number) val).doubleValue(); if (Double.isNaN(d) || Double.isInfinite(d)) { - throw rangeErrorById( - "msg.cant.convert.to.bigint.isnt.integer", toString(val)); + throw rangeErrorById("msg.cant.convert.to.bigint.isnt.integer", toString(val)); } BigDecimal bd = new BigDecimal(d, MathContext.UNLIMITED); try { return bd.toBigIntegerExact(); } catch (ArithmeticException e) { - throw rangeErrorById( - "msg.cant.convert.to.bigint.isnt.integer", toString(val)); + throw rangeErrorById("msg.cant.convert.to.bigint.isnt.integer", toString(val)); } } } @@ -2977,23 +2974,25 @@ public static Object add(Object lval, Object rval, Context cx) { if (lval instanceof BigInteger && rval instanceof BigInteger) { return ((BigInteger) lval).add((BigInteger) rval); } - if (lval instanceof Number && !(lval instanceof BigInteger) - && rval instanceof Number && !(rval instanceof BigInteger)) { + if (lval instanceof Number + && !(lval instanceof BigInteger) + && rval instanceof Number + && !(rval instanceof BigInteger)) { return wrapNumber(((Number) lval).doubleValue() + ((Number) rval).doubleValue()); } - + // spec starts here for abstract operation ApplyStringOrNumericBinaryOperator - // where opText is "+". + // where opText is "+". final Object lprim = toPrimitive(lval); final Object rprim = toPrimitive(rval); if (lprim instanceof CharSequence || rprim instanceof CharSequence) { - final CharSequence lstr = (lprim instanceof CharSequence) - ? (CharSequence) lprim : toString(lprim); - final CharSequence rstr = (rprim instanceof CharSequence) - ? (CharSequence) rprim : toString(rprim); + final CharSequence lstr = + (lprim instanceof CharSequence) ? (CharSequence) lprim : toString(lprim); + final CharSequence rstr = + (rprim instanceof CharSequence) ? (CharSequence) rprim : toString(rprim); return new ConsString(lstr, rstr); } - + // e4x extension start if (lval instanceof XMLObject) { Object test = ((XMLObject) lval).addValues(cx, true, rval); @@ -3471,7 +3470,7 @@ public static Object toPrimitive(Object input, Class preferredType) { return toPrimitive(input, Optional.ofNullable(preferredType)); } - /** + /* * 1. If input is an Object, then * a. Let exoticToPrim be ? GetMethod(input, @@toPrimitive). * b. If exoticToPrim is not undefined, then @@ -3488,6 +3487,8 @@ public static Object toPrimitive(Object input, Class preferredType) { * c. If preferredType is not present, let preferredType be number. * d. Return ? OrdinaryToPrimitive(input, preferredType). * 2. Return input. + / + /** * @param input * @param preferredType * @return @@ -3503,9 +3504,10 @@ public static Object toPrimitive(Object input, Optional> preferredType) final Function func = (Function) exoticToPrim; final Context cx = Context.getCurrentContext(); final Scriptable scope = func.getParentScope(); - final String hint = preferredType - .map(type -> type == StringClass ? "string" : "number") - .orElse("default"); + final String hint = + preferredType + .map(type -> type == StringClass ? "string" : "number") + .orElse("default"); final Object[] args = new Object[] {hint}; final Object result = func.call(cx, scope, s, args); if (isObject(result)) { @@ -3513,7 +3515,9 @@ public static Object toPrimitive(Object input, Optional> preferredType) } return result; } - if (!Undefined.isUndefined(exoticToPrim) && exoticToPrim != null && exoticToPrim != Scriptable.NOT_FOUND) { + if (!Undefined.isUndefined(exoticToPrim) + && exoticToPrim != null + && exoticToPrim != Scriptable.NOT_FOUND) { throw notFunctionError(exoticToPrim); } final Class defaultValueHint = preferredType.orElse(NumberClass);