You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2021/02/28 22:55:27 UTC
[commons-ognl] branch master updated: Use varargs.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-ognl.git
The following commit(s) were added to refs/heads/master by this push:
new 718f3d2 Use varargs.
718f3d2 is described below
commit 718f3d2111c5e0ab1649cc43065df33c882e1a7c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Feb 28 17:55:24 2021 -0500
Use varargs.
---
src/main/java/org/apache/commons/ognl/ObjectPropertyAccessor.java | 2 +-
src/main/java/org/apache/commons/ognl/OgnlException.java | 2 +-
src/test/java/org/apache/commons/ognl/test/ConstantTest.java | 2 +-
.../java/org/apache/commons/ognl/test/LambdaExpressionTest.java | 2 +-
src/test/java/org/apache/commons/ognl/test/Performance.java | 2 +-
.../org/apache/commons/ognl/test/ProjectionSelectionTest.java | 8 ++++----
src/test/java/org/apache/commons/ognl/test/PropertyTest.java | 4 ++--
src/test/java/org/apache/commons/ognl/test/objects/Root.java | 4 ++--
8 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/apache/commons/ognl/ObjectPropertyAccessor.java b/src/main/java/org/apache/commons/ognl/ObjectPropertyAccessor.java
index 5cb3d59..0c51728 100644
--- a/src/main/java/org/apache/commons/ognl/ObjectPropertyAccessor.java
+++ b/src/main/java/org/apache/commons/ognl/ObjectPropertyAccessor.java
@@ -90,7 +90,7 @@ public class ObjectPropertyAccessor
Method m = OgnlRuntime.getWriteMethod( target.getClass(), name );
if ( m != null )
{
- result = m.invoke( target, new Object[] { value } );
+ result = m.invoke( target, value );
}
}
}
diff --git a/src/main/java/org/apache/commons/ognl/OgnlException.java b/src/main/java/org/apache/commons/ognl/OgnlException.java
index 3aea0a9..a9da138 100644
--- a/src/main/java/org/apache/commons/ognl/OgnlException.java
+++ b/src/main/java/org/apache/commons/ognl/OgnlException.java
@@ -37,7 +37,7 @@ public class OgnlException
{
try
{
- initCause = OgnlException.class.getMethod( "initCause", new Class[] { Throwable.class } );
+ initCause = OgnlException.class.getMethod( "initCause", Throwable.class );
}
catch ( NoSuchMethodException e )
{
diff --git a/src/test/java/org/apache/commons/ognl/test/ConstantTest.java b/src/test/java/org/apache/commons/ognl/test/ConstantTest.java
index 34e627a..51ac9cc 100644
--- a/src/test/java/org/apache/commons/ognl/test/ConstantTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/ConstantTest.java
@@ -61,7 +61,7 @@ public class ConstantTest
{ "true", Boolean.TRUE },
{ "false", Boolean.FALSE },
{ "{ false, true, null, 0, 1. }",
- Arrays.asList( new Object[] { Boolean.FALSE, Boolean.TRUE, null, new Integer( 0 ), new Double( 1 ) } ) },
+ Arrays.asList( Boolean.FALSE, Boolean.TRUE, null, new Integer( 0 ), new Double( 1 ) ) },
{ "'HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"'",
"HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\"" }, };
diff --git a/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java b/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java
index e7a1014..3fc983b 100644
--- a/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/LambdaExpressionTest.java
@@ -42,7 +42,7 @@ public class LambdaExpressionTest
{ null, "#fact=:[#this<=1? 1 : #fact(#this-1) * #this], #fact(30h)",
new BigInteger( "265252859812191058636308480000000" ) },
{ null, "#bump = :[ #this.{ #this + 1 } ], (#bump)({ 1, 2, 3 })",
- new ArrayList( Arrays.asList( new Integer[] { new Integer( 2 ), new Integer( 3 ), new Integer( 4 ) } ) ) },
+ new ArrayList( Arrays.asList( new Integer( 2 ), new Integer( 3 ), new Integer( 4 ) ) ) },
{ null, "#call = :[ \"calling \" + [0] + \" on \" + [1] ], (#call)({ \"x\", \"y\" })", "calling x on y" },
};
diff --git a/src/test/java/org/apache/commons/ognl/test/Performance.java b/src/test/java/org/apache/commons/ognl/test/Performance.java
index 0cfaf39..798b676 100644
--- a/src/test/java/org/apache/commons/ognl/test/Performance.java
+++ b/src/test/java/org/apache/commons/ognl/test/Performance.java
@@ -275,7 +275,7 @@ public class Performance
try
{
- _method = getClass().getMethod( javaMethodName, new Class[] {} );
+ _method = getClass().getMethod( javaMethodName );
}
catch ( Exception ex )
{
diff --git a/src/test/java/org/apache/commons/ognl/test/ProjectionSelectionTest.java b/src/test/java/org/apache/commons/ognl/test/ProjectionSelectionTest.java
index ae5a8b0..094e444 100644
--- a/src/test/java/org/apache/commons/ognl/test/ProjectionSelectionTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/ProjectionSelectionTest.java
@@ -38,10 +38,10 @@ public class ProjectionSelectionTest
private static final Object[][] TESTS = {
// Projection, selection
{ ROOT, "array.{class}",
- Arrays.asList( new Class[] { Integer.class, Integer.class, Integer.class, Integer.class } ) },
- { ROOT, "map.array.{? #this > 2 }", Arrays.asList( new Integer[] { new Integer( 3 ), new Integer( 4 ) } ) },
- { ROOT, "map.array.{^ #this > 2 }", Arrays.asList( new Integer[] { new Integer( 3 ) } ) },
- { ROOT, "map.array.{$ #this > 2 }", Arrays.asList( new Integer[] { new Integer( 4 ) } ) },
+ Arrays.asList( Integer.class, Integer.class, Integer.class, Integer.class ) },
+ { ROOT, "map.array.{? #this > 2 }", Arrays.asList( new Integer( 3 ), new Integer( 4 ) ) },
+ { ROOT, "map.array.{^ #this > 2 }", Arrays.asList( new Integer( 3 ) ) },
+ { ROOT, "map.array.{$ #this > 2 }", Arrays.asList( new Integer( 4 ) ) },
{ ROOT, "map.array[*].{?true} instanceof java.util.Collection", Boolean.TRUE },
{ null, "#fact=1, 30H.{? #fact = #fact * (#this+1), false }, #fact",
new BigInteger( "265252859812191058636308480000000" ) }, };
diff --git a/src/test/java/org/apache/commons/ognl/test/PropertyTest.java b/src/test/java/org/apache/commons/ognl/test/PropertyTest.java
index bc66f48..b773874 100644
--- a/src/test/java/org/apache/commons/ognl/test/PropertyTest.java
+++ b/src/test/java/org/apache/commons/ognl/test/PropertyTest.java
@@ -81,9 +81,9 @@ public class PropertyTest
{ ROOT, "map[$].(#root == null ? 'empty' : #root)", ROOT },
{ ROOT, "((selected != null) && (currLocale.toString() == selected.toString())) ? 'first' : 'second'",
"first" },
- { ROOT, "{stringValue, getMap()}", Arrays.asList( new Object[] { ROOT.getStringValue(), ROOT.getMap() } ) },
+ { ROOT, "{stringValue, getMap()}", Arrays.asList( ROOT.getStringValue(), ROOT.getMap() ) },
{ ROOT, "{'stringValue', map[\"test\"].map[\"size\"]}",
- Arrays.asList( new Object[] { "stringValue", ROOT.getMap().get( "size" ) } ) },
+ Arrays.asList( "stringValue", ROOT.getMap().get( "size" ) ) },
{ ROOT, "property.bean3.value + '(this.checked)'", "100(this.checked)" },
{ ROOT, "getIndexedProperty(property.bean3.map[\"bar\"])", ROOT.getArray() },
{ ROOT, "getProperty().getBean3()", ( (Bean2) ROOT.getProperty() ).getBean3() },
diff --git a/src/test/java/org/apache/commons/ognl/test/objects/Root.java b/src/test/java/org/apache/commons/ognl/test/objects/Root.java
index 725189e..0b80266 100644
--- a/src/test/java/org/apache/commons/ognl/test/objects/Root.java
+++ b/src/test/java/org/apache/commons/ognl/test/objects/Root.java
@@ -41,9 +41,9 @@ public class Root
private final MyMap myMap = new MyMapImpl();
- private final List list = Arrays.asList( new Object[] { null, this, array } );
+ private final List list = Arrays.asList( null, this, array );
- private final List settableList = new ArrayList( Arrays.asList( new Object[] { "foo", "bar", "baz" } ) );
+ private final List settableList = new ArrayList( Arrays.asList( "foo", "bar", "baz" ) );
private final int index = 1;