svn commit: r1546799 - in /commons/proper/lang/trunk/src: changes/ main/java/org/apache/commons/lang3/reflect/ test/java/org/apache/commons/lang3/reflect/ test/java/org/apache/commons/lang3/reflect/te
Author: mcucchiara
Date: Sun Dec 1 10:34:02 2013
New Revision: 1546799
URL: http://svn.apache.org/r1546799
Log:
LANG-934 - Add removeFinalModifier to FieldUtils
Modified:
commons/proper/lang/trunk/src/changes/changes.xml
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/testbed/StaticContainer.java
Modified: commons/proper/lang/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/changes/changes.xml?rev=1546799&r1=1546798&r2=1546799&view=diff
==
--- commons/proper/lang/trunk/src/changes/changes.xml [utf-8] (original)
+++ commons/proper/lang/trunk/src/changes/changes.xml [utf-8] Sun Dec 1
10:34:02 2013
@@ -22,6 +22,7 @@
+Add
removeFinalModifier to FieldUtils
Method returns number of inheritance hops between parent and
subclass
Spelling fixes
Misleading Javadoc comment in StrBuilderReader class
Modified:
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java?rev=1546799&r1=1546798&r2=1546799&view=diff
==
---
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java
(original)
+++
commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/reflect/FieldUtils.java
Sun Dec 1 10:34:02 2013
@@ -16,15 +16,15 @@
*/
package org.apache.commons.lang3.reflect;
+import org.apache.commons.lang3.ClassUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
+
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.lang3.ClassUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.Validate;
-
/**
* Utilities for working with {@link Field}s by reflection. Adapted and
refactored from the dormant [reflect] Commons sandbox
* component.
@@ -666,6 +666,28 @@ public class FieldUtils {
}
/**
+ * Remove the final modifier from a {@link Field}
+ * @param field to remove the final modifier
+ * @throws IllegalArgumentException
+ * if the field is {@code null}
+ */
+public static void removeFinalModifier(Field field) {
+Validate.isTrue(field != null, "The field must not be null");
+
+try {
+if(Modifier.isFinal(field.getModifiers())){
+Field modifiersField =
Field.class.getDeclaredField("modifiers");
+modifiersField.setAccessible(true);
+modifiersField.setInt(field, field.getModifiers() &
~Modifier.FINAL);
+}
+} catch (NoSuchFieldException ignored) {
+// The field class contains always a modifiers field
+} catch (IllegalAccessException ignored) {
+ // The modifiers field is made accessible
+}
+}
+
+/**
* Writes a {@code public} {@link Field}. Superclasses will be considered.
*
* @param target
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java?rev=1546799&r1=1546798&r2=1546799&view=diff
==
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java
Sun Dec 1 10:34:02 2013
@@ -1253,4 +1253,11 @@ public class FieldUtilsTest {
FieldUtils.getField(Ambig.class, "VALUE");
}
+@Test
+public void testRemoveFinalModifier() throws Exception {
+Field field =
StaticContainer.class.getDeclaredField("IMMUTABLE_PRIVATE_2");
+assertTrue(Modifier.isFinal(field.getModifiers()));
+FieldUtils.removeFinalModifier(field);
+assertFalse(Modifier.isFinal(field.getModifiers()));
+}
}
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/testbed/StaticContainer.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/testbed/StaticContainer.java?rev=1546799&r1=1546798&r2=1546799&view=diff
==
---
commons/proper/lang/
svn commit: r1546797 - /commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java
Author: mcucchiara
Date: Sun Dec 1 10:08:18 2013
New Revision: 1546797
URL: http://svn.apache.org/r1546797
Log:
Restored explicit boxes (see http://goo.gl/uN6xQl)
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java?rev=1546797&r1=1546796&r2=1546797&view=diff
==
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java
Sun Dec 1 10:08:18 2013
@@ -38,10 +38,10 @@ import static org.junit.Assume.assumeNot
*/
public class FieldUtilsTest {
-static final Integer I0 = 0;
-static final Integer I1 = 1;
-static final Double D0 = 0.0;
-static final Double D1 = 1.0;
+static final Integer I0 = Integer.valueOf(0);
+static final Integer I1 = Integer.valueOf(1);
+static final Double D0 = Double.valueOf(0.0);
+static final Double D1 = Double.valueOf(1.0);
private PublicChild publicChild;
private PubliclyShadowedChild publiclyShadowedChild;
@@ -1028,13 +1028,13 @@ public class FieldUtilsTest {
}
field = parentClass.getDeclaredField("i");
try {
-FieldUtils.writeField(field, publicChild, Integer.MAX_VALUE);
+FieldUtils.writeField(field, publicChild,
Integer.valueOf(Integer.MAX_VALUE));
} catch (final IllegalAccessException e) {
// pass
}
field = parentClass.getDeclaredField("d");
try {
-FieldUtils.writeField(field, publicChild, Double.MAX_VALUE);
+FieldUtils.writeField(field, publicChild,
Double.valueOf(Double.MAX_VALUE));
} catch (final IllegalAccessException e) {
// pass
}
@@ -1049,11 +1049,11 @@ public class FieldUtilsTest {
FieldUtils.writeField(field, publicChild, Boolean.TRUE, true);
assertEquals(Boolean.TRUE, field.get(publicChild));
field = parentClass.getDeclaredField("i");
-FieldUtils.writeField(field, publicChild, Integer.MAX_VALUE, true);
-assertEquals(Integer.MAX_VALUE, field.get(publicChild));
+FieldUtils.writeField(field, publicChild,
Integer.valueOf(Integer.MAX_VALUE), true);
+assertEquals(Integer.valueOf(Integer.MAX_VALUE),
field.get(publicChild));
field = parentClass.getDeclaredField("d");
-FieldUtils.writeField(field, publicChild, Double.MAX_VALUE, true);
-assertEquals(Double.MAX_VALUE, field.get(publicChild));
+FieldUtils.writeField(field, publicChild,
Double.valueOf(Double.MAX_VALUE), true);
+assertEquals(Double.valueOf(Double.MAX_VALUE), field.get(publicChild));
}
@Test
@@ -1067,13 +1067,13 @@ public class FieldUtilsTest {
// pass
}
try {
-FieldUtils.writeField(publicChild, "i", 1);
+FieldUtils.writeField(publicChild, "i", Integer.valueOf(1));
fail("Expected IllegalArgumentException");
} catch (final IllegalArgumentException e) {
// pass
}
try {
-FieldUtils.writeField(publicChild, "d", 1.0);
+FieldUtils.writeField(publicChild, "d", Double.valueOf(1.0));
fail("Expected IllegalArgumentException");
} catch (final IllegalArgumentException e) {
// pass
@@ -1083,10 +1083,10 @@ public class FieldUtilsTest {
assertEquals("S", FieldUtils.readField(publiclyShadowedChild, "s"));
FieldUtils.writeField(publiclyShadowedChild, "b", Boolean.FALSE);
assertEquals(Boolean.FALSE,
FieldUtils.readField(publiclyShadowedChild, "b"));
-FieldUtils.writeField(publiclyShadowedChild, "i", 0);
-assertEquals(0, FieldUtils.readField(publiclyShadowedChild, "i"));
-FieldUtils.writeField(publiclyShadowedChild, "d", 0.0);
-assertEquals(0.0, FieldUtils.readField(publiclyShadowedChild, "d"));
+FieldUtils.writeField(publiclyShadowedChild, "i", Integer.valueOf(0));
+assertEquals(Integer.valueOf(0),
FieldUtils.readField(publiclyShadowedChild, "i"));
+FieldUtils.writeField(publiclyShadowedChild, "d", Double.valueOf(0.0));
+assertEquals(Double.valueOf(0.0),
FieldUtils.readField(publiclyShadowedChild, "d"));
FieldUtils.writeField(privatelyShadowedChild, "s", "S");
assertEquals("S&
svn commit: r1544770 - /commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java
Author: mcucchiara
Date: Sat Nov 23 11:11:28 2013
New Revision: 1544770
URL: http://svn.apache.org/r1544770
Log:
Minor code optimizations:
* removed boxing
* removed unused variables
* removed useless casts* removed boxing
* removed unused variables
* removed useless casts
* replaced asArrayList method with Arrays.asList
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java?rev=1544770&r1=1544769&r2=1544770&view=diff
==
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/reflect/FieldUtilsTest.java
Sat Nov 23 11:11:28 2013
@@ -16,31 +16,20 @@
*/
package org.apache.commons.lang3.reflect;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeNotNull;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.reflect.testbed.*;
+import org.junit.Before;
+import org.junit.Test;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.reflect.testbed.Ambig;
-import org.apache.commons.lang3.reflect.testbed.Foo;
-import org.apache.commons.lang3.reflect.testbed.PrivatelyShadowedChild;
-import org.apache.commons.lang3.reflect.testbed.PublicChild;
-import org.apache.commons.lang3.reflect.testbed.PubliclyShadowedChild;
-import org.apache.commons.lang3.reflect.testbed.StaticContainer;
-import org.apache.commons.lang3.reflect.testbed.StaticContainerChild;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.junit.Assume.assumeNotNull;
/**
* Unit tests FieldUtils
@@ -49,12 +38,10 @@ import org.junit.Test;
*/
public class FieldUtilsTest {
-static final String S = "s";
-static final String SS = "ss";
-static final Integer I0 = Integer.valueOf(0);
-static final Integer I1 = Integer.valueOf(1);
-static final Double D0 = Double.valueOf(0.0);
-static final Double D1 = Double.valueOf(1.0);
+static final Integer I0 = 0;
+static final Integer I1 = 1;
+static final Double D0 = 0.0;
+static final Double D1 = 1.0;
private PublicChild publicChild;
private PubliclyShadowedChild publiclyShadowedChild;
@@ -167,20 +154,12 @@ public class FieldUtilsTest {
assertEquals(5, FieldUtils.getAllFields(PublicChild.class).length);
}
-private List asArrayList(T... values) {
-final ArrayList arrayList = new ArrayList();
-for (T t : values) {
-arrayList.add(t);
-}
-return arrayList;
-}
-
@Test
public void testGetAllFieldsList() {
assertEquals(0, FieldUtils.getAllFieldsList(Object.class).size());
-final List fieldsNumber =
asArrayList(Number.class.getDeclaredFields());
+final List fieldsNumber =
Arrays.asList(Number.class.getDeclaredFields());
assertEquals(fieldsNumber, FieldUtils.getAllFieldsList(Number.class));
-final List fieldsInteger =
asArrayList(Integer.class.getDeclaredFields());
+final List fieldsInteger =
Arrays.asList(Integer.class.getDeclaredFields());
final List allFieldsInteger = new
ArrayList(fieldsInteger);
allFieldsInteger.addAll(fieldsNumber);
assertEquals(allFieldsInteger,
FieldUtils.getAllFieldsList(Integer.class));
@@ -462,7 +441,7 @@ public class FieldUtilsTest {
assertEquals(D0, FieldUtils.readField(parentD,
privatelyShadowedChild));
try {
-FieldUtils.readField((Field) null, publicChild);
+FieldUtils.readField(null, publicChild);
fail("a null field should cause an IllegalArgumentException");
} catch (final IllegalArgumentException e) {
// expected
@@ -493,7 +472,7 @@ public class FieldUtilsTest {
assertEquals(D0, FieldUtils.readField(parentD, privatelyShadowedChild,
true));
try {
-FieldUtils.readField((Field) null, publicChild, true);
+FieldUtils.readField(null, publicChild, true);
fail("a null field should cause an IllegalArgumentException")
svn commit: r1466816 - /commons/proper/functor/trunk/src/site/xdoc/examples.xml
Author: mcucchiara
Date: Thu Apr 11 09:53:39 2013
New Revision: 1466816
URL: http://svn.apache.org/r1466816
Log:
Fixed broken links
Modified:
commons/proper/functor/trunk/src/site/xdoc/examples.xml
Modified: commons/proper/functor/trunk/src/site/xdoc/examples.xml
URL:
http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/site/xdoc/examples.xml?rev=1466816&r1=1466815&r2=1466816&view=diff
==
--- commons/proper/functor/trunk/src/site/xdoc/examples.xml (original)
+++ commons/proper/functor/trunk/src/site/xdoc/examples.xml Thu Apr 11 09:53:39
2013
@@ -169,13 +169,13 @@ for( Integer number : numbers ) {
The
- http://svn.apache.org/repos/asf/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/FlexiMapExample.java";>FlexiMap
example
+ http://svn.apache.org/repos/asf/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/FlexiMapExample.java";>FlexiMap
example
applies this design to java.util.Map, demonstrating how
"pluggable" functors can be applied to a generic Map
structure in order
- to introduce new behaviors. The http://svn.apache.org/repos/asf/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/map";>map
+ to introduce new behaviors. The http://svn.apache.org/repos/asf/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/map";>map
package is a more complete example of this, implementing a number of
the Commons-Collections Maps
derived from a base
- http://svn.apache.org/repos/asf/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/map/FunctoredMap.java";>FunctoredMap.
+ http://svn.apache.org/repos/asf/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/map/FunctoredMap.java";>FunctoredMap.
@@ -220,7 +220,7 @@ CompositeUnaryProcedure<Integer> c
filteredGenerator.run(compositeProcedure.of(doubler));
- The http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/lines/";>lines
+ The http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/lines/";>lines
package demonstrates a functional approach to IO using Generators and
the Algorithms class.
@@ -233,14 +233,14 @@ filteredGenerator.run(compositeProcedure
First such set of example involves the usage of the nostore
Aggregator. Code can be found in
- http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/aggregator/nostore/";>org.apache.commons.functor.example.aggregator.nostore.
+ http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/aggregator/nostore/";>org.apache.commons.functor.example.aggregator.nostore.
This shows how can you use an aggregator which doesn't store the data
series and processes them on the fly.
Also, there are examples provided which show how can you implement
your own aggregation function
to be used with this Aggregator type.
For using an Aggregator which stores the data series in
a list, examples are in
- http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/aggregator/list/";>org.apache.commons.functor.example.aggregator.list.
+ http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/aggregator/list/";>org.apache.commons.functor.example.aggregator.list.
This shows how can you use the ArrayList-backed
aggregator or provide your own List-based implementation.
Also, there are examples provided which show how can you implement
your own aggregation function
to be used with this Aggregator type.
@@ -264,33 +264,33 @@ filteredGenerator.run(compositeProcedure
Commons-Functor library.
-http://svn.apache.org/viewvc/commons/proper/functor/trunk/src/test/java/org/apache/commons/functor/example/kata/one/";>Kata
One: Supermarket Pricing
+http://svn.apache.org/viewvc/commons/proper/functor/trunk/core/src/test/java/org/apache/commons/functor/example/kata/one/";>Kata
One: Supermarket Pricing
Dave's http://pragprog.com/pragdave/Practices/Kata/KataOne.rdoc,v";>Kata One
asks how
one might implement supermarket pricing rules, like "three for a
dollar" or "buy two get one free".
svn commit: r1461005 - in /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl: ASTAdd.java ASTAnd.java ArrayPropertyAccessor.java
Author: mcucchiara
Date: Tue Mar 26 08:00:18 2013
New Revision: 1461005
URL: http://svn.apache.org/r1461005
Log:
Used string format instead of string concatenation
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java?rev=1461005&r1=1461004&r2=1461005&view=diff
==
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java
(original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java
Tue Mar 26 08:00:18 2013
@@ -24,6 +24,8 @@ import org.apache.commons.ognl.enhance.E
import java.math.BigDecimal;
import java.math.BigInteger;
+import static java.lang.String.format;
+
/**
* $Id$
*/
@@ -153,15 +155,14 @@ class ASTAdd
Object cast = context.get( ExpressionCompiler.PRE_CAST );
-for ( int i = 0; i < children.length; ++i )
+for ( Node aChildren : children )
{
-children[i].toGetSourceString( context, target );
+aChildren.toGetSourceString( context, target );
-if ( NodeType.class.isInstance( children[i] )
-&& ( (NodeType) children[i] ).getGetterClass() != null
-&& isWider( (NodeType) children[i], lastType ) )
+if ( NodeType.class.isInstance( aChildren ) && (
(NodeType) aChildren ).getGetterClass() != null
+&& isWider( (NodeType) aChildren, lastType ) )
{
-lastType = (NodeType) children[i];
+lastType = (NodeType) aChildren;
}
}
@@ -275,7 +276,7 @@ class ASTAdd
// System.out.println("Input expr >>" + expr +
"<<");
expr = expr.replaceAll( """, "\"" );
expr = expr.replaceAll( "\"", "'" );
-expr = "\"" + expr + "\"";
+expr = format( "\"%s\"", expr );
// System.out.println("Expr now >>" + expr +
"<<");
}
}
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java?rev=1461005&r1=1461004&r2=1461005&view=diff
==
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java
(original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAnd.java
Tue Mar 26 08:00:18 2013
@@ -22,6 +22,8 @@ package org.apache.commons.ognl;
import org.apache.commons.ognl.enhance.ExpressionCompiler;
import org.apache.commons.ognl.enhance.UnsupportedCompilationException;
+import static java.lang.String.format;
+
/**
* $Id$
*/
@@ -150,16 +152,7 @@ public class ASTAnd
second = OgnlRuntime.getCompiler( context
).createLocalReference( context, second, context.getCurrentType() );
}
-result += "(org.apache.commons.ognl.OgnlOps.booleanValue(" + first
+ ")";
-
-result += " ? ";
-
-result += " ($w) (" + second + ")";
-result += " : ";
-
-result += " ($w) (" + first + ")";
-
-result += ")";
+result += format(
"(org.apache.commons.ognl.OgnlOps.booleanValue(%s) ? ($w) (%s) : ($w) (%s))",
first, second, first );
context.setCurrentObject( target );
context.setCurrentType( Object.class );
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java?rev=1461005&r1=1461004&r2=1461005&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apac
svn commit: r1460879 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MethodFailedException.java
Author: mcucchiara
Date: Mon Mar 25 20:35:05 2013
New Revision: 1460879
URL: http://svn.apache.org/r1460879
Log:
Removed deprecated constructor, furthermore initialSize var was unused
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MethodFailedException.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MethodFailedException.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MethodFailedException.java?rev=1460879&r1=1460878&r2=1460879&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MethodFailedException.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MethodFailedException.java
Mon Mar 25 20:35:05 2013
@@ -19,6 +19,8 @@ package org.apache.commons.ognl;
* under the License.
*/
+import static java.lang.String.format;
+
/**
* Exception thrown if a method or constructor call fails.
*/
@@ -29,11 +31,11 @@ public class MethodFailedException
public MethodFailedException( Object source, String name )
{
-super( "Method \"" + name + "\" failed for object " + source );
+super( format( "Method \"%s\" failed for object %s", name, source ) );
}
public MethodFailedException( Object source, String name, Throwable reason
)
{
-super( "Method \"" + name + "\" failed for object " + source, reason );
+super( format( "Method \"%s\" failed for object %s", name, source ),
reason );
}
}
svn commit: r1460861 - in /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl: ./ internal/ internal/entry/
Author: mcucchiara
Date: Mon Mar 25 19:51:36 2013
New Revision: 1460861
URL: http://svn.apache.org/r1460861
Log:
Combined nested if statements
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ToStringVisitor.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCache.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapCache.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockCache.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java?rev=1460861&r1=1460860&r2=1460861&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
Mon Mar 25 19:51:36 2013
@@ -477,12 +477,9 @@ public class OgnlRuntime
{
Object result;
-if ( securityManager != null )
+if ( securityManager != null && !cache.getMethodPerm( method ) )
{
-if ( !cache.getMethodPerm( method ) )
-{
-throw new IllegalAccessException( "Method [" + method + "]
cannot be accessed." );
-}
+throw new IllegalAccessException( "Method [" + method + "] cannot
be accessed." );
}
MethodAccessEntryValue entry = cache.getMethodAccess( method );
@@ -2031,9 +2028,8 @@ public class OgnlRuntime
}
else if ( numParms < 0 )
{
-if ( ( method != null
-&& method.getParameterTypes().length >
methodDescriptor.getMethod().getParameterTypes().length )
-|| method == null )
+if ( method == null || (
method.getParameterTypes().length
+>
methodDescriptor.getMethod().getParameterTypes().length ) )
{
method = methodDescriptor.getMethod();
}
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java?rev=1460861&r1=1460860&r2=1460861&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java
Mon Mar 25 19:51:36 2013
@@ -382,13 +382,11 @@ public abstract class SimpleNode
}
for ( Node child : children )
{
-if ( child instanceof SimpleNode )
+if ( child instanceof SimpleNode && ( (SimpleNode) child
).isEvalChain( context ) )
{
-if ( ( (SimpleNode) child ).isEvalChain( context ) )
-{
-return true;
-}
+return true;
}
+
}
return false;
}
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ToStringVisitor.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ToStringVisitor.java?rev=1460861&r1=1460860&r2=1460861&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ToStringVisitor.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ToStringVisitor.java
Mon Mar 25 19:51:36 2013
@@ -241,13 +241,10 @@ public class ToStringVisitor
{
for ( int i = 0; i < node.children.length; i++ )
{
-if ( i > 0 )
+if ( i > 0 && !( node.children[i] instanceof ASTProperty )
+|| !( (ASTProperty) node.children[i] ).isIndexedAccess() )
{
-if ( !( node.children[i] instanceof ASTProperty )
-|| !( (ASTProperty) node.children[i]
).isIndexedAccess()
svn commit: r1460863 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/EvaluationPool.java
Author: mcucchiara
Date: Mon Mar 25 19:55:49 2013
New Revision: 1460863
URL: http://svn.apache.org/r1460863
Log:
Removed deprecated constructor, furthermore initialSize var was unused
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/EvaluationPool.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/EvaluationPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/EvaluationPool.java?rev=1460863&r1=1460862&r2=1460863&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/EvaluationPool.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/EvaluationPool.java
Mon Mar 25 19:55:49 2013
@@ -28,17 +28,6 @@ public final class EvaluationPool
{
public EvaluationPool()
{
-this( 0 );
-}
-
-/*
- * @deprecated evaluation-pool now relies on the jvm garbage collection
- * therefore providing an initialSize is unnecessary
- */
-public EvaluationPool( int initialSize )
-{
-super();
-// do not init object pooling
}
/**
svn commit: r1239219 - in /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl: OgnlRuntime.java internal/entry/PropertyDescriptorCacheEntryFactory.java
Author: mcucchiara
Date: Wed Feb 1 17:27:54 2012
New Revision: 1239219
URL: http://svn.apache.org/viewvc?rev=1239219&view=rev
Log:
Moved ex-private method to the unique consumer
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java?rev=1239219&r1=1239218&r2=1239219&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
Wed Feb 1 17:27:54 2012
@@ -101,17 +101,17 @@ public class OgnlRuntime
/**
* Java beans standard set method prefix.
*/
-private static final String SET_PREFIX = "set";
+public static final String SET_PREFIX = "set";
/**
* Java beans standard get method prefix.
*/
-private static final String GET_PREFIX = "get";
+public static final String GET_PREFIX = "get";
/**
* Java beans standard is boolean getter prefix.
*/
-private static final String IS_PREFIX = "is";
+public static final String IS_PREFIX = "is";
/**
* Prefix padding for hexadecimal numbers to HEX_LENGTH.
@@ -1571,141 +1571,6 @@ public class OgnlRuntime
return hasSetMethod( context, target, targetClass, name ) || hasField(
context, target, targetClass, name );
}
-private static boolean indexMethodCheck( List methods )
-throws CacheException
-{
-boolean result = false;
-
-if ( methods.size() > 0 )
-{
-Method method = methods.get( 0 );
-Class[] parameterTypes = getParameterTypes( method );
-int numParameterTypes = parameterTypes.length;
-Class lastMethodClass = method.getDeclaringClass();
-
-result = true;
-for ( int i = 1; result && ( i < methods.size() ); i++ )
-{
-Class clazz = methods.get( i ).getDeclaringClass();
-
-// Check to see if more than one method implemented per class
-if ( lastMethodClass == clazz )
-{
-result = false;
-}
-else
-{
-Class[] mpt = getParameterTypes( method );
-int mpc = parameterTypes.length;
-
-if ( numParameterTypes != mpc )
-{
-result = false;
-}
-for ( int j = 0; j < numParameterTypes; j++ )
-{
-if ( parameterTypes[j] != mpt[j] )
-{
-result = false;
-break;
-}
-}
-}
-lastMethodClass = clazz;
-}
-}
-return result;
-}
-
-//TODO: again, this method was local
-public static void findObjectIndexedPropertyDescriptors( Class
targetClass,
- Map intoMap )
-throws OgnlException
-{
-Map> allMethods = getMethods( targetClass, false
);
-Map> pairs = new HashMap>(
101 );
-
-for ( Map.Entry> entry : allMethods.entrySet() )
-{
-String methodName = entry.getKey();
-List methods = entry.getValue();
-
-/*
- * Only process set/get where there is exactly one implementation
of the method per class and those
- * implementations are all the same
- */
-if ( indexMethodCheck( methods ) )
-{
-boolean isGet = false, isSet;
-Method method = methods.get( 0 );
-
-if ( ( ( isSet = methodName.startsWith( SET_PREFIX ) ) || (
isGet =
-methodName.startsWith( GET_PREFIX ) ) ) && (
methodName.length() > 3 ) )
-{
-String propertyName = Introspector.decapitalize(
methodName.substring( 3 ) );
-Class[] parameterTypes = getParameterTypes( method );
-int parameterCount = parameterTypes.length;
-
-if ( isGet && ( parameterCount == 1 ) && (
method.getReturnType() != Void.TYPE ) )
-{
-List pair = pairs.get( propertyName );
-
-
svn commit: r1239216 - in /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl: DefaultTypeConverter.java ObjectMethodAccessor.java OgnlOps.java OgnlRuntime.java TypeConverter.java interna
Author: mcucchiara
Date: Wed Feb 1 17:25:11 2012
New Revision: 1239216
URL: http://svn.apache.org/viewvc?rev=1239216&view=rev
Log:
Recovered the api layout (see http://goo.gl/KzeDH)
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/DefaultTypeConverter.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectMethodAccessor.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/TypeConverter.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/CacheException.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/DefaultTypeConverter.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/DefaultTypeConverter.java?rev=1239216&r1=1239215&r2=1239216&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/DefaultTypeConverter.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/DefaultTypeConverter.java
Wed Feb 1 17:25:11 2012
@@ -33,7 +33,6 @@ public class DefaultTypeConverter
{
public T convertValue( Map context, Object value,
Class toType )
-throws OgnlException
{
@SuppressWarnings( "unchecked" ) // type checking performed in
OgnlOps.convertValue( value, toType )
T ret = (T) OgnlOps.convertValue( value, toType );
@@ -45,7 +44,6 @@ public class DefaultTypeConverter
*/
public T convertValue( Map context, Object target,
Member member, String propertyName,
Object value, Class toType )
-throws OgnlException
{
return convertValue( context, value, toType );
}
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectMethodAccessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectMethodAccessor.java?rev=1239216&r1=1239215&r2=1239216&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectMethodAccessor.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectMethodAccessor.java
Wed Feb 1 17:25:11 2012
@@ -39,7 +39,7 @@ public class ObjectMethodAccessor
*/
public Object callStaticMethod( Map context, Class
targetClass, String methodName,
Object[] args )
-throws OgnlException
+throws MethodFailedException
{
List methods = OgnlRuntime.getMethods( targetClass,
methodName, true );
@@ -51,7 +51,7 @@ public class ObjectMethodAccessor
* {@inheritDoc}
*/
public Object callMethod( Map context, Object target,
String methodName, Object[] args )
-throws OgnlException
+throws MethodFailedException
{
Class targetClass = ( target == null ) ? null : target.getClass();
List methods = OgnlRuntime.getMethods( targetClass,
methodName, false );
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java?rev=1239216&r1=1239215&r2=1239216&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java
Wed Feb 1 17:25:11 2012
@@ -606,7 +606,6 @@ public abstract class OgnlOps
* @return converted value of the type given, or value if the value cannot
be converted to the given type.
*/
public static Object convertValue( Object value, Class toType )
-throws OgnlException
{
return convertValue( value, toType, false );
}
@@ -662,7 +661,6 @@ public abstract class OgnlOps
}
public static Object convertValue( Object value, Class toType,
boolean preventNulls )
-throws OgnlException
{
Object result = null;
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java?rev=1239216&r1=1239215&r2=1239216&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
Wed Feb
svn commit: r1235614 - in /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl: ASTEval.java SimpleNode.java
Author: mcucchiara
Date: Wed Jan 25 03:31:12 2012
New Revision: 1235614
URL: http://svn.apache.org/viewvc?rev=1235614&view=rev
Log:
Added a method to identify an eval expression (necessary to fix a security
issue on struts, see https://cwiki.apache.org/confluence/display/WW/S2-009)
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEval.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEval.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEval.java?rev=1235614&r1=1235613&r2=1235614&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEval.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTEval.java
Wed Jan 25 03:31:12 2012
@@ -94,4 +94,11 @@ class ASTEval
{
return visitor.visit( this, data );
}
+
+@Override
+public boolean isEvalChain( OgnlContext context )
+throws OgnlException
+{
+return true;
+}
}
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java?rev=1235614&r1=1235613&r2=1235614&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SimpleNode.java
Wed Jan 25 03:31:12 2012
@@ -377,6 +377,26 @@ public abstract class SimpleNode
return isSimpleProperty( context );
}
+public boolean isEvalChain( OgnlContext context )
+throws OgnlException
+{
+if ( children == null )
+{
+return false;
+}
+for ( Node child : children )
+{
+if ( child instanceof SimpleNode )
+{
+if ( ( (SimpleNode) child ).isEvalChain( context ) )
+{
+return true;
+}
+}
+}
+return false;
+}
+
protected boolean lastChild( OgnlContext context )
{
return parent == null || context.get( "_lastChild" ) != null;
svn commit: r1230454 - in /commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test: ArrayCreationTest.java ArrayElementsTest.java enhance/TestExpressionCompiler.java
Author: mcucchiara
Date: Thu Jan 12 09:35:53 2012
New Revision: 1230454
URL: http://svn.apache.org/viewvc?rev=1230454&view=rev
Log:
Removed boxing, used for each loop,
Modified:
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/enhance/TestExpressionCompiler.java
Modified:
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java?rev=1230454&r1=1230453&r2=1230454&view=diff
==
---
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java
(original)
+++
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayCreationTest.java
Thu Jan 12 09:35:53 2012
@@ -43,7 +43,7 @@ public class ArrayCreationTest
{ ROOT, "new String[] { \"one\", \"two\" }", new String[] { "one",
"two" } },
{ ROOT, "new String[] { 1, 2 }", new String[] { "1", "2" } },
{ ROOT, "new Integer[] { \"1\", 2, \"3\" }",
-new Integer[] { new Integer( 1 ), new Integer( 2 ), new
Integer( 3 ) } },
+new Integer[] { 1, 2, 3 } },
{ ROOT, "new String[10]", new String[10] },
{ ROOT, "new Object[4] { #root, #this }",
ExpressionSyntaxException.class },
{ ROOT, "new Object[4]", new Object[4] },
@@ -69,28 +69,28 @@ public class ArrayCreationTest
public static Collection data()
{
Collection data = new ArrayList(TESTS.length);
-for ( int i = 0; i < TESTS.length; i++ )
+for ( Object[] TEST : TESTS )
{
Object[] tmp = new Object[6];
-tmp[0] = TESTS[i][1];
-tmp[1] = TESTS[i][0];
-tmp[2] = TESTS[i][1];
+tmp[0] = TEST[1];
+tmp[1] = TEST[0];
+tmp[2] = TEST[1];
-switch ( TESTS[i].length )
+switch ( TEST.length )
{
case 3:
-tmp[3] = TESTS[i][2];
+tmp[3] = TEST[2];
break;
case 4:
-tmp[3] = TESTS[i][2];
-tmp[4] = TESTS[i][3];
+tmp[3] = TEST[2];
+tmp[4] = TEST[3];
break;
case 5:
-tmp[3] = TESTS[i][2];
-tmp[4] = TESTS[i][3];
-tmp[5] = TESTS[i][4];
+tmp[3] = TEST[2];
+tmp[4] = TEST[3];
+tmp[5] = TEST[4];
break;
default:
Modified:
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java?rev=1230454&r1=1230453&r2=1230454&view=diff
==
---
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java
(original)
+++
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/ArrayElementsTest.java
Thu Jan 12 09:35:53 2012
@@ -42,18 +42,18 @@ public class ArrayElementsTest
private static Object[][] TESTS = {
// Array elements test
-{ STRING_ARRAY, "length", new Integer( 2 ) },
+{ STRING_ARRAY, "length", 2 },
{ STRING_ARRAY, "#root[1]", "world" },
-{ INT_ARRAY, "#root[1]", new Integer( 20 ) },
-{ INT_ARRAY, "#root[1]", new Integer( 20 ), "50", new Integer( 50 ) },
-{ INT_ARRAY, "#root[1]", new Integer( 50 ), new String[] { "50", "100"
}, new Integer( 50 ) },
-{ ROOT, "intValue", new Integer( 0 ), new String[] { "50", "100" },
new Integer( 50 ) },
+{ INT_ARRAY, "#root[1]", 20 },
+{ INT_ARRAY, "#root[1]", 20, "50", 50 },
+{ INT_ARRAY, "#root[1]", 50, new String[] { "50", "100" }, 50 },
+{ ROOT, "intValue", 0, new String[] { "50", "100" }, 50 },
{ ROOT, "array", ROOT.getArray(), new String[] { "50", "100" }, new
int[] { 50, 100 } },
-{ null, "\"{Hello}\".toCharArray()[6]", new Character(
svn commit: r1205748 - /commons/proper/ognl/trunk/pom.xml
Author: mcucchiara
Date: Thu Nov 24 08:19:16 2011
New Revision: 1205748
URL: http://svn.apache.org/viewvc?rev=1205748&view=rev
Log:
This is not DirectMemory
Modified:
commons/proper/ognl/trunk/pom.xml
Modified: commons/proper/ognl/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/pom.xml?rev=1205748&r1=1205747&r2=1205748&view=diff
==
--- commons/proper/ognl/trunk/pom.xml (original)
+++ commons/proper/ognl/trunk/pom.xml Thu Nov 24 08:19:16 2011
@@ -483,7 +483,7 @@ limitations under the License.
${project.build.directory}/benchmarks.xml
${project.build.directory}/site
- -Xmx512m -Xms512m -XX:MaxDirectMemorySize=512m
+ -Xmx512m -Xms512m
svn commit: r1205464 - in /commons/proper/ognl/trunk/src: benchmarks/java/org/apache/commons/ognl/performance/ site/
Author: mcucchiara
Date: Wed Nov 23 15:57:46 2011
New Revision: 1205464
URL: http://svn.apache.org/viewvc?rev=1205464&view=rev
Log:
OGNL-36 - Renamed benchmark file names
Modified:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/BasePerformanceTest.java
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceCommonsOgnlTest.java
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceOldOgnlTest.java
commons/proper/ognl/trunk/src/site/site.xml
Modified:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/BasePerformanceTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/BasePerformanceTest.java?rev=1205464&r1=1205463&r2=1205464&view=diff
==
---
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/BasePerformanceTest.java
(original)
+++
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/BasePerformanceTest.java
Wed Nov 23 15:57:46 2011
@@ -24,7 +24,8 @@ package org.apache.commons.ognl.performa
import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
import com.carrotsearch.junitbenchmarks.BenchmarkRule;
import com.carrotsearch.junitbenchmarks.annotation.AxisRange;
-import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart;
+import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart;
+import com.carrotsearch.junitbenchmarks.annotation.LabelType;
import org.apache.commons.ognl.performance.invocation.CompilerInvocation;
import org.apache.commons.ognl.performance.invocation.FieldInvocation;
import
org.apache.commons.ognl.performance.invocation.FindParameterTypesInvocation;
@@ -47,7 +48,7 @@ import org.junit.rules.MethodRule;
* Time: 10:25 AM
*/
@AxisRange( min = 0, max = 1 )
-@BenchmarkMethodChart( filePrefix = "benchmark-ognl" )
+@BenchmarkHistoryChart( labelWith = LabelType.CUSTOM_KEY, maxRuns = 20 )
public abstract class BasePerformanceTest
{
@Rule
Modified:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceCommonsOgnlTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceCommonsOgnlTest.java?rev=1205464&r1=1205463&r2=1205464&view=diff
==
---
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceCommonsOgnlTest.java
(original)
+++
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceCommonsOgnlTest.java
Wed Nov 23 15:57:46 2011
@@ -21,10 +21,7 @@
package org.apache.commons.ognl.performance;
-import com.carrotsearch.junitbenchmarks.annotation.AxisRange;
-import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart;
import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart;
-import com.carrotsearch.junitbenchmarks.annotation.LabelType;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -34,9 +31,7 @@ import org.junit.BeforeClass;
* Time: 12:49 AM
*/
-@AxisRange( min = 0, max = 1 )
-@BenchmarkMethodChart( filePrefix = "benchmark-commons-ognl" )
-@BenchmarkHistoryChart( labelWith = LabelType.CUSTOM_KEY, maxRuns = 20 )
+@BenchmarkMethodChart( filePrefix = "benchmark" )
public class PerformanceCommonsOgnlTest
extends BasePerformanceTest
{
Modified:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceOldOgnlTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceOldOgnlTest.java?rev=1205464&r1=1205463&r2=1205464&view=diff
==
---
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceOldOgnlTest.java
(original)
+++
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceOldOgnlTest.java
Wed Nov 23 15:57:46 2011
@@ -21,10 +21,7 @@
package org.apache.commons.ognl.performance;
-import com.carrotsearch.junitbenchmarks.annotation.AxisRange;
-import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart;
import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart;
-import com.carrotsearch.junitbenchmarks.annotation.LabelType;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -34,9 +31,7 @@ import org.junit.BeforeClass;
* Time: 12:49 AM
*/
-@AxisRange( min = 0, max = 1 )
-@BenchmarkMethodChart( filePrefix = "benchmark-old-ognl" )
-@BenchmarkHistoryChart( lab
svn commit: r1203603 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlCache.java
Author: mcucchiara
Date: Fri Nov 18 11:20:37 2011
New Revision: 1203603
URL: http://svn.apache.org/viewvc?rev=1203603&view=rev
Log:
Added explicit argument type (Jenkins fails)
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlCache.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlCache.java?rev=1203603&r1=1203602&r2=1203603&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlCache.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlCache.java
Fri Nov 18 11:20:37 2011
@@ -98,7 +98,7 @@ public class OgnlCache {
public List> create( Class key )
throws CacheException
{
-return Arrays.asList( key.getConstructors() );
+return Arrays.>asList( key.getConstructors() );
}
} );
svn commit: r1203595 - /commons/proper/ognl/trunk/src/changes/changes.xml
Author: mcucchiara Date: Fri Nov 18 11:06:08 2011 New Revision: 1203595 URL: http://svn.apache.org/viewvc?rev=1203595&view=rev Log: Added OGNL-39 to the change list Modified: commons/proper/ognl/trunk/src/changes/changes.xml Modified: commons/proper/ognl/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/changes/changes.xml?rev=1203595&r1=1203594&r2=1203595&view=diff == --- commons/proper/ognl/trunk/src/changes/changes.xml (original) +++ commons/proper/ognl/trunk/src/changes/changes.xml Fri Nov 18 11:06:08 2011 @@ -23,6 +23,12 @@ + +Simplify OgnlRuntime: Greatly simplified OgnlRuntime, delegating away responsibilities to several new classes. +Caching responsibilities are now taken by a new OgnlCache class. +Added new classes PrimitiveWrapperClasses, NumericCasts, PrimitiveDefaults, NumericValues, PrimitiveTypes, +NumericLiterals and NumericDefaults. (contributed by Adrian Cumiskey). + Use StringBuilder instead of StringBuffer, deprecate >=JDK1.5 conditionals and use CONSTANT.equals(variable) (contributed by Adrian Cumiskey).
svn commit: r1203585 - /commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/internal/FieldCacheTest.java
Author: mcucchiara
Date: Fri Nov 18 10:54:48 2011
New Revision: 1203585
URL: http://svn.apache.org/viewvc?rev=1203585&view=rev
Log:
OGNL-39 - Corrected typo: Renamed Fie{dl,ld}CacheEntryFactory.
Modified:
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/internal/FieldCacheTest.java
Modified:
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/internal/FieldCacheTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/internal/FieldCacheTest.java?rev=1203585&r1=1203584&r2=1203585&view=diff
==
---
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/internal/FieldCacheTest.java
(original)
+++
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/internal/FieldCacheTest.java
Fri Nov 18 10:54:48 2011
@@ -21,7 +21,7 @@
package org.apache.commons.ognl.internal;
-import org.apache.commons.ognl.internal.entry.FiedlCacheEntryFactory;
+import org.apache.commons.ognl.internal.entry.FieldCacheEntryFactory;
import org.apache.commons.ognl.test.objects.Bean2;
import org.junit.Test;
@@ -39,7 +39,7 @@ import static junit.framework.Assert.ass
public class FieldCacheTest
{
ConcurrentHashMapCache, Map> cache =
-new ConcurrentHashMapCache, Map>( new
FiedlCacheEntryFactory());
+new ConcurrentHashMapCache, Map>( new
FieldCacheEntryFactory());
@Test
public void testGet( )
svn commit: r1203584 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java
Author: mcucchiara
Date: Fri Nov 18 10:54:19 2011
New Revision: 1203584
URL: http://svn.apache.org/viewvc?rev=1203584&view=rev
Log:
OGNL-39 - Renamed local var
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java?rev=1203584&r1=1203583&r2=1203584&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java
Fri Nov 18 10:54:19 2011
@@ -50,12 +50,12 @@ public class ClassCacheHandler
{
keyFound = forClass;
outer:
-for ( Class c = forClass; c != null; c =
c.getSuperclass() )
+for ( Class clazz = forClass; clazz != null; clazz =
clazz.getSuperclass() )
{
-answer = handlers.get( c );
+answer = handlers.get( clazz );
if ( answer == null )
{
-Class[] interfaces = c.getInterfaces();
+Class[] interfaces = clazz.getInterfaces();
for ( Class iface : interfaces )
{
answer = handlers.get( iface );
@@ -73,7 +73,7 @@ public class ClassCacheHandler
}
else
{
-keyFound = c;
+keyFound = clazz;
break;
}
}
svn commit: r1203582 - in /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry: FiedlCacheEntryFactory.java FieldCacheEntryFactory.java
Author: mcucchiara
Date: Fri Nov 18 10:53:44 2011
New Revision: 1203582
URL: http://svn.apache.org/viewvc?rev=1203582&view=rev
Log:
OGNL-39 - Corrected typo: Renamed Fie{dl,ld}CacheEntryFactory.
Added:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/FieldCacheEntryFactory.java
Removed:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/FiedlCacheEntryFactory.java
Added:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/FieldCacheEntryFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/FieldCacheEntryFactory.java?rev=1203582&view=auto
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/FieldCacheEntryFactory.java
(added)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/FieldCacheEntryFactory.java
Fri Nov 18 10:53:44 2011
@@ -0,0 +1,47 @@
+package org.apache.commons.ognl.internal.entry;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * $Id: FiedlCacheEntryFactory.java 1194954 2011-10-29 18:00:27Z mcucchiara $
+ */
+
+import org.apache.commons.ognl.internal.CacheException;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+public class FieldCacheEntryFactory
+implements ClassCacheEntryFactory>
+{
+public Map create( Class key )
+throws CacheException
+{
+Field[] declaredFields = key.getDeclaredFields();
+Map result = new HashMap(
declaredFields.length );
+for ( Field field : declaredFields )
+{
+result.put( field.getName(), field );
+}
+return result;
+}
+}
+
svn commit: r1198686 - /commons/proper/ognl/trunk/src/changes/changes.xml
Author: mcucchiara
Date: Mon Nov 7 09:57:53 2011
New Revision: 1198686
URL: http://svn.apache.org/viewvc?rev=1198686&view=rev
Log:
Formatted text (many lines were very lengthy)
Modified:
commons/proper/ognl/trunk/src/changes/changes.xml
Modified: commons/proper/ognl/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/changes/changes.xml?rev=1198686&r1=1198685&r2=1198686&view=diff
==
--- commons/proper/ognl/trunk/src/changes/changes.xml (original)
+++ commons/proper/ognl/trunk/src/changes/changes.xml Mon Nov 7 09:57:53 2011
@@ -16,33 +16,59 @@
limitations under the License.
-->
http://maven.apache.org/changes/1.0.0";
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-xsi:schemaLocation="http://maven.apache.org/changes/1.0.0
http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd";>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0
http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd";>
Commons OGNL Changes
- Use StringBuilder
instead of StringBuffer, deprecate >=JDK1.5 conditionals and use
CONSTANT.equals(variable) (contributed by Adrian Cumiskey).
+ Use StringBuilder
instead of StringBuffer, deprecate
+>=JDK1.5 conditionals and use CONSTANT.equals(variable) (contributed
by Adrian Cumiskey).
+
Findbugs fixes
(contributed by Adrian Cumiskey).
- Improvements to
{List,Map,Array}PropertyAccessor and ASTProperty (contributed by Adrian
Cumiskey).
- Link "Benchmarks" on
left hand navigation is broken (contributed by Adrian Cumiskey).
- Improvements to
JJTOgnlParserState (contributed by Adrian Cumiskey).
- CPD fix to
ASTProperty (contributed by Adrian Cumiskey).
- Some CPD fixes
around ASTMethod and ASTStaticMethod (contributed by Adrian Cumiskey).
- Visitor pattern
needs way to propagate exceptions (contributed by Daniel Pitts).
- Move
"toString" implementations into visitor pattern (contributed by Daniel
Pitts).
+ Improvements to
{List,Map,Array}PropertyAccessor and
+ASTProperty (contributed by Adrian Cumiskey).
+
+ Link "Benchmarks" on
left hand navigation is broken
+(contributed by Adrian Cumiskey).
+
+ Improvements to
JJTOgnlParserState (contributed by Adrian
+Cumiskey).
+
+ CPD fix to
ASTProperty (contributed by Adrian Cumiskey).
+
+ Some CPD fixes
around ASTMethod and ASTStaticMethod
+(contributed by Adrian Cumiskey).
+
+ Visitor pattern
needs way to propagate exceptions
+(contributed by Daniel Pitts).
+
+ Move
"toString" implementations into visitor pattern
+(contributed by Daniel Pitts).
+
JUnit Tests
produce confusing output.
- Class.forName()
usage is malicious inside OSGi (contributed by Adrian Cumiskey)
- Change the
generics signature of ClassCache and ClassCacheImpl (with contributions by
Daniel Pitts)
- Remove dead and
broken code from OgnlRuntime/SimpleNode (with contributions by Daniel
Pitts)
- Performance - Replace synchronized blocks with
ReentrantReadWriteLock (with contributions by Daniel Pitts)
- Support visitor
pattern on AST (contributed by Daniel Pitts)
+ Class.forName()
usage is malicious inside OSGi (contributed
+by Adrian Cumiskey)
+
+ Change the
generics signature of ClassCache and
+ClassCacheImpl (with contributions by Daniel Pitts)
+
+ Remove dead and
broken code from OgnlRuntime/SimpleNode
+(with contributions by Daniel Pitts)
+
+ Performance - Replace synchronized blocks
+with ReentrantReadWriteLock (with contributions by Daniel Pitts)
+
+ Support visitor
pattern on AST (contributed by Daniel Pitts)
+
Links "Download"
and "Release Notes" do not work
OGNL needs a
new Logo
Documentation
site has to be published
Ant
maintenance
- Update the
User/Developer guide according the Commons standard
+ Update the
User/Developer guide according the Commons
+standard
+
Upgrade JUnit to version4
enabled generation
of javacc Parser classes
Upgrade
groupId/artifactId/version on pom
svn commit: r1198685 - /commons/proper/ognl/trunk/src/changes/changes.xml
Author: mcucchiara
Date: Mon Nov 7 09:55:57 2011
New Revision: 1198685
URL: http://svn.apache.org/viewvc?rev=1198685&view=rev
Log:
Added OGNL-38 to the change list
Modified:
commons/proper/ognl/trunk/src/changes/changes.xml
Modified: commons/proper/ognl/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/changes/changes.xml?rev=1198685&r1=1198684&r2=1198685&view=diff
==
--- commons/proper/ognl/trunk/src/changes/changes.xml (original)
+++ commons/proper/ognl/trunk/src/changes/changes.xml Mon Nov 7 09:55:57 2011
@@ -23,6 +23,7 @@
+ Use StringBuilder
instead of StringBuffer, deprecate >=JDK1.5 conditionals and use
CONSTANT.equals(variable) (contributed by Adrian Cumiskey).
Findbugs fixes
(contributed by Adrian Cumiskey).
Improvements to
{List,Map,Array}PropertyAccessor and ASTProperty (contributed by Adrian
Cumiskey).
Link "Benchmarks" on
left hand navigation is broken (contributed by Adrian Cumiskey).
svn commit: r1198683 - /commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/StaticsAndConstructorsTest.java
Author: mcucchiara
Date: Mon Nov 7 09:52:34 2011
New Revision: 1198683
URL: http://svn.apache.org/viewvc?rev=1198683&view=rev
Log:
OGNL-38 - Use StringBuilder instead of StringBuffer, removed boxing, replaced
for loop with foreach
Modified:
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/StaticsAndConstructorsTest.java
Modified:
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/StaticsAndConstructorsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/StaticsAndConstructorsTest.java?rev=1198683&r1=1198682&r2=1198683&view=diff
==
---
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/StaticsAndConstructorsTest.java
(original)
+++
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/StaticsAndConstructorsTest.java
Mon Nov 7 09:52:34 2011
@@ -38,9 +38,9 @@ public class StaticsAndConstructorsTest
private static Object[][] TESTS =
{
{ "@java.lang.Class@forName(\"java.lang.Object\")", Object.class },
-{ "@java.lang.Integer@MAX_VALUE", new Integer( Integer.MAX_VALUE )
},
-{ "@@max(3,4)", new Integer( 4 ) },
-{ "new java.lang.StringBuffer().append(55).toString()", "55" },
+{ "@java.lang.Integer@MAX_VALUE", Integer.MAX_VALUE },
+{ "@@max(3,4)", 4 },
+{ "new java.lang.StringBuilder().append(55).toString()", "55" },
{ "class", ROOT.getClass() },
{ "@org.apache.commons.ognl.test.objects.Root@class",
ROOT.getClass() },
{ "class.getName()", ROOT.getClass().getName() },
@@ -49,8 +49,8 @@ public class StaticsAndConstructorsTest
{ "class.getSuperclass()", ROOT.getClass().getSuperclass() },
{ "class.superclass", ROOT.getClass().getSuperclass() },
{ "class.name", ROOT.getClass().getName() },
-{ "getStaticInt()", new Integer( Root.getStaticInt() ) },
-{ "@org.apache.commons.ognl.test.objects.Root@getStaticInt()", new
Integer( Root.getStaticInt() ) },
+{ "getStaticInt()", Root.getStaticInt() },
+{ "@org.apache.commons.ognl.test.objects.Root@getStaticInt()",
Root.getStaticInt() },
{ "new
org.apache.commons.ognl.test.objects.Simple(property).getStringValue()",
new Simple().getStringValue() },
{ "new
org.apache.commons.ognl.test.objects.Simple(map['test'].property).getStringValue()",
@@ -159,13 +159,13 @@ public class StaticsAndConstructorsTest
public static Collection data()
{
Collection data = new ArrayList(TESTS.length);
-for ( int i = 0; i < TESTS.length; i++ )
+for ( Object[] TEST : TESTS )
{
Object[] tmp = new Object[6];
-tmp[0] = TESTS[i][0] + " (" + TESTS[i][1] + ")";
+tmp[0] = TEST[0] + " (" + TEST[1] + ")";
tmp[1] = ROOT;
-tmp[2] = TESTS[i][0];
-tmp[3] = TESTS[i][1];
+tmp[2] = TEST[0];
+tmp[3] = TEST[1];
data.add( tmp );
}
svn commit: r1198682 - /commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/MenuItem.java
Author: mcucchiara
Date: Mon Nov 7 09:50:53 2011
New Revision: 1198682
URL: http://svn.apache.org/viewvc?rev=1198682&view=rev
Log:
OGNL-38 - Use StringBuilder instead of StringBuffer.
Modified:
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/MenuItem.java
Modified:
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/MenuItem.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/MenuItem.java?rev=1198682&r1=1198681&r2=1198682&view=diff
==
---
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/MenuItem.java
(original)
+++
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/test/objects/MenuItem.java
Mon Nov 7 09:50:53 2011
@@ -63,11 +63,13 @@ public class MenuItem
public String toString()
{
-StringBuffer sb = new StringBuffer( "MenuItem[" );
-sb.append( "page=" + getPage() );
-sb.append( ",label=" + getLabel() );
-sb.append( ",children=" + getChildren().size() );
-sb.append( "]" );
-return sb.toString();
+return new StringBuilder( "MenuItem[" )
+.append( "page=" )
+.append( getPage() )
+.append( ",label=" )
+.append( getLabel() )
+.append( ",children=" )
+.append( getChildren().size() )
+.append( "]" ).toString();
}
}
svn commit: r1198681 - /commons/proper/ognl/trunk/src/main/jjtree/ognl.jjt
Author: mcucchiara
Date: Mon Nov 7 09:49:57 2011
New Revision: 1198681
URL: http://svn.apache.org/viewvc?rev=1198681&view=rev
Log:
OGNL-38 - Variable naming, use StringBuilder instead of StringBuffer. Replace
new String(stringBuffer) with stringBuffer.toString().
Modified:
commons/proper/ognl/trunk/src/main/jjtree/ognl.jjt (contents, props
changed)
Modified: commons/proper/ognl/trunk/src/main/jjtree/ognl.jjt
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/jjtree/ognl.jjt?rev=1198681&r1=1198680&r2=1198681&view=diff
==
--- commons/proper/ognl/trunk/src/main/jjtree/ognl.jjt (original)
+++ commons/proper/ognl/trunk/src/main/jjtree/ognl.jjt Mon Nov 7 09:49:57 2011
@@ -195,8 +195,8 @@ void multiplicativeExpression() : {}
// unary (level 1)
void unaryExpression() : {
-StringBuffer sb;
-Token t;
+StringBuilder stringBuilder;
+Token token;
ASTInstanceof ionode;
}
{
@@ -212,9 +212,9 @@ void unaryExpression() : {
navigationChain()
[
"instanceof"
-t = { sb = new StringBuffer(t.image); ionode = jjtThis; }
#Instanceof(1)
-( "." t = { sb.append('.').append( t.image ); }
-)* { ionode.setTargetType( new String(sb)
); }
+token = { stringBuilder = new StringBuilder(token.image);
ionode = jjtThis; } #Instanceof(1)
+( "." token = {
stringBuilder.append('.').append( token.image ); }
+)* { ionode.setTargetType(
stringBuilder.toString() ); }
]
)
}
@@ -249,7 +249,7 @@ void navigationChain() : {}
void primaryExpression() : {
-Token t;
+Token token;
String className = null;
}
{
@@ -267,7 +267,7 @@ void primaryExpression() : {
|
LOOKAHEAD(2) "#root" { jjtThis.setName( "root" ); }
#RootVarRef(0)
|
-LOOKAHEAD(2) "#" t= { jjtThis.setName( t.image );
} #VarRef(0)
+LOOKAHEAD(2) "#" t= { jjtThis.setName( token.image
); } #VarRef(0)
|
LOOKAHEAD(2) ":" "[" expression() "]" { jjtThis.setValue(
jjtThis.jjtGetChild(0) ); } #Const(1)
|
@@ -295,7 +295,7 @@ void keyValueExpression() : {}
void staticReference() : {
String className = "java.lang.Math";
-Token t;
+Token token;
}
{
className=classReference()
@@ -303,7 +303,7 @@ void staticReference() : {
LOOKAHEAD(2)
staticMethodCall( className )
|
-t= { jjtThis.init( className, t.image ); }
#StaticField(0)
+token= { jjtThis.init( className, token.image
); } #StaticField(0)
)
}
@@ -315,19 +315,19 @@ String classReference(): {
}
String className(): {
-Token t;
-StringBuffer result;
+Token token;
+StringBuilder result;
}
{
-t= { result = new StringBuffer( t.image ); }
-( "." t= { result.append('.').append( t.image ); }
-)* { return new String(result); }
+token= { result = new StringBuilder( token.image ); }
+( "." token= { result.append('.').append( token.image ); }
+)* { return result.toString(); }
}
void constructorCall() #Ctor : {
String className;
-Token t;
-StringBuffer sb;
+Token token;
+StringBuilder stringBuilder;
}
{
"new" className=className()
@@ -358,26 +358,26 @@ void constructorCall() #Ctor : {
}
void propertyName() #Property : {
-Token t;
+Token token;
}
{
-t= { jjtThis.setValue( t.image ); } #Const
+token= { jjtThis.setValue( token.image ); } #Const
}
void staticMethodCall( String className ) #StaticMethod : {
-Token t;
+Token token;
}
{
-t= "(" [ assignmentExpression() ( "," assignmentExpression() )* ]
")"
-{ jjtThis.init( className, t.image ); }
+token= "(" [ assignmentExpression() ( "," assignmentExpression() )*
] ")"
+{ jjtThis.init( className, token.image
); }
}
void methodCall() #Method : {
-Token t;
+Token token;
}
{
-t= "(" [ assignmentExpression() ( "," assignmentExpression() )* ]
")"
-{ jjtThis.setMethodName( t.image ); }
+token= "(" [ assignmentExpression() ( "," assignmentExpression() )*
] ")"
+{ jjtThis.setMethodName( token.image
); }
}
/**
@@ -446,7 +446,7 @@ TOKEN_MGR_DECLS:
/** Ho
svn commit: r1198680 - /commons/proper/ognl/trunk/src/main/javacc/ognl.jj
Author: mcucchiara
Date: Mon Nov 7 09:49:05 2011
New Revision: 1198680
URL: http://svn.apache.org/viewvc?rev=1198680&view=rev
Log:
OGNL-38 - Variable naming, use StringBuilder instead of StringBuffer. Replace
new String(stringBuffer) with stringBuffer.toString().
Modified:
commons/proper/ognl/trunk/src/main/javacc/ognl.jj (contents, props
changed)
Modified: commons/proper/ognl/trunk/src/main/javacc/ognl.jj
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/javacc/ognl.jj?rev=1198680&r1=1198679&r2=1198680&view=diff
==
--- commons/proper/ognl/trunk/src/main/javacc/ognl.jj (original)
+++ commons/proper/ognl/trunk/src/main/javacc/ognl.jj Mon Nov 7 09:49:05 2011
@@ -847,8 +847,8 @@ void multiplicativeExpression() : {}
// unary (level 1)
void unaryExpression() : {
-StringBuffer sb;
-Token t;
+StringBuilder stringBuilder;
+Token token;
ASTInstanceof ionode;
}
{
@@ -945,7 +945,7 @@ void unaryExpression() : {
navigationChain()
[
"instanceof"
-t = /*@bgen(jjtree) #Instanceof( 1) */
+token = /*@bgen(jjtree) #Instanceof( 1) */
{
ASTInstanceof jjtn004 = new
ASTInstanceof(JJTINSTANCEOF);
boolean jjtc004 = true;
@@ -957,15 +957,15 @@ void unaryExpression() : {
jjtree.closeNodeScope(jjtn004, 1);
jjtc004 = false;
}
-/*@egen*/ { sb = new StringBuffer(t.image); ionode = jjtn004;
}/*@bgen(jjtree)*/
+/*@egen*/ { stringBuilder = new StringBuilder(token.image); ionode = jjtn004;
}/*@bgen(jjtree)*/
} finally {
if (jjtc004) {
jjtree.closeNodeScope(jjtn004, 1);
}
}
/*@egen*/
-( "." t = { sb.append('.').append( t.image ); }
-)* { ionode.setTargetType( new String(sb)
); }
+( "." token = {
stringBuilder.append('.').append( token.image ); }
+)* { ionode.setTargetType(
stringBuilder.toString() ); }
]
)
}
@@ -1067,7 +1067,7 @@ void navigationChain() : {}
void primaryExpression() : {
-Token t;
+Token token;
String className = null;
}
{
@@ -1188,7 +1188,7 @@ void primaryExpression() : {
}
/*@egen*/
|
-LOOKAHEAD(2) "#" t=/*@bgen(jjtree) #VarRef( 0) */
+LOOKAHEAD(2) "#" token=/*@bgen(jjtree) #VarRef( 0) */
{
ASTVarRef jjtn007 = new
ASTVarRef(JJTVARREF);
boolean jjtc007 = true;
@@ -1200,7 +1200,7 @@ void primaryExpression() : {
jjtree.closeNodeScope(jjtn007, 0);
jjtc007 = false;
}
-/*@egen*/ { jjtn007.setName( t.image ); }/*@bgen(jjtree)*/
+/*@egen*/ { jjtn007.setName( token.image ); }/*@bgen(jjtree)*/
} finally {
if (jjtc007) {
jjtree.closeNodeScope(jjtn007, 0);
@@ -1333,7 +1333,7 @@ void keyValueExpression() : {}
void staticReference() : {
String className = "java.lang.Math";
-Token t;
+Token token;
}
{
className=classReference()
@@ -1341,7 +1341,7 @@ void staticReference() : {
LOOKAHEAD(2)
staticMethodCall( className )
|
-t=/*@bgen(jjtree) #StaticField( 0) */
+token=/*@bgen(jjtree) #StaticField( 0) */
{
ASTStaticField jjtn001 = new
ASTStaticField(JJTSTATICFIELD);
boolean jjtc001 = true;
@@ -1353,7 +1353,7 @@ void staticReference() : {
jjtree.closeNodeScope(jjtn001, 0);
jjtc001 = false;
}
-/*@egen*/ { jjtn001.init( className, t.image );
}/*@bgen(jjtree)*/
+/*@egen*/ { jjtn001.init( className, token.image );
}/*@bgen(jjtree)*/
} finally {
if (jjtc001) {
jjtree.closeNodeScope(jjtn001, 0);
@@ -1371,13 +1371,13 @@ String classReference(): {
}
String className(): {
-
svn commit: r1198679 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SetPropertyAccessor.java
Author: mcucchiara
Date: Mon Nov 7 09:46:09 2011
New Revision: 1198679
URL: http://svn.apache.org/viewvc?rev=1198679&view=rev
Log:
OGNL-38 - Test CONSTANT.equals(variable) and simplify conditionals.
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SetPropertyAccessor.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SetPropertyAccessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SetPropertyAccessor.java?rev=1198679&r1=1198678&r2=1198679&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SetPropertyAccessor.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/SetPropertyAccessor.java
Mon Nov 7 09:46:09 2011
@@ -43,27 +43,21 @@ public class SetPropertyAccessor
{
Object result;
-if ( name.equals( "size" ) )
+if ( "size".equals( name ) )
{
-result = Integer.valueOf( set.size() );
+result = set.size();
+}
+else if ( "iterator".equals( name ) )
+{
+result = set.iterator();
+}
+else if ( "isEmpty".equals( name ) )
+{
+result = set.isEmpty() ? Boolean.TRUE : Boolean.FALSE;
}
else
{
-if ( name.equals( "iterator" ) )
-{
-result = set.iterator();
-}
-else
-{
-if ( name.equals( "isEmpty" ) )
-{
-result = set.isEmpty() ? Boolean.TRUE : Boolean.FALSE;
-}
-else
-{
-result = super.getProperty( context, target, name );
-}
-}
+result = super.getProperty( context, target, name );
}
return result;
}
svn commit: r1198678 - in /commons/proper/ognl/trunk/src: main/java/org/apache/commons/ognl/OgnlRuntime.java test/java/org/apache/commons/ognl/TestOgnlRuntime.java
Author: mcucchiara
Date: Mon Nov 7 09:45:31 2011
New Revision: 1198678
URL: http://svn.apache.org/viewvc?rev=1198678&view=rev
Log:
Replaced for loop with foreach, added a method test
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java?rev=1198678&r1=1198677&r2=1198678&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
Mon Nov 7 09:45:31 2011
@@ -2031,11 +2031,15 @@ public class OgnlRuntime
PropertyDescriptor result = null;
PropertyDescriptor[] propertyDescriptors =
getPropertyDescriptorsArray( targetClass );
-for ( int i = 0, icount = propertyDescriptors.length; ( result == null
) && ( i < icount ); i++ )
+for ( PropertyDescriptor propertyDescriptor : propertyDescriptors )
{
-if ( propertyDescriptors[i].getName().compareTo( name ) == 0 )
+if ( result != null )
{
-result = propertyDescriptors[i];
+break;
+}
+if ( propertyDescriptor.getName().compareTo( name ) == 0 )
+{
+result = propertyDescriptor;
}
}
return result;
Modified:
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java?rev=1198678&r1=1198677&r2=1198678&view=diff
==
---
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java
(original)
+++
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java
Mon Nov 7 09:45:31 2011
@@ -410,4 +410,13 @@ public class TestOgnlRuntime
OgnlExpressionCompiler compiler2 = OgnlRuntime.getCompiler( context );
assertSame( "compilers are not the same", compiler1, compiler2 );
}
+
+@Test
+public void testGetPropertyDescriptorFromArray()
+throws Exception
+{
+PropertyDescriptor propertyDescriptor =
+OgnlRuntime.getPropertyDescriptorFromArray( Root.class, "disabled"
);
+assertEquals( "disabled", propertyDescriptor.getName() );
+}
}
svn commit: r1198673 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
Author: mcucchiara
Date: Mon Nov 7 09:34:55 2011
New Revision: 1198673
URL: http://svn.apache.org/viewvc?rev=1198673&view=rev
Log:
Correct typo
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java?rev=1198673&r1=1198672&r2=1198673&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
Mon Nov 7 09:34:55 2011
@@ -1750,7 +1750,7 @@ public class OgnlRuntime
* @param method The method to check.
* @return True if the method should be callable, false otherwise.
*/
-//TODO: the method was intented as private, so it'd need to move in a util
class
+//TODO: the method was intended as private, so it'd need to move in a util
class
public static boolean isMethodCallable( Method method )
{
return !( method.isSynthetic() || Modifier.isVolatile(
method.getModifiers() ) );
svn commit: r1198671 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
Author: mcucchiara
Date: Mon Nov 7 09:31:36 2011
New Revision: 1198671
URL: http://svn.apache.org/viewvc?rev=1198671&view=rev
Log:
OGNL-38 - Removed useless extends object.
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java?rev=1198671&r1=1198670&r2=1198671&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
Mon Nov 7 09:31:36 2011
@@ -1605,7 +1605,7 @@ public class OgnlRuntime
try
{
-Class targetClass = target == null ? null :
target.getClass();
+Class targetClass = target == null ? null : target.getClass();
Field field = getField( targetClass, propertyName );
Object state;
svn commit: r1198668 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java
Author: mcucchiara
Date: Mon Nov 7 09:18:07 2011
New Revision: 1198668
URL: http://svn.apache.org/viewvc?rev=1198668&view=rev
Log:
OGNL-38 - Use StringBuilder instead of StringBuffer.
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java?rev=1198668&r1=1198667&r2=1198668&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java
Mon Nov 7 09:18:07 2011
@@ -1208,13 +1208,14 @@ public abstract class OgnlOps
public static String getEscapeString( String value )
{
-StringBuffer result = new StringBuffer();
+StringBuilder result = new StringBuilder();
-for ( int i = 0, icount = value.length(); i < icount; i++ )
+int length = value.length();
+for ( int i = 0; i < length; i++ )
{
result.append( getEscapedChar( value.charAt( i ) ) );
}
-return new String( result );
+return result.toString();
}
public static String getEscapedChar( char ch )
svn commit: r1198666 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
Author: mcucchiara
Date: Mon Nov 7 09:17:15 2011
New Revision: 1198666
URL: http://svn.apache.org/viewvc?rev=1198666&view=rev
Log:
OGNL-38 - Simplify conditionals.
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java?rev=1198666&r1=1198665&r2=1198666&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
Mon Nov 7 09:17:15 2011
@@ -62,30 +62,21 @@ public class MapPropertyAccessor
{
result = map.size();
}
+else if ( "keys".equals( name ) || "keySet".equals( name ) )
+{
+result = map.keySet();
+}
+else if ( "values".equals( name ) )
+{
+result = map.values();
+}
+else if ( "isEmpty".equals( name ) )
+{
+result = map.isEmpty() ? Boolean.TRUE : Boolean.FALSE;
+}
else
{
-if ( "keys".equals( name ) || "keySet".equals( name ) )
-{
-result = map.keySet();
-}
-else
-{
-if ( "values".equals( name ) )
-{
-result = map.values();
-}
-else
-{
-if ( "isEmpty".equals( name ) )
-{
-result = map.isEmpty() ? Boolean.TRUE :
Boolean.FALSE;
-}
-else
-{
-result = map.get( name );
-}
-}
-}
+result = map.get( name );
}
}
else
svn commit: r1198665 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/IteratorPropertyAccessor.java
Author: mcucchiara
Date: Mon Nov 7 09:15:54 2011
New Revision: 1198665
URL: http://svn.apache.org/viewvc?rev=1198665&view=rev
Log:
OGNL-38 - Test CONSTANT.equals(variable).
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/IteratorPropertyAccessor.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/IteratorPropertyAccessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/IteratorPropertyAccessor.java?rev=1198665&r1=1198664&r2=1198665&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/IteratorPropertyAccessor.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/IteratorPropertyAccessor.java
Mon Nov 7 09:15:54 2011
@@ -41,13 +41,13 @@ public class IteratorPropertyAccessor
if ( name instanceof String )
{
-if ( name.equals( "next" ) )
+if ( "next".equals( name ) )
{
result = iterator.next();
}
else
{
-if ( name.equals( "hasNext" ) )
+if ( "hasNext".equals( name ) )
{
result = iterator.hasNext() ? Boolean.TRUE : Boolean.FALSE;
}
svn commit: r1198664 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/EnumerationPropertyAccessor.java
Author: mcucchiara
Date: Mon Nov 7 09:15:09 2011
New Revision: 1198664
URL: http://svn.apache.org/viewvc?rev=1198664&view=rev
Log:
OGNL-38 - Test CONSTANT.equals(variable).
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/EnumerationPropertyAccessor.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/EnumerationPropertyAccessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/EnumerationPropertyAccessor.java?rev=1198664&r1=1198663&r2=1198664&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/EnumerationPropertyAccessor.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/EnumerationPropertyAccessor.java
Mon Nov 7 09:15:09 2011
@@ -42,13 +42,13 @@ public class EnumerationPropertyAccessor
if ( name instanceof String )
{
-if ( name.equals( "next" ) || name.equals( "nextElement" ) )
+if ( "next".equals( name ) || "nextElement".equals( name ) )
{
result = e.nextElement();
}
else
{
-if ( name.equals( "hasNext" ) || name.equals(
"hasMoreElements" ) )
+if ( "hasNext".equals( name ) || "hasMoreElements".equals(
name ) )
{
result = e.hasMoreElements() ? Boolean.TRUE :
Boolean.FALSE;
}
svn commit: r1198661 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticField.java
Author: mcucchiara
Date: Mon Nov 7 09:14:07 2011
New Revision: 1198661
URL: http://svn.apache.org/viewvc?rev=1198661&view=rev
Log:
OGNL-38 - Test CONSTANT.equals(variable), remove JDK1.5 conditionals and
variable naming.
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticField.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticField.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticField.java?rev=1198661&r1=1198660&r2=1198661&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticField.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticField.java
Mon Nov 7 09:14:07 2011
@@ -65,51 +65,51 @@ public class ASTStaticField
throws OgnlException
{
boolean result = false;
-Exception reason = null;
+Exception cause = null;
try
{
-Class c = OgnlRuntime.classForName( context, className );
+Class clazz = OgnlRuntime.classForName( context, className );
/*
* Check for virtual static field "class"; this cannot interfere
with normal static fields because it is a
* reserved word. It is considered constant.
*/
-if ( fieldName.equals( "class" ) )
+if ( "class".equals( fieldName ) )
{
result = true;
}
-else if ( OgnlRuntime.isJdk15() && c.isEnum() )
+else if ( clazz.isEnum() )
{
result = true;
}
else
{
-Field f = c.getField( fieldName );
+Field field = clazz.getField( fieldName );
-if ( !Modifier.isStatic( f.getModifiers() ) )
+if ( !Modifier.isStatic( field.getModifiers() ) )
{
throw new OgnlException( "Field " + fieldName + " of class
" + className + " is not static" );
}
-result = Modifier.isFinal( f.getModifiers() );
+result = Modifier.isFinal( field.getModifiers() );
}
}
catch ( ClassNotFoundException e )
{
-reason = e;
+cause = e;
}
catch ( NoSuchFieldException e )
{
-reason = e;
+cause = e;
}
catch ( SecurityException e )
{
-reason = e;
+cause = e;
}
-if ( reason != null )
+if ( cause != null )
{
-throw new OgnlException( "Could not get static field " + fieldName
+ " from class " + className, reason );
+throw new OgnlException( "Could not get static field " + fieldName
+ " from class " + className, cause );
}
return result;
@@ -118,44 +118,44 @@ public class ASTStaticField
Class getFieldClass( OgnlContext context )
throws OgnlException
{
-Exception reason = null;
+Exception cause;
try
{
-Class c = OgnlRuntime.classForName( context, className );
+Class clazz = OgnlRuntime.classForName( context, className );
/*
* Check for virtual static field "class"; this cannot interfere
with normal static fields because it is a
* reserved word. It is considered constant.
*/
-if ( fieldName.equals( "class" ) )
+if ( "class".equals( fieldName ) )
{
-return c;
+return clazz;
}
-else if ( OgnlRuntime.isJdk15() && c.isEnum() )
+else if ( clazz.isEnum() )
{
-return c;
+return clazz;
}
else
{
-Field f = c.getField( fieldName );
+Field field = clazz.getField( fieldName );
-return f.getType();
+return field.getType();
}
}
catch ( ClassNotFoundException e )
{
-reason = e;
+cause = e;
}
catch ( NoSuchFieldException e )
{
-reason = e;
+cause = e;
}
catch ( SecurityException e )
{
-reason = e;
+cause = e;
}
-throw new OgnlException( "Could not get static field " + fieldName + "
from class " + className, reason );
+throw new OgnlException( "Could not get static field " + fieldName + "
from class " + className, cause );
}
public Class getGetterClass()
svn commit: r1198659 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
Author: mcucchiara
Date: Mon Nov 7 09:12:44 2011
New Revision: 1198659
URL: http://svn.apache.org/viewvc?rev=1198659&view=rev
Log:
OGNL-38 - Variable naming (don't use acronyms), remove OgnlRuntime.isJdk15()
check.
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java?rev=1198659&r1=1198658&r2=1198659&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
Mon Nov 7 09:12:44 2011
@@ -84,7 +84,7 @@ public class ASTMethod
{
Object result, root = context.getRoot();
-for ( int i = 0, icount = args.length; i < icount; ++i )
+for ( int i = 0; i < args.length; ++i )
{
args[i] = children[i].getValue( context, root );
}
@@ -93,8 +93,8 @@ public class ASTMethod
if ( result == null )
{
-NullHandler nh = OgnlRuntime.getNullHandler(
OgnlRuntime.getTargetClass( source ) );
-result = nh.nullMethodResult( context, source, methodName,
args );
+NullHandler nullHandler = OgnlRuntime.getNullHandler(
OgnlRuntime.getTargetClass( source ) );
+result = nullHandler.nullMethodResult( context, source,
methodName, args );
}
return result;
@@ -182,13 +182,11 @@ public class ASTMethod
}
else
{
-
getterClass = method.getReturnType();
}
// TODO: This is a hacky workaround until javassist supports
varargs method invocations
-
-boolean varArgs = OgnlRuntime.isJdk15() && method.isVarArgs();
+boolean varArgs = method.isVarArgs();
if ( varArgs )
{
@@ -280,29 +278,29 @@ public class ASTMethod
* System.out.println("current type: " + context.getCurrentType() + "
target:" + target + " " +
* context.getCurrentObject() + " last child? " + lastChild(context));
*/
-Method m =
+Method method =
OgnlRuntime.getWriteMethod( context.getCurrentType() != null ?
context.getCurrentType() : target.getClass(),
methodName, children != null ?
children.length : -1 );
-if ( m == null )
+if ( method == null )
{
throw new UnsupportedCompilationException(
"Unable to determine setter method generation for " +
methodName );
}
String post = "";
-String result = "." + m.getName() + "(";
+String result = "." + method.getName() + "(";
-if ( m.getReturnType() != void.class &&
m.getReturnType().isPrimitive() && ( parent == null
+if ( method.getReturnType() != void.class &&
method.getReturnType().isPrimitive() && ( parent == null
|| !ASTTest.class.isInstance( parent ) ) )
{
-Class wrapper = OgnlRuntime.getPrimitiveWrapperClass(
m.getReturnType() );
+Class wrapper = OgnlRuntime.getPrimitiveWrapperClass(
method.getReturnType() );
ExpressionCompiler.addCastString( context, "new " +
wrapper.getName() + "(" );
post = ")";
getterClass = wrapper;
}
-boolean varArgs = OgnlRuntime.isJdk15() && m.isVarArgs();
+boolean varArgs = method.isVarArgs();
if ( varArgs )
{
@@ -313,13 +311,13 @@ public class ASTMethod
try
{
/*
- * if (lastChild(context) && m.getParameterTypes().length > 0 &&
_children.length <= 0) throw new
- * UnsupportedCompilationException("Unable to determine setter
method generation for " + m);
+ * if (lastChild(context) && method.getParameterTypes().length > 0
&& _children.length <= 0) throw new
+ * UnsupportedCompilationException("Unable to determine setter
method generation for " + method);
*/
if ( ( children != null ) && ( children.length > 0 ) )
{
-Class[] parms = m.getParameterTypes();
+Class[] parms = method.getParameterTypes();
String prevCast = (String) context.remove(
ExpressionCompiler.PRE_CAST );
for ( int i = 0; i < children.length; i++ )
@@ -41
svn commit: r1198657 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
Author: mcucchiara
Date: Mon Nov 7 09:11:02 2011
New Revision: 1198657
URL: http://svn.apache.org/viewvc?rev=1198657&view=rev
Log:
OGNL-38 - Test CONSTANT.equals(variable).
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java?rev=1198657&r1=1198656&r2=1198657&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
Mon Nov 7 09:11:02 2011
@@ -41,9 +41,9 @@ public class ArrayPropertyAccessor
if ( name instanceof String )
{
-if ( name.equals( "length" ) )
+if ( "length".equals( name ) )
{
-result = Array.getLength(target);
+result = Array.getLength( target );
}
else
{
svn commit: r1198656 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
Author: mcucchiara
Date: Mon Nov 7 09:09:47 2011
New Revision: 1198656
URL: http://svn.apache.org/viewvc?rev=1198656&view=rev
Log:
OGNL-38 - Test CONSTANT.equals(variable).
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java?rev=1198656&r1=1198655&r2=1198656&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
Mon Nov 7 09:09:47 2011
@@ -247,7 +247,7 @@ public class ExpressionCompiler
*/
public String getClassName( Class clazz )
{
-if ( clazz.getName().equals( "java.util.AbstractList$Itr" ) )
+if ( "java.util.AbstractList$Itr".equals( clazz.getName() ) )
{
return Iterator.class.getName();
}
@@ -410,7 +410,7 @@ public class ExpressionCompiler
*/
public Class getInterfaceClass( Class clazz )
{
-if ( clazz.getName().equals( "java.util.AbstractList$Itr" ) )
+if ( "java.util.AbstractList$Itr".equals( clazz.getName() ) )
{
return Iterator.class;
}
@@ -616,7 +616,7 @@ public class ExpressionCompiler
post = post + ")";
}
-String rootExpr = !getterCode.equals( "null" ) ? getRootExpression(
expression, root, context ) : "";
+String rootExpr = !"null".equals( getterCode ) ? getRootExpression(
expression, root, context ) : "";
String noRoot = (String) context.remove( "_noRoot" );
if ( noRoot != null )
svn commit: r1197467 - /commons/proper/ognl/trunk/src/changes/changes.xml
Author: mcucchiara
Date: Fri Nov 4 09:51:31 2011
New Revision: 1197467
URL: http://svn.apache.org/viewvc?rev=1197467&view=rev
Log:
Added OGNL-35 to the change list
Modified:
commons/proper/ognl/trunk/src/changes/changes.xml
Modified: commons/proper/ognl/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/changes/changes.xml?rev=1197467&r1=1197466&r2=1197467&view=diff
==
--- commons/proper/ognl/trunk/src/changes/changes.xml (original)
+++ commons/proper/ognl/trunk/src/changes/changes.xml Fri Nov 4 09:51:31 2011
@@ -24,6 +24,7 @@
Findbugs fixes
(contributed by Adrian Cumiskey).
+ Improvements to
{List,Map,Array}PropertyAccessor and ASTProperty (contributed by Adrian
Cumiskey).
Link "Benchmarks" on
left hand navigation is broken (contributed by Adrian Cumiskey).
Improvements to
JJTOgnlParserState (contributed by Adrian Cumiskey).
CPD fix to
ASTProperty (contributed by Adrian Cumiskey).
svn commit: r1197462 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
Author: mcucchiara
Date: Fri Nov 4 09:44:15 2011
New Revision: 1197462
URL: http://svn.apache.org/viewvc?rev=1197462&view=rev
Log:
Group conditions with same return value
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java?rev=1197462&r1=1197461&r2=1197462&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
Fri Nov 4 09:44:15 2011
@@ -39,7 +39,7 @@ public class MapPropertyAccessor
{
Object result;
@SuppressWarnings( "unchecked" ) // checked by the invoker
-Map map = (Map) target;
+Map map = (Map) target;
Node currentNode = ( (OgnlContext) context
).getCurrentNode().jjtGetParent();
boolean indexedAccess = false;
@@ -169,19 +169,8 @@ public class MapPropertyAccessor
{
String key = indexStr.replaceAll( "\"", "" );
-if ( "size".equals( key ) )
-{
-return "";
-}
-else if ( "keys".equals( key ) || "keySet".equals( key ) )
-{
-return "";
-}
-else if ( "values".equals( key ) )
-{
-return "";
-}
-else if ( "isEmpty".equals( key ) )
+if ( "size".equals( key ) || "keys".equals( key ) ||
"keySet".equals( key ) || "values".equals( key )
+|| "isEmpty".equals( key ) )
{
return "";
}
svn commit: r1197452 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
Author: mcucchiara
Date: Fri Nov 4 09:18:36 2011
New Revision: 1197452
URL: http://svn.apache.org/viewvc?rev=1197452&view=rev
Log:
OGNL-35 - Flipped equals() everywhere where a variable is tested against a
String constant.
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java?rev=1197452&r1=1197451&r2=1197452&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/MapPropertyAccessor.java
Fri Nov 4 09:18:36 2011
@@ -25,7 +25,8 @@ import java.util.Set;
/**
* Implementation of PropertyAccessor that sets and gets properties by storing
and looking up values in Maps.
- *
+ *
+ * $Id$
* @author Luke Blanshard (blans...@netscape.net)
* @author Drew Davidson (d...@ognl.org)
*/
@@ -57,25 +58,25 @@ public class MapPropertyAccessor
if ( ( name instanceof String ) && !indexedAccess )
{
-if ( name.equals( "size" ) )
+if ( "size".equals( name ) )
{
-result = Integer.valueOf( map.size() );
+result = map.size();
}
else
{
-if ( name.equals( "keys" ) || name.equals( "keySet" ) )
+if ( "keys".equals( name ) || "keySet".equals( name ) )
{
result = map.keySet();
}
else
{
-if ( name.equals( "values" ) )
+if ( "values".equals( name ) )
{
result = map.values();
}
else
{
-if ( name.equals( "isEmpty" ) )
+if ( "isEmpty".equals( name ) )
{
result = map.isEmpty() ? Boolean.TRUE :
Boolean.FALSE;
}
@@ -132,22 +133,22 @@ public class MapPropertyAccessor
{
String key = indexStr.replaceAll( "\"", "" );
-if ( key.equals( "size" ) )
+if ( "size".equals( key ) )
{
context.setCurrentType( int.class );
return ".size()";
}
-else if ( key.equals( "keys" ) || key.equals( "keySet" ) )
+else if ( "keys".equals( key ) || "keySet".equals( key ) )
{
context.setCurrentType( Set.class );
return ".keySet()";
}
-else if ( key.equals( "values" ) )
+else if ( "values".equals( key ) )
{
context.setCurrentType( Collection.class );
return ".values()";
}
-else if ( key.equals( "isEmpty" ) )
+else if ( "isEmpty".equals( key ) )
{
context.setCurrentType( boolean.class );
return ".isEmpty()";
@@ -168,19 +169,19 @@ public class MapPropertyAccessor
{
String key = indexStr.replaceAll( "\"", "" );
-if ( key.equals( "size" ) )
+if ( "size".equals( key ) )
{
return "";
}
-else if ( key.equals( "keys" ) || key.equals( "keySet" ) )
+else if ( "keys".equals( key ) || "keySet".equals( key ) )
{
return "";
}
-else if ( key.equals( "values" ) )
+else if ( "values".equals( key ) )
{
return "";
}
-else if ( key.equals( "isEmpty" ) )
+else if ( "isEmpty".equals( key ) )
{
return "";
}
svn commit: r1197449 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
Author: mcucchiara
Date: Fri Nov 4 09:16:35 2011
New Revision: 1197449
URL: http://svn.apache.org/viewvc?rev=1197449&view=rev
Log:
Fixed code style
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java?rev=1197449&r1=1197448&r2=1197449&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
Fri Nov 4 09:16:35 2011
@@ -42,19 +42,19 @@ public class ListPropertyAccessor
{
Object result;
-if ( "size".equals(name) )
+if ( "size".equals( name ) )
{
result = list.size();
}
else
{
-if ( "iterator".equals(name) )
+if ( "iterator".equals( name ) )
{
result = list.iterator();
}
else
{
-if ( "isEmpty".equals(name) || "empty".equals(name) )
+if ( "isEmpty".equals( name ) || "empty".equals( name ) )
{
result = list.isEmpty() ? Boolean.TRUE : Boolean.FALSE;
}
@@ -229,19 +229,25 @@ public class ListPropertyAccessor
return getSourceBeanMethod( context, target, index, indexStr, true );
}
-private String getSourceBeanMethod( OgnlContext context, Object target,
Object index, String indexStr, boolean isSetter ) {
+private String getSourceBeanMethod( OgnlContext context, Object target,
Object index, String indexStr,
+boolean isSetter )
+{
Object currentObject = context.getCurrentObject();
Class currentType = context.getCurrentType();
if ( currentObject != null && !Number.class.isInstance( currentObject
) )
{
try
{
-if ( isSetter ) {
-if ( OgnlRuntime.getWriteMethod( target.getClass(),
indexStr ) != null || !currentType.isPrimitive() )
+if ( isSetter )
+{
+if ( OgnlRuntime.getWriteMethod( target.getClass(),
indexStr ) != null
+|| !currentType.isPrimitive() )
{
return super.getSourceSetter( context, target, index );
}
-} else {
+}
+else
+{
if ( OgnlRuntime.getReadMethod( target.getClass(),
indexStr ) != null )
{
return super.getSourceAccessor( context, target, index
);
@@ -250,7 +256,7 @@ public class ListPropertyAccessor
}
catch ( Throwable t )
{
-throw OgnlOps.castToRuntime(t);
+throw OgnlOps.castToRuntime( t );
}
}
@@ -266,13 +272,12 @@ public class ListPropertyAccessor
{
indexStr += "." + OgnlRuntime.getNumericValueGetter( currentType );
}
-else if ( currentObject != null && Number.class.isAssignableFrom(
-currentObject.getClass() ) && !currentType.isPrimitive() )
+else if ( currentObject != null && Number.class.isAssignableFrom(
currentObject.getClass() )
+&& !currentType.isPrimitive() )
{
// means it needs to be cast first as well
-String toString =
-String.class.isInstance( index ) && currentType !=
Object.class ? "" : ".toString()";
+String toString = String.class.isInstance( index ) && currentType
!= Object.class ? "" : ".toString()";
indexStr = "org.apache.commons.ognl.OgnlOps#getIntValue(" +
indexStr + toString + ")";
}
svn commit: r1197448 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
Author: mcucchiara
Date: Fri Nov 4 09:15:52 2011
New Revision: 1197448
URL: http://svn.apache.org/viewvc?rev=1197448&view=rev
Log:
OGNL-35 - CPD fix, extracted shared method getSourceBeanMethod() from
getSourceSetter() and getSourceAccessor().
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java?rev=1197448&r1=1197447&r2=1197448&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
Fri Nov 4 09:15:52 2011
@@ -19,12 +19,7 @@ package org.apache.commons.ognl;
* under the License.
*/
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* Implementation of PropertyAccessor that uses numbers and dynamic subscripts
as properties to index into Lists.
@@ -47,19 +42,19 @@ public class ListPropertyAccessor
{
Object result;
-if ( name.equals( "size" ) )
+if ( "size".equals(name) )
{
result = list.size();
}
else
{
-if ( name.equals( "iterator" ) )
+if ( "iterator".equals(name) )
{
result = list.iterator();
}
else
{
-if ( name.equals( "isEmpty" ) || name.equals( "empty" ) )
+if ( "isEmpty".equals(name) || "empty".equals(name) )
{
result = list.isEmpty() ? Boolean.TRUE : Boolean.FALSE;
}
@@ -163,15 +158,15 @@ public class ListPropertyAccessor
if ( index instanceof String )
{
String key = ( (String) index ).replaceAll( "\"", "" );
-if ( key.equals( "size" ) )
+if ( "size".equals( key ) )
{
return int.class;
}
-if ( key.equals( "iterator" ) )
+if ( "iterator".equals( key ) )
{
return Iterator.class;
}
-if ( key.equals( "isEmpty" ) || key.equals( "empty" ) )
+if ( "isEmpty".equals( key ) || "empty".equals( key ) )
{
return boolean.class;
}
@@ -193,19 +188,19 @@ public class ListPropertyAccessor
if ( String.class.isInstance( index ) )
{
-if ( indexStr.equals( "size" ) )
+if ( "size".equals( indexStr ) )
{
context.setCurrentAccessor( List.class );
context.setCurrentType( int.class );
return ".size()";
}
-if ( indexStr.equals( "iterator" ) )
+if ( "iterator".equals( indexStr ) )
{
context.setCurrentAccessor( List.class );
context.setCurrentType( Iterator.class );
return ".iterator()";
}
-if ( indexStr.equals( "isEmpty" ) || indexStr.equals( "empty" ) )
+if ( "isEmpty".equals( indexStr ) || "empty".equals( indexStr ) )
{
context.setCurrentAccessor( List.class );
context.setCurrentType( boolean.class );
@@ -215,49 +210,7 @@ public class ListPropertyAccessor
// TODO: This feels really inefficient, must be some better way
// check if the index string represents a method on a custom class
implementing java.util.List instead..
-
-if ( context.getCurrentObject() != null && !Number.class.isInstance(
context.getCurrentObject() ) )
-{
-try
-{
-Method m = OgnlRuntime.getReadMethod( target.getClass(),
indexStr );
-
-if ( m != null )
-{
-return super.getSourceAccessor( context, target, index );
-}
-
-}
-catch ( Throwable t )
-{
-throw OgnlOps.castToRuntime( t );
-}
-}
-
-context.setCurrentAccessor( List.class );
-
-// need to convert to primitive for list index acces
svn commit: r1197445 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
Author: mcucchiara
Date: Fri Nov 4 09:13:17 2011
New Revision: 1197445
URL: http://svn.apache.org/viewvc?rev=1197445&view=rev
Log:
Fixed code style
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java?rev=1197445&r1=1197444&r2=1197445&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
Fri Nov 4 09:13:17 2011
@@ -29,6 +29,7 @@ import java.util.Iterator;
/**
* $Id$
+ *
* @author Luke Blanshard (blans...@netscape.net)
* @author Drew Davidson (d...@ognl.org)
*/
@@ -54,7 +55,8 @@ public class ASTProperty
/**
* Returns true if this property is itself an index reference.
- * @return Returns true if this property is itself an index reference.
+ *
+ * @return Returns true if this property is itself an index reference.
*/
public boolean isIndexedAccess()
{
@@ -64,11 +66,11 @@ public class ASTProperty
/**
* Returns true if this property is described by an
IndexedPropertyDescriptor and that if followed by an index
* specifier it will call the index get/set methods rather than go through
property accessors.
- *
+ *
* @param context The context
- * @param source The object source
- * @throws OgnlException if an error occurs
+ * @param source The object source
* @return true, if this property is described by an
IndexedPropertyDescriptor
+ * @throws OgnlException if an error occurs
*/
public int getIndexedPropertyType( OgnlContext context, Object source )
throws OgnlException
@@ -83,10 +85,10 @@ public class ASTProperty
if ( property instanceof String )
{
-return OgnlRuntime.getIndexedPropertyType(
- context,
- ( source == null ) ? null : OgnlRuntime.getCompiler(
context ).getInterfaceClass( source.getClass() ),
- (String) property );
+return OgnlRuntime.getIndexedPropertyType( context, (
source == null )
+? null
+: OgnlRuntime.getCompiler( context
).getInterfaceClass( source.getClass() ),
+ (String)
property );
}
}
@@ -132,8 +134,7 @@ public class ASTProperty
public boolean isNodeSimpleProperty( OgnlContext context )
throws OgnlException
{
-return ( children != null ) && ( children.length == 1 )
-&& ( (SimpleNode) children[0] ).isConstant( context );
+return ( children != null ) && ( children.length == 1 ) && (
(SimpleNode) children[0] ).isConstant( context );
}
public Class getGetterClass()
@@ -166,7 +167,7 @@ public class ASTProperty
Node child = children[0];
if ( isIndexedAccess() )
{
-Object value = child.getValue(context, context.getRoot());
+Object value = child.getValue( context, context.getRoot() );
if ( value == null || DynamicSubscript.class.isAssignableFrom(
value.getClass() ) )
{
@@ -175,19 +176,18 @@ public class ASTProperty
}
// Get root cast string if the child is a type that needs it
(like a nested ASTProperty)
-String srcString = getSourceString(context, child);
+String srcString = getSourceString( context, child );
if ( context.get( "_indexedMethod" ) != null )
{
m = (Method) context.remove( "_indexedMethod" );
getterClass = m.getReturnType();
-Object indexedValue =
-OgnlRuntime.callMethod( context, target, m.getName(),
new Object[] { value } );
+Object indexedValue = OgnlRuntime.callMethod( context,
target, m.getName(), new Object[]{ value } );
context.setCurrentType( getterClass );
context.setCurrentObject( indexedValue );
-context.setCurrentAccessor(
+context.setCurrentAccessor(
OgnlRuntime.getCompiler( context
).getSuperOrInterfaceClass( m, m.getDeclaringClass() ) );
return "." + m.getName() + "(" + srcString + ")";
@@ -201,13 +201,11 @@ public class ASTProperty
// + &quo
svn commit: r1197443 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
Author: mcucchiara
Date: Fri Nov 4 09:11:05 2011
New Revision: 1197443
URL: http://svn.apache.org/viewvc?rev=1197443&view=rev
Log:
OGNL-35 - CPD fix, extracted shared method getSourceString() from
toGetSourceString() and toSetSourceString().
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java?rev=1197443&r1=1197442&r2=1197443&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
Fri Nov 4 09:11:05 2011
@@ -163,9 +163,10 @@ public class ASTProperty
* context.getCurrentObject().getClass().getName());
*/
+Node child = children[0];
if ( isIndexedAccess() )
{
-Object value = children[0].getValue( context,
context.getRoot() );
+Object value = child.getValue(context, context.getRoot());
if ( value == null || DynamicSubscript.class.isAssignableFrom(
value.getClass() ) )
{
@@ -174,26 +175,7 @@ public class ASTProperty
}
// Get root cast string if the child is a type that needs it
(like a nested ASTProperty)
-String srcString = children[0].toGetSourceString( context,
context.getRoot() );
-srcString =
-ExpressionCompiler.getRootExpression( children[0],
context.getRoot(), context ) + srcString;
-
-if ( ASTChain.class.isInstance( children[0] ) )
-{
-String cast = (String) context.remove(
ExpressionCompiler.PRE_CAST );
-if ( cast != null )
-{
-srcString = cast + srcString;
-}
-}
-
-if ( ASTConst.class.isInstance( children[0] )
- && String.class.isInstance( context.getCurrentObject() ) )
-{
-srcString = "\"" + srcString + "\"";
-}
-// System.out.println("indexed getting with child srcString: "
+ srcString + " value class: " +
-// value.getClass() + " and child: " +
_children[0].getClass());
+String srcString = getSourceString(context, child);
if ( context.get( "_indexedMethod" ) != null )
{
@@ -212,47 +194,29 @@ public class ASTProperty
}
else
{
-PropertyAccessor p = OgnlRuntime.getPropertyAccessor(
target.getClass() );
+PropertyAccessor propertyAccessor =
OgnlRuntime.getPropertyAccessor( target.getClass() );
// System.out.println("child value : " +
_children[0].getValue(context, context.getCurrentObject())
// + " using propaccessor " + p.getClass().getName()
// + " and srcString " + srcString + " on target: " +
target);
-Object currObj = context.getCurrentObject();
-Class currType = context.getCurrentType();
-Class prevType = context.getPreviousType();
-
-Object indexVal = p.getProperty( context, target, value );
-
-// reset current object for accessor
-
-context.setCurrentObject( currObj );
-context.setCurrentType( currType );
-context.setPreviousType( prevType );
-
-/*
- * System.out.println("astprop srcString: " + srcString +
" from child class " +
- * _children[0].getClass().getName() + " and indexVal " +
indexVal + " propertyAccessor : " +
- * p.getClass().getName() + " context obj " +
context.getCurrentObject() +
- * " context obj is array? : " +
context.getCurrentObject().getClass().isArray() + " current type: "
- * + context.getCurrentType());
- */
-
-if ( ASTConst.class.isInstance( children[0] )
-&& Number.class.isInstance( context.getCurrentObject()
) )
+Object currentObject = context.getCurrentObject();
+if ( ASTConst.class.isInstance(child)
+&& Number.class.isInstance( currentObject ) )
svn commit: r1197440 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
Author: mcucchiara
Date: Fri Nov 4 09:03:22 2011
New Revision: 1197440
URL: http://svn.apache.org/viewvc?rev=1197440&view=rev
Log:
Fixed code style
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java?rev=1197440&r1=1197439&r2=1197440&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
Fri Nov 4 09:03:22 2011
@@ -145,7 +145,7 @@ public class ArrayPropertyAccessor
@Override
public String getSourceAccessor( OgnlContext context, Object target,
Object index )
{
-String indexStr = getIndexString(context, index);
+String indexStr = getIndexString( context, index );
context.setCurrentAccessor( target.getClass() );
context.setCurrentType( target.getClass().getComponentType() );
@@ -156,7 +156,7 @@ public class ArrayPropertyAccessor
@Override
public String getSourceSetter( OgnlContext context, Object target, Object
index )
{
-String indexStr = getIndexString(context, index);
+String indexStr = getIndexString( context, index );
Class type = target.getClass().isArray() ?
target.getClass().getComponentType() : target.getClass();
@@ -173,7 +173,8 @@ public class ArrayPropertyAccessor
return "[" + indexStr +
"]=org.apache.commons.ognl.OgnlOps.convertValue($3," + type.getName() +
".class)";
}
-private static String getIndexString( OgnlContext context, Object index ) {
+private static String getIndexString( OgnlContext context, Object index )
+{
String indexStr = index.toString();
// need to convert to primitive for list index access
@@ -186,9 +187,8 @@ public class ArrayPropertyAccessor
{
indexStr += "." + OgnlRuntime.getNumericValueGetter(
context.getCurrentType() );
}
-else if ( context.getCurrentObject() != null
-&& Number.class.isAssignableFrom(
context.getCurrentObject().getClass() )
-&& !context.getCurrentType().isPrimitive() )
+else if ( context.getCurrentObject() != null &&
Number.class.isAssignableFrom(
+context.getCurrentObject().getClass() ) &&
!context.getCurrentType().isPrimitive() )
{
// means it needs to be cast first as well
svn commit: r1197437 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
Author: mcucchiara
Date: Fri Nov 4 09:01:49 2011
New Revision: 1197437
URL: http://svn.apache.org/viewvc?rev=1197437&view=rev
Log:
OGNL-35 - CPD fix, extracted getIndexString() from getSourceAccessor() and
getSourceSetter().
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java?rev=1197437&r1=1197436&r2=1197437&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
Fri Nov 4 09:01:49 2011
@@ -145,29 +145,7 @@ public class ArrayPropertyAccessor
@Override
public String getSourceAccessor( OgnlContext context, Object target,
Object index )
{
-String indexStr = index.toString();
-
-// need to convert to primitive for list index access
-
-// System.out.println("index class " + index.getClass() + " current
type " + context.getCurrentType() +
-// " current object class " + context.getCurrentObject().getClass());
-
-if ( context.getCurrentType() != null &&
!context.getCurrentType().isPrimitive()
-&& Number.class.isAssignableFrom( context.getCurrentType() ) )
-{
-indexStr += "." + OgnlRuntime.getNumericValueGetter(
context.getCurrentType() );
-}
-else if ( context.getCurrentObject() != null
-&& Number.class.isAssignableFrom(
context.getCurrentObject().getClass() )
-&& !context.getCurrentType().isPrimitive() )
-{
-// means it needs to be cast first as well
-
-String toString =
-String.class.isInstance( index ) && context.getCurrentType()
!= Object.class ? "" : ".toString()";
-
-indexStr = "org.apache.commons.ognl.OgnlOps#getIntValue(" +
indexStr + toString + ")";
-}
+String indexStr = getIndexString(context, index);
context.setCurrentAccessor( target.getClass() );
context.setCurrentType( target.getClass().getComponentType() );
@@ -178,10 +156,31 @@ public class ArrayPropertyAccessor
@Override
public String getSourceSetter( OgnlContext context, Object target, Object
index )
{
+String indexStr = getIndexString(context, index);
+
+Class type = target.getClass().isArray() ?
target.getClass().getComponentType() : target.getClass();
+
+context.setCurrentAccessor( target.getClass() );
+context.setCurrentType( target.getClass().getComponentType() );
+
+if ( type.isPrimitive() )
+{
+Class wrapClass = OgnlRuntime.getPrimitiveWrapperClass( type );
+
+return "[" + indexStr + "]=((" + wrapClass.getName() +
")org.apache.commons.ognl.OgnlOps.convertValue($3,"
++ wrapClass.getName() + ".class, true))." +
OgnlRuntime.getNumericValueGetter( wrapClass );
+}
+return "[" + indexStr +
"]=org.apache.commons.ognl.OgnlOps.convertValue($3," + type.getName() +
".class)";
+}
+
+private static String getIndexString( OgnlContext context, Object index ) {
String indexStr = index.toString();
// need to convert to primitive for list index access
+// System.out.println("index class " + index.getClass() + " current
type " + context.getCurrentType() +
+// " current object class " + context.getCurrentObject().getClass());
+
if ( context.getCurrentType() != null &&
!context.getCurrentType().isPrimitive()
&& Number.class.isAssignableFrom( context.getCurrentType() ) )
{
@@ -198,19 +197,6 @@ public class ArrayPropertyAccessor
indexStr = "org.apache.commons.ognl.OgnlOps#getIntValue(" +
indexStr + toString + ")";
}
-
-Class type = target.getClass().isArray() ?
target.getClass().getComponentType() : target.getClass();
-
-context.setCurrentAccessor( target.getClass() );
-context.setCurrentType( target.getClass().getComponentType() );
-
-if ( type.isPrimitive() )
-{
-Class wrapClass = OgnlRuntime.getPrimitiveWrapperClass( type );
-
-return "[" + indexStr + "]=((" + wrapClass.getName() +
")org.apache.commons.ognl.OgnlOps.convertValue($3,"
-+ wrapClass.getName() + ".class, true))." +
OgnlRuntime.getNumericValueGetter( wrapClass );
-}
-return "[" + indexStr +
"]=org.apache.commons.ognl.OgnlOps.convertValue($3," + type.getName() +
".class)";
+return indexStr;
}
}
svn commit: r1197432 - /commons/proper/ognl/trunk/src/changes/changes.xml
Author: mcucchiara Date: Fri Nov 4 08:54:02 2011 New Revision: 1197432 URL: http://svn.apache.org/viewvc?rev=1197432&view=rev Log: Added OGNL-37 to the change list Modified: commons/proper/ognl/trunk/src/changes/changes.xml Modified: commons/proper/ognl/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/changes/changes.xml?rev=1197432&r1=1197431&r2=1197432&view=diff == --- commons/proper/ognl/trunk/src/changes/changes.xml (original) +++ commons/proper/ognl/trunk/src/changes/changes.xml Fri Nov 4 08:54:02 2011 @@ -23,6 +23,7 @@ + Findbugs fixes (contributed by Adrian Cumiskey). Link "Benchmarks" on left hand navigation is broken (contributed by Adrian Cumiskey). Improvements to JJTOgnlParserState (contributed by Adrian Cumiskey). CPD fix to ASTProperty (contributed by Adrian Cumiskey).
svn commit: r1197043 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
Author: mcucchiara
Date: Thu Nov 3 10:17:21 2011
New Revision: 1197043
URL: http://svn.apache.org/viewvc?rev=1197043&view=rev
Log:
OGNL-37 - Avoid concurrentModificationException
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java?rev=1197043&r1=1197042&r2=1197043&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
Thu Nov 3 10:17:21 2011
@@ -675,15 +675,15 @@ public class ExpressionCompiler
throws NotFoundException, CannotCompileException
{
Map referenceMap =
context.getLocalReferences();
-if ( referenceMap == null || referenceMap.size() < 1 )
+if ( referenceMap == null || referenceMap.isEmpty() )
{
return;
}
-for ( Map.Entry entry :
referenceMap.entrySet() )
+Iterator it = referenceMap.values().iterator();
+while( it.hasNext() )
{
-LocalReference ref = entry.getValue();
-String key = entry.getKey();
+LocalReference ref = it.next();
String widener = ref.getType().isPrimitive() ? " " : " ($w) ";
String body = format( "{ return %s %s; }", widener,
ref.getExpression() ).replaceAll( "\\.\\.", "." );
@@ -696,7 +696,7 @@ public class ExpressionCompiler
method.setBody( body );
clazz.addMethod( method );
-referenceMap.remove( key );
+it.remove();
}
}
svn commit: r1197034 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
Author: mcucchiara
Date: Thu Nov 3 09:55:41 2011
New Revision: 1197034
URL: http://svn.apache.org/viewvc?rev=1197034&view=rev
Log:
OGNL-37 - Corrected attempt to remove LocalReference (keys was always of type
String).
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java?rev=1197034&r1=1197033&r2=1197034&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
Thu Nov 3 09:55:41 2011
@@ -257,17 +257,17 @@ public class ExpressionCompiler
return clazz.getName();
}
-Class[] intf = clazz.getInterfaces();
+Class[] interfaces = clazz.getInterfaces();
-for ( Class anIntf : intf )
+for ( Class intface : interfaces )
{
-if ( anIntf.getName().indexOf( "util.List" ) > 0 )
+if ( intface.getName().indexOf( "util.List" ) > 0 )
{
-return anIntf.getName();
+return intface.getName();
}
-else if ( anIntf.getName().indexOf( "Iterator" ) > 0 )
+else if ( intface.getName().indexOf( "Iterator" ) > 0 )
{
-return anIntf.getName();
+return intface.getName();
}
}
@@ -680,8 +680,10 @@ public class ExpressionCompiler
return;
}
-for ( LocalReference ref : referenceMap.values() )
+for ( Map.Entry entry :
referenceMap.entrySet() )
{
+LocalReference ref = entry.getValue();
+String key = entry.getKey();
String widener = ref.getType().isPrimitive() ? " " : " ($w) ";
String body = format( "{ return %s %s; }", widener,
ref.getExpression() ).replaceAll( "\\.\\.", "." );
@@ -694,7 +696,7 @@ public class ExpressionCompiler
method.setBody( body );
clazz.addMethod( method );
-referenceMap.remove( ref );
+referenceMap.remove( key );
}
}
svn commit: r1197024 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
Author: mcucchiara
Date: Thu Nov 3 09:40:34 2011
New Revision: 1197024
URL: http://svn.apache.org/viewvc?rev=1197024&view=rev
Log:
OGNL-37 - Made static ints final. Use Map.entrySet instead of Map.keySet for
better performance. Javadoc improvements.
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java?rev=1197024&r1=1197023&r2=1197024&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
Thu Nov 3 09:40:34 2011
@@ -106,17 +106,17 @@ public class OgnlRuntime
/**
* Not an indexed property
*/
-public static int INDEXED_PROPERTY_NONE = 0;
+public static final int INDEXED_PROPERTY_NONE = 0;
/**
* JavaBeans IndexedProperty
*/
-public static int INDEXED_PROPERTY_INT = 1;
+public static final int INDEXED_PROPERTY_INT = 1;
/**
* OGNL ObjectIndexedProperty
*/
-public static int INDEXED_PROPERTY_OBJECT = 2;
+public static final int INDEXED_PROPERTY_OBJECT = 2;
/**
* Constant string representation of null string.
@@ -1935,9 +1935,10 @@ public class OgnlRuntime
Map> allMethods = getMethods( targetClass, false
);
Map> pairs = new HashMap>(
101 );
-for ( String methodName : allMethods.keySet() )
+for ( Map.Entry> entry : allMethods.entrySet() )
{
-List methods = allMethods.get( methodName );
+String methodName = entry.getKey();
+List methods = entry.getValue();
/*
* Only process set/get where there is exactly one implementation
of the method per class and those
@@ -2032,6 +2033,11 @@ public class OgnlRuntime
/**
* This method returns a PropertyDescriptor for the given class and
property name using a Map lookup (using
* getPropertyDescriptorsMap()).
+ * @param targetClass a target class.
+ * @param propertyName a property name.
+ * @return the PropertyDescriptor for the given targetClass and
propertyName.
+ * @throws java.beans.IntrospectionException
+ * @throws OgnlException
*/
public static PropertyDescriptor getPropertyDescriptor( Class
targetClass, String propertyName )
throws IntrospectionException, OgnlException
@@ -2047,7 +2053,8 @@ public class OgnlRuntime
public static PropertyDescriptor[] getPropertyDescriptorsArray( Class
targetClass )
throws IntrospectionException, OgnlException
{
-return (PropertyDescriptor[]) getPropertyDescriptors( targetClass
).entrySet().toArray();
+Collection propertyDescriptors =
getPropertyDescriptors( targetClass ).values();
+return propertyDescriptors.toArray( new
PropertyDescriptor[propertyDescriptors.size()] );
}
/**
@@ -2056,6 +2063,8 @@ public class OgnlRuntime
* @param targetClass Class for which property descriptor is desired
* @param nameName of property
* @return PropertyDescriptor of the named property or null if the class
has no property with the given name
+ * @throws java.beans.IntrospectionException
+ * @throws OgnlException
*/
public static PropertyDescriptor getPropertyDescriptorFromArray( Class
targetClass, String name )
throws IntrospectionException, OgnlException
svn commit: r1197020 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java
Author: mcucchiara
Date: Thu Nov 3 09:32:26 2011
New Revision: 1197020
URL: http://svn.apache.org/viewvc?rev=1197020&view=rev
Log:
OGNL-37 - use valueOf() instead of new for boxing. Adjust unnecessary
conditional checking.
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java?rev=1197020&r1=1197019&r2=1197020&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java
Thu Nov 3 09:32:26 2011
@@ -335,6 +335,7 @@ public abstract class OgnlOps
* Evaluates the given object as a String and trims it if the trim flag is
true.
*
* @param value an object to interpret as a String
+ * @param trim if true trims the result
* @return the String value implied by the given object as returned by the
toString() method, or "null" if the
* object is null.
*/
@@ -427,37 +428,37 @@ public abstract class OgnlOps
public static Object toArray( char value, Class toType )
throws OgnlException
{
-return toArray( new Character( value ), toType );
+return toArray( Character.valueOf( value ), toType );
}
public static Object toArray( byte value, Class toType )
throws OgnlException
{
-return toArray( new Byte( value ), toType );
+return toArray( Byte.valueOf( value ), toType );
}
public static Object toArray( int value, Class toType )
throws OgnlException
{
-return toArray( new Integer( value ), toType );
+return toArray( Integer.valueOf( value ), toType );
}
public static Object toArray( long value, Class toType )
throws OgnlException
{
-return toArray( new Long( value ), toType );
+return toArray( Long.valueOf( value ), toType );
}
public static Object toArray( float value, Class toType )
throws OgnlException
{
-return toArray( new Float( value ), toType );
+return toArray( Float.valueOf( value ), toType );
}
public static Object toArray( double value, Class toType )
throws OgnlException
{
-return toArray( new Double( value ), toType );
+return toArray( Double.valueOf( value ), toType );
}
public static Object toArray( boolean value, Class toType )
@@ -469,37 +470,37 @@ public abstract class OgnlOps
public static Object convertValue( char value, Class toType )
throws OgnlException
{
-return convertValue( new Character( value ), toType );
+return convertValue( Character.valueOf(value), toType );
}
public static Object convertValue( byte value, Class toType )
throws OgnlException
{
-return convertValue( new Byte( value ), toType );
+return convertValue( Byte.valueOf( value ), toType );
}
public static Object convertValue( int value, Class toType )
throws OgnlException
{
-return convertValue( new Integer( value ), toType );
+return convertValue( Integer.valueOf( value ), toType );
}
public static Object convertValue( long value, Class toType )
throws OgnlException
{
-return convertValue( new Long( value ), toType );
+return convertValue( Long.valueOf( value ), toType );
}
public static Object convertValue( float value, Class toType )
throws OgnlException
{
-return convertValue( new Float( value ), toType );
+return convertValue( Float.valueOf( value ), toType );
}
public static Object convertValue( double value, Class toType )
throws OgnlException
{
-return convertValue( new Double( value ), toType );
+return convertValue( Double.valueOf( value ), toType );
}
public static Object convertValue( boolean value, Class toType )
@@ -513,19 +514,19 @@ public abstract class OgnlOps
public static Object convertValue( char value, Class toType,
boolean preventNull )
throws OgnlException
{
-return convertValue( new Character( value ), toType, preventNull );
+return convertValue( Character.valueOf( value ), toType, preventNull );
}
public static Object convertValue( byte value, Class toType,
boolean preventNull )
throws OgnlException
{
-return convertValue( new Byte( value ), toType, preventNull );
+return convertValue( Byte.valueOf( value ), toType, preventNull );
}
public static Object convertValue( int value, Class to
svn commit: r1197018 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectIndexedPropertyDescriptor.java
Author: mcucchiara
Date: Thu Nov 3 09:28:13 2011
New Revision: 1197018
URL: http://svn.apache.org/viewvc?rev=1197018&view=rev
Log:
OGNL-37 - Provide equals() and hashcode() implementation to override
PropertyDescriptor.
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectIndexedPropertyDescriptor.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectIndexedPropertyDescriptor.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectIndexedPropertyDescriptor.java?rev=1197018&r1=1197017&r2=1197018&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectIndexedPropertyDescriptor.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectIndexedPropertyDescriptor.java
Thu Nov 3 09:28:13 2011
@@ -118,4 +118,50 @@ public class ObjectIndexedPropertyDescri
{
return propertyType;
}
+
+@Override
+public boolean equals(Object o) {
+if (this == o)
+{
+return true;
+}
+
+if (!(o instanceof ObjectIndexedPropertyDescriptor))
+{
+return false;
+}
+
+if (!super.equals(o))
+{
+return false;
+}
+
+ObjectIndexedPropertyDescriptor that =
(ObjectIndexedPropertyDescriptor) o;
+
+if (indexedReadMethod != null ?
!indexedReadMethod.equals(that.indexedReadMethod) : that.indexedReadMethod !=
null)
+{
+return false;
+}
+
+if (indexedWriteMethod != null ?
!indexedWriteMethod.equals(that.indexedWriteMethod) : that.indexedWriteMethod
!= null)
+{
+return false;
+}
+
+if (propertyType != null ? !propertyType.equals(that.propertyType) :
that.propertyType != null)
+{
+return false;
+}
+
+return true;
+}
+
+@Override
+public int hashCode() {
+int result = super.hashCode();
+result = 31 * result + (indexedReadMethod != null ?
indexedReadMethod.hashCode() : 0);
+result = 31 * result + (indexedWriteMethod != null ?
indexedWriteMethod.hashCode() : 0);
+result = 31 * result + (propertyType != null ? propertyType.hashCode()
: 0);
+return result;
+}
}
svn commit: r1197015 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ExpressionNode.java
Author: mcucchiara
Date: Thu Nov 3 09:26:20 2011
New Revision: 1197015
URL: http://svn.apache.org/viewvc?rev=1197015&view=rev
Log:
OGNL-37 - Use StringBuilder instead of String concatenation with '+'.
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ExpressionNode.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ExpressionNode.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ExpressionNode.java?rev=1197015&r1=1197014&r2=1197015&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ExpressionNode.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ExpressionNode.java
Thu Nov 3 09:26:20 2011
@@ -140,7 +140,7 @@ public abstract class ExpressionNode
@Override
public String toSetSourceString( OgnlContext context, Object target )
{
-String result = ( parent == null ) ? "" : "(";
+StringBuilder sourceStringBuilder = new StringBuilder( parent == null
? "" : "(" );
if ( ( children != null ) && ( children.length > 0 ) )
{
@@ -148,17 +148,17 @@ public abstract class ExpressionNode
{
if ( i > 0 )
{
-result += " " + getExpressionOperator( i ) + " ";
+sourceStringBuilder.append( " " ).append(
getExpressionOperator( i ) ).append( ' ' );
}
-result += children[i].toSetSourceString( context, target );
+sourceStringBuilder.append( children[i].toSetSourceString(
context, target ) );
}
}
if ( parent != null )
{
-result = result + ")";
+sourceStringBuilder.append( ")" );
}
-return result;
+return sourceStringBuilder.toString();
}
}
svn commit: r1197014 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
Author: mcucchiara
Date: Thu Nov 3 09:24:21 2011
New Revision: 1197014
URL: http://svn.apache.org/viewvc?rev=1197014&view=rev
Log:
OGNL-37 - Use StringBuilder instead of String concatenation with '+'.
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java?rev=1197014&r1=1197013&r2=1197014&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
Thu Nov 3 09:24:21 2011
@@ -138,7 +138,7 @@ public class ASTMethod
}
String post = "";
-String result;
+StringBuilder sourceStringBuilder;
Method method;
OgnlExpressionCompiler compiler = OgnlRuntime.getCompiler( context );
@@ -196,7 +196,7 @@ public class ASTMethod
"Javassist does not currently support varargs method
calls" );
}
-result = "." + method.getName() + "(";
+sourceStringBuilder = new StringBuilder().append( "." ).append(
method.getName() ).append( "(" );
if ( ( children != null ) && ( children.length > 0 ) )
{
@@ -212,7 +212,7 @@ public class ASTMethod
{
if ( i > 0 )
{
-result = result + ", ";
+sourceStringBuilder.append( ", " );
}
Class prevType = context.getCurrentType();
@@ -235,7 +235,7 @@ public class ASTMethod
".class,
true)" );
}
-result += parmString;
+sourceStringBuilder.append( parmString );
}
if ( prevCast != null )
@@ -260,18 +260,18 @@ public class ASTMethod
throw OgnlOps.castToRuntime( t );
}
-result += ")" + post;
+sourceStringBuilder.append( ")" ).append( post );
if ( method.getReturnType() == void.class )
{
-coreExpression = result + ";";
+coreExpression = sourceStringBuilder.toString() + ";";
lastExpression = "null";
}
context.setCurrentType( method.getReturnType() );
context.setCurrentAccessor( compiler.getSuperOrInterfaceClass( method,
method.getDeclaringClass() ) );
-return result;
+return sourceStringBuilder.toString();
}
public String toSetSourceString( OgnlContext context, Object target )
svn commit: r1197011 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java
Author: mcucchiara
Date: Thu Nov 3 09:19:44 2011
New Revision: 1197011
URL: http://svn.apache.org/viewvc?rev=1197011&view=rev
Log:
OGNL-37 - Replaced for loops with foreach version.
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java?rev=1197011&r1=1197010&r2=1197011&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java
Thu Nov 3 09:19:44 2011
@@ -291,7 +291,7 @@ public class ASTChain
{
if ( ( children != null ) && ( children.length > 0 ) )
{
-for ( int i = 0; i < children.length; i++ )
+for ( Node child : children )
{
/*
* System.out.println("astchain child: " +
_children[i].getClass().getName() +
@@ -299,30 +299,28 @@ public class ASTChain
* context.getCurrentType());
*/
-String value = children[i].toGetSourceString( context,
context.getCurrentObject() );
+String value = child.toGetSourceString( context,
context.getCurrentObject() );
// System.out.println("astchain child returned >> " +
value + " <<");
-if ( ASTCtor.class.isInstance( children[i] ) )
+if ( ASTCtor.class.isInstance( child ) )
{
constructor = true;
}
-
-if ( NodeType.class.isInstance( children[i] )
-&& ( (NodeType) children[i] ).getGetterClass() != null
)
+
+if ( NodeType.class.isInstance( child ) && ( (NodeType)
child ).getGetterClass() != null )
{
-lastType = (NodeType) children[i];
+lastType = (NodeType) child;
}
// System.out.println("Astchain i: " + i + " currentobj :
" + context.getCurrentObject() +
// " and root: " + context.getRoot());
-if ( !ASTVarRef.class.isInstance( children[i] )
-&& !constructor
-&& !( OrderedReturn.class.isInstance( children[i] )
-&& ( (OrderedReturn) children[i] ).getLastExpression()
!= null )
-&& ( parent == null || !ASTSequence.class.isInstance(
parent ) ) )
+if ( !ASTVarRef.class.isInstance( child ) && !constructor
&& !(
+OrderedReturn.class.isInstance( child )
+&& ( (OrderedReturn) child ).getLastExpression()
!= null ) && ( parent == null
+|| !ASTSequence.class.isInstance( parent ) ) )
{
-value = OgnlRuntime.getCompiler( context
).castExpression( context, children[i], value );
+value = OgnlRuntime.getCompiler( context
).castExpression( context, child, value );
}
/*
@@ -331,11 +329,11 @@ public class ASTChain
* context.getPreviousType() + " prev accessor " +
context.getPreviousAccessor());
*/
-if ( OrderedReturn.class.isInstance( children[i] )
-&& ( (OrderedReturn) children[i] ).getLastExpression()
!= null )
+if ( OrderedReturn.class.isInstance( child )
+&& ( (OrderedReturn) child ).getLastExpression() !=
null )
{
ordered = true;
-OrderedReturn or = (OrderedReturn) children[i];
+OrderedReturn or = (OrderedReturn) child;
if ( or.getCoreExpression() == null ||
or.getCoreExpression().trim().length() <= 0 )
{
@@ -345,7 +343,7 @@ public class ASTChain
{
result += or.getCoreExpression();
}
-
+
lastExpression = or.getLastExpression();
if ( context.get( ExpressionCompiler.PRE_CAST ) !=
null )
@@ -353,9 +351,9 @@ public class ASTChain
lastExpression = context.remo
svn commit: r1197009 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java
Author: mcucchiara Date: Thu Nov 3 09:18:01 2011 New Revision: 1197009 URL: http://svn.apache.org/viewvc?rev=1197009&view=rev Log: OGNL-37 - Remove int boxing, lets rely on autoboxing. Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java?rev=1197009&r1=1197008&r2=1197009&view=diff == --- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java (original) +++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTChain.java Thu Nov 3 09:18:01 2011 @@ -109,15 +109,16 @@ public class ASTChain i++; break; case DynamicSubscript.FIRST: -index = new Integer( ( len > 0 ) ? 0 : -1 ); +index = ( len > 0 ) ? 0 : -1; break; case DynamicSubscript.MID: -index = new Integer( ( len > 0 ) ? ( len / 2 ) : -1 ); +index = ( len > 0 ) ? ( len / 2 ) : -1; break; case DynamicSubscript.LAST: -index = new Integer( ( len > 0 ) ? ( len - 1 ) : -1 ); +index = ( len > 0 ) ? ( len - 1 ) : -1; +break; +default: break; -default: break; } } else @@ -190,15 +191,16 @@ public class ASTChain i++; break; case DynamicSubscript.FIRST: -index = new Integer( ( len > 0 ) ? 0 : -1 ); +index = ( len > 0 ) ? 0 : -1; break; case DynamicSubscript.MID: -index = new Integer( ( len > 0 ) ? ( len / 2 ) : -1 ); +index = ( len > 0 ) ? ( len / 2 ) : -1; break; case DynamicSubscript.LAST: -index = new Integer( ( len > 0 ) ? ( len - 1 ) : -1 ); +index = ( len > 0 ) ? ( len - 1 ) : -1; +break; +default: break; -default: break; } } else
svn commit: r1197007 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
Author: mcucchiara
Date: Thu Nov 3 09:07:53 2011
New Revision: 1197007
URL: http://svn.apache.org/viewvc?rev=1197007&view=rev
Log:
OGNL-37 - Remove unnecessary int boxing and redundant code.
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java?rev=1197007&r1=1197006&r2=1197007&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
Thu Nov 3 09:07:53 2011
@@ -43,7 +43,7 @@ public class ArrayPropertyAccessor
{
if ( name.equals( "length" ) )
{
-result = new Integer( Array.getLength( target ) );
+result = Array.getLength(target);
}
else
{
@@ -65,13 +65,13 @@ public class ArrayPropertyAccessor
System.arraycopy( target, 0, result, 0, len );
break;
case DynamicSubscript.FIRST:
-index = new Integer( ( len > 0 ) ? 0 : -1 );
+index = ( len > 0 ) ? 0 : -1;
break;
case DynamicSubscript.MID:
-index = new Integer( ( len > 0 ) ? ( len / 2 ) : -1 );
+index = ( len > 0 ) ? ( len / 2 ) : -1;
break;
case DynamicSubscript.LAST:
-index = new Integer( ( len > 0 ) ? ( len - 1 ) : -1 );
+index = ( len > 0 ) ? ( len - 1 ) : -1;
break;
default: break;
}
@@ -97,20 +97,18 @@ public class ArrayPropertyAccessor
public void setProperty( Map context, Object target,
Object name, Object value )
throws OgnlException
{
-Object index = name;
-boolean isNumber = ( index instanceof Number );
+boolean isNumber = ( name instanceof Number );
-if ( isNumber || ( index instanceof DynamicSubscript ) )
+if ( isNumber || ( name instanceof DynamicSubscript ) )
{
TypeConverter converter = ( (OgnlContext) context
).getTypeConverter();
Object convertedValue;
-convertedValue =
-converter.convertValue( context, target, null,
name.toString(), value,
-target.getClass().getComponentType() );
+convertedValue = converter.convertValue( context, target, null,
name.toString(), value,
+
target.getClass().getComponentType() );
if ( isNumber )
{
-int i = ( (Number) index ).intValue();
+int i = ( (Number) name ).intValue();
if ( i >= 0 )
{
@@ -121,21 +119,13 @@ public class ArrayPropertyAccessor
{
int len = Array.getLength( target );
-switch ( ( (DynamicSubscript) index ).getFlag() )
+switch ( ( (DynamicSubscript) name ).getFlag() )
{
case DynamicSubscript.ALL:
System.arraycopy( target, 0, convertedValue, 0, len );
return;
-case DynamicSubscript.FIRST:
-index = new Integer( ( len > 0 ) ? 0 : -1 );
-break;
-case DynamicSubscript.MID:
-index = new Integer( ( len > 0 ) ? ( len / 2 ) : -1 );
+default:
break;
-case DynamicSubscript.LAST:
-index = new Integer( ( len > 0 ) ? ( len - 1 ) : -1 );
-break;
-default: break;
}
}
}
@@ -147,7 +137,7 @@ public class ArrayPropertyAccessor
}
else
{
-throw new NoSuchPropertyException( target, index );
+throw new NoSuchPropertyException( target, name );
}
}
}
svn commit: r1197002 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/DeclaredMethodCacheEntry.java
Author: mcucchiara
Date: Thu Nov 3 08:57:06 2011
New Revision: 1197002
URL: http://svn.apache.org/viewvc?rev=1197002&view=rev
Log:
OGNL-37 - Modified equals() implementation to take account of super class
fields.
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/DeclaredMethodCacheEntry.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/DeclaredMethodCacheEntry.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/DeclaredMethodCacheEntry.java?rev=1197002&r1=1197001&r2=1197002&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/DeclaredMethodCacheEntry.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/DeclaredMethodCacheEntry.java
Thu Nov 3 08:57:06 2011
@@ -46,20 +46,24 @@ public class DeclaredMethodCacheEntry
}
@Override
-public boolean equals( Object o )
-{
-if ( this == o )
+public boolean equals(Object o) {
+if (this == o)
{
return true;
}
-if ( !( o instanceof DeclaredMethodCacheEntry ) )
+if (!(o instanceof DeclaredMethodCacheEntry))
+{
+return false;
+}
+if (!super.equals(o))
{
return false;
}
DeclaredMethodCacheEntry that = (DeclaredMethodCacheEntry) o;
-return targetClass == that.targetClass;
+return type == that.type;
+
}
@Override
svn commit: r1196996 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
Author: mcucchiara
Date: Thu Nov 3 08:49:08 2011
New Revision: 1196996
URL: http://svn.apache.org/viewvc?rev=1196996&view=rev
Log:
OGNL-37 - Use Map.entrySet instead of Map.keySet for better performance.
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java?rev=1196996&r1=1196995&r2=1196996&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
Thu Nov 3 08:49:08 2011
@@ -704,9 +704,9 @@ public class OgnlContext
public void putAll( Map t )
{
-for ( String k : t.keySet() )
+for ( Entry entry : t.entrySet() )
{
-put( k, t.get( k ) );
+put( entry.getKey(), entry.getValue() );
}
}
svn commit: r1195881 - /commons/proper/ognl/trunk/src/changes/changes.xml
Author: mcucchiara Date: Tue Nov 1 08:56:50 2011 New Revision: 1195881 URL: http://svn.apache.org/viewvc?rev=1195881&view=rev Log: Remove duplicated issue id. Modified: commons/proper/ognl/trunk/src/changes/changes.xml Modified: commons/proper/ognl/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/changes/changes.xml?rev=1195881&r1=1195880&r2=1195881&view=diff == --- commons/proper/ognl/trunk/src/changes/changes.xml (original) +++ commons/proper/ognl/trunk/src/changes/changes.xml Tue Nov 1 08:56:50 2011 @@ -24,9 +24,9 @@ Link "Benchmarks" on left hand navigation is broken (contributed by Adrian Cumiskey). - OGNL-33 - Improvements to JJTOgnlParserState (contributed by Adrian Cumiskey). - OGNL-32 - CPD fix to ASTProperty (contributed by Adrian Cumiskey). - OGNL-31 - Some CPD fixes around ASTMethod and ASTStaticMethod (contributed by Adrian Cumiskey). + Improvements to JJTOgnlParserState (contributed by Adrian Cumiskey). + CPD fix to ASTProperty (contributed by Adrian Cumiskey). + Some CPD fixes around ASTMethod and ASTStaticMethod (contributed by Adrian Cumiskey). Visitor pattern needs way to propagate exceptions (contributed by Daniel Pitts). Move "toString" implementations into visitor pattern (contributed by Daniel Pitts). JUnit Tests produce confusing output.
svn commit: r1195879 - in /commons/proper/ognl/trunk/src: changes/changes.xml site/site.xml
Author: mcucchiara Date: Tue Nov 1 08:56:20 2011 New Revision: 1195879 URL: http://svn.apache.org/viewvc?rev=1195879&view=rev Log: OGNL-36 - Link "Benchmarks" on left hand navigation is broken (contributed by Adrian Cumiskey). Modified: commons/proper/ognl/trunk/src/changes/changes.xml commons/proper/ognl/trunk/src/site/site.xml Modified: commons/proper/ognl/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/changes/changes.xml?rev=1195879&r1=1195878&r2=1195879&view=diff == --- commons/proper/ognl/trunk/src/changes/changes.xml (original) +++ commons/proper/ognl/trunk/src/changes/changes.xml Tue Nov 1 08:56:20 2011 @@ -23,6 +23,7 @@ + Link "Benchmarks" on left hand navigation is broken (contributed by Adrian Cumiskey). OGNL-33 - Improvements to JJTOgnlParserState (contributed by Adrian Cumiskey). OGNL-32 - CPD fix to ASTProperty (contributed by Adrian Cumiskey). OGNL-31 - Some CPD fixes around ASTMethod and ASTStaticMethod (contributed by Adrian Cumiskey). Modified: commons/proper/ognl/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/site/site.xml?rev=1195879&r1=1195878&r2=1195879&view=diff == --- commons/proper/ognl/trunk/src/site/site.xml (original) +++ commons/proper/ognl/trunk/src/site/site.xml Tue Nov 1 08:56:20 2011 @@ -30,7 +30,7 @@ - +
svn commit: r1194962 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
Author: mcucchiara
Date: Sat Oct 29 18:12:54 2011
New Revision: 1194962
URL: http://svn.apache.org/viewvc?rev=1194962&view=rev
Log:
OGNL-11: fixed checkstyle errors (Fixed svn id position)
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java?rev=1194962&r1=1194961&r2=1194962&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
Sat Oct 29 18:12:54 2011
@@ -19,10 +19,6 @@ package org.apache.commons.ognl;
* under the License.
*/
-/*
- * $Id$
- */
-
import org.apache.commons.ognl.enhance.ExpressionCompiler;
import org.apache.commons.ognl.enhance.OgnlExpressionCompiler;
import org.apache.commons.ognl.internal.Cache;
@@ -84,6 +80,8 @@ import java.util.Set;
* / {@link NullHandler} instances / etc..
*
*
+ * $Id$
+ *
* @author Luke Blanshard (blans...@netscape.net)
* @author Drew Davidson (d...@ognl.org)
*/
svn commit: r1194961 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
Author: mcucchiara Date: Sat Oct 29 18:11:37 2011 New Revision: 1194961 URL: http://svn.apache.org/viewvc?rev=1194961&view=rev Log: OGNL-11: fixed checkstyle errors (Fixed licence header position) Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java?rev=1194961&r1=1194960&r2=1194961&view=diff == --- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java (original) +++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java Sat Oct 29 18:11:37 2011 @@ -1,6 +1,6 @@ +package org.apache.commons.ognl; + /* - * $Id$ - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -19,7 +19,9 @@ * under the License. */ -package org.apache.commons.ognl; +/* + * $Id$ + */ import org.apache.commons.ognl.enhance.ExpressionCompiler; import org.apache.commons.ognl.enhance.OgnlExpressionCompiler;
svn commit: r1194960 - in /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl: internal/entry/PropertyDescriptorCacheEntryFactory.java internal/package-info.java package-info.java
Author: mcucchiara Date: Sat Oct 29 18:06:54 2011 New Revision: 1194960 URL: http://svn.apache.org/viewvc?rev=1194960&view=rev Log: OGNL-11: fixed checkstyle errors (Fixed licence header position) Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/package-info.java commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/package-info.java Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java?rev=1194960&r1=1194959&r2=1194960&view=diff == --- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java (original) +++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PropertyDescriptorCacheEntryFactory.java Sat Oct 29 18:06:54 2011 @@ -1,6 +1,6 @@ +package org.apache.commons.ognl.internal.entry; + /* - * $Id$ - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -19,7 +19,9 @@ * under the License. */ -package org.apache.commons.ognl.internal.entry; +/* + * $Id$ + */ import org.apache.commons.ognl.OgnlException; import org.apache.commons.ognl.OgnlRuntime; Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/package-info.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/package-info.java?rev=1194960&r1=1194959&r2=1194960&view=diff == --- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/package-info.java (original) +++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/package-info.java Sat Oct 29 18:06:54 2011 @@ -1,6 +1,3 @@ -/** - * Internal stuff only, users don't need to take this package in consideration. - */ package org.apache.commons.ognl.internal; /* @@ -21,3 +18,7 @@ package org.apache.commons.ognl.internal * specific language governing permissions and limitations * under the License. */ + +/** + * Internal stuff only, users don't need to take this package in consideration. + */ Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/package-info.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/package-info.java?rev=1194960&r1=1194959&r2=1194960&view=diff == --- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/package-info.java (original) +++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/package-info.java Sat Oct 29 18:06:54 2011 @@ -1,5 +1,6 @@ +package org.apache.commons.ognl; + /* - * $Id$ * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -33,6 +34,6 @@ * * We pronounce OGNL as a word, like the last syllables of a drunken * pronunciation of "orthogonal" or like "ogg-null". + * $Id$ */ -package org.apache.commons.ognl;
svn commit: r1194959 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PermissionCacheEntryFactory.java
Author: mcucchiara
Date: Sat Oct 29 18:04:57 2011
New Revision: 1194959
URL: http://svn.apache.org/viewvc?rev=1194959&view=rev
Log:
OGNL-11: fixed checkstyle errors (Line is longer than 120 characters)
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PermissionCacheEntryFactory.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PermissionCacheEntryFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PermissionCacheEntryFactory.java?rev=1194959&r1=1194958&r2=1194959&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PermissionCacheEntryFactory.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PermissionCacheEntryFactory.java
Sat Oct 29 18:04:57 2011
@@ -35,7 +35,8 @@ public class PermissionCacheEntryFactory
public Permission create( PermissionCacheEntry key )
throws CacheException
{
-return new OgnlInvokePermission( "invoke." +
key.method.getDeclaringClass().getName() + "." + key.method.getName() );
+return new OgnlInvokePermission(
+"invoke." + key.method.getDeclaringClass().getName() + "." +
key.method.getName() );
}
}
svn commit: r1194957 - in /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry: MethodCacheEntryFactory.java MethodPermCacheEntryFactory.java PermissionCacheEntry.java Permi
Author: mcucchiara Date: Sat Oct 29 18:04:20 2011 New Revision: 1194957 URL: http://svn.apache.org/viewvc?rev=1194957&view=rev Log: OGNL-11: fixed checkstyle errors (Fixed licence header position) Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodCacheEntryFactory.java commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodPermCacheEntryFactory.java commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PermissionCacheEntry.java commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PermissionCacheEntryFactory.java Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodCacheEntryFactory.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodCacheEntryFactory.java?rev=1194957&r1=1194956&r2=1194957&view=diff == --- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodCacheEntryFactory.java (original) +++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodCacheEntryFactory.java Sat Oct 29 18:04:20 2011 @@ -1,6 +1,6 @@ +package org.apache.commons.ognl.internal.entry; + /* - * $Id$ - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -19,7 +19,10 @@ * under the License. */ -package org.apache.commons.ognl.internal.entry; +/* + * $Id$ + */ + import org.apache.commons.ognl.OgnlRuntime; import org.apache.commons.ognl.internal.CacheException; Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodPermCacheEntryFactory.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodPermCacheEntryFactory.java?rev=1194957&r1=1194956&r2=1194957&view=diff == --- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodPermCacheEntryFactory.java (original) +++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodPermCacheEntryFactory.java Sat Oct 29 18:04:20 2011 @@ -1,6 +1,6 @@ +package org.apache.commons.ognl.internal.entry; + /* - * $Id$ - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -19,7 +19,9 @@ * under the License. */ -package org.apache.commons.ognl.internal.entry; +/* + * $Id$ + */ import org.apache.commons.ognl.OgnlRuntime; import org.apache.commons.ognl.internal.CacheException; Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PermissionCacheEntry.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PermissionCacheEntry.java?rev=1194957&r1=1194956&r2=1194957&view=diff == --- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PermissionCacheEntry.java (original) +++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PermissionCacheEntry.java Sat Oct 29 18:04:20 2011 @@ -1,6 +1,6 @@ +package org.apache.commons.ognl.internal.entry; + /* - * $Id$ - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -19,7 +19,9 @@ * under the License. */ -package org.apache.commons.ognl.internal.entry; +/* + * $Id$ + */ import java.lang.reflect.Method; Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PermissionCacheEntryFactory.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PermissionCacheEntryFactory.java?rev=1194957&r1=1194956&r2=1194957&view=diff == --- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PermissionCacheEntryFactory.java (original) +++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/PermissionCacheEntryFactory.java Sat Oct 29 18:04:20 2011 @@ -1,6 +1,6 @@ +package org.apache.commons.ognl.internal.entry; + /* - * $Id$ - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for ad
svn commit: r1194956 - in /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry: GenericMethodParameterTypeFactory.java MethodAccessCacheEntryFactory.java MethodAccessEntryVa
Author: mcucchiara
Date: Sat Oct 29 18:02:14 2011
New Revision: 1194956
URL: http://svn.apache.org/viewvc?rev=1194956&view=rev
Log:
OGNL-11: fixed checkstyle errors (Fixed licence header position)
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/GenericMethodParameterTypeFactory.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodAccessCacheEntryFactory.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodAccessEntryValue.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodCacheEntry.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/GenericMethodParameterTypeFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/GenericMethodParameterTypeFactory.java?rev=1194956&r1=1194955&r2=1194956&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/GenericMethodParameterTypeFactory.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/GenericMethodParameterTypeFactory.java
Sat Oct 29 18:02:14 2011
@@ -1,6 +1,6 @@
+package org.apache.commons.ognl.internal.entry;
+
/*
- * $Id$
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,7 +19,9 @@
* under the License.
*/
-package org.apache.commons.ognl.internal.entry;
+/*
+ * $Id$
+ */
import org.apache.commons.ognl.internal.CacheException;
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodAccessCacheEntryFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodAccessCacheEntryFactory.java?rev=1194956&r1=1194955&r2=1194956&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodAccessCacheEntryFactory.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodAccessCacheEntryFactory.java
Sat Oct 29 18:02:14 2011
@@ -1,6 +1,6 @@
+package org.apache.commons.ognl.internal.entry;
+
/*
- * $Id$
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,7 +19,9 @@
* under the License.
*/
-package org.apache.commons.ognl.internal.entry;
+/*
+ * $Id$
+ */
import org.apache.commons.ognl.internal.CacheException;
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodAccessEntryValue.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodAccessEntryValue.java?rev=1194956&r1=1194955&r2=1194956&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodAccessEntryValue.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodAccessEntryValue.java
Sat Oct 29 18:02:14 2011
@@ -1,6 +1,6 @@
+package org.apache.commons.ognl.internal.entry;
+
/*
- * $Id$
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,7 +19,9 @@
* under the License.
*/
-package org.apache.commons.ognl.internal.entry;
+/*
+ * $Id$
+ */
public class MethodAccessEntryValue
{
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodCacheEntry.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodCacheEntry.java?rev=1194956&r1=1194955&r2=1194956&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodCacheEntry.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/MethodCacheEntry.java
Sat Oct 29 18:02:14 2011
@@ -1,6 +1,6 @@
+package org.apache.commons.ognl.internal.entry;
+
/*
- * $Id$
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,7 +19,9 @@
* under the License.
*/
-package
svn commit: r1194954 - in /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal: ./ entry/
Author: mcucchiara Date: Sat Oct 29 18:00:27 2011 New Revision: 1194954 URL: http://svn.apache.org/viewvc?rev=1194954&view=rev Log: OGNL-11: fixed checkstyle errors (Fixed licence header position) Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapCache.java commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapCacheFactory.java commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapClassCache.java commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockCache.java commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockCacheFactory.java commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ReentrantReadWriteLockClassCache.java commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/CacheEntry.java commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/CacheEntryFactory.java commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/ClassCacheEntryFactory.java commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/DeclaredMethodCacheEntry.java commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/DeclaredMethodCacheEntryFactory.java commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/FiedlCacheEntryFactory.java commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/entry/GenericMethodParameterTypeCacheEntry.java Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapCache.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapCache.java?rev=1194954&r1=1194953&r2=1194954&view=diff == --- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapCache.java (original) +++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapCache.java Sat Oct 29 18:00:27 2011 @@ -1,7 +1,7 @@ +package org.apache.commons.ognl.internal; + /* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one + * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file @@ -19,7 +19,9 @@ * under the License. */ -package org.apache.commons.ognl.internal; +/* + * $Id$ + */ import org.apache.commons.ognl.internal.entry.CacheEntryFactory; Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapCacheFactory.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapCacheFactory.java?rev=1194954&r1=1194953&r2=1194954&view=diff == --- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapCacheFactory.java (original) +++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapCacheFactory.java Sat Oct 29 18:00:27 2011 @@ -1,6 +1,6 @@ +package org.apache.commons.ognl.internal; + /* - * $Id$ - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -19,7 +19,9 @@ * under the License. */ -package org.apache.commons.ognl.internal; +/* + * $Id$ + */ import org.apache.commons.ognl.internal.entry.CacheEntryFactory; import org.apache.commons.ognl.internal.entry.ClassCacheEntryFactory; Modified: commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapClassCache.java URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapClassCache.java?rev=1194954&r1=1194953&r2=1194954&view=diff == --- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapClassCache.java (original) +++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/HashMapClassCache.java Sat Oct 29 18:00:27 2011 @@ -1,7 +1,7 @@ +package org.apache.commons.ognl.internal; + /* - * $Id$ - * - * Licensed to the Apache Software Foundation (ASF) under one + * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file @@ -19,7 +19,10 @
svn commit: r1194951 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Entry.java
Author: mcucchiara
Date: Sat Oct 29 17:54:24 2011
New Revision: 1194951
URL: http://svn.apache.org/viewvc?rev=1194951&view=rev
Log:
OGNL-11: fixed checkstyle errors (Fixed licence header position, also added
missing spaces)
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Entry.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Entry.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Entry.java?rev=1194951&r1=1194950&r2=1194951&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Entry.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Entry.java
Sat Oct 29 17:54:24 2011
@@ -1,6 +1,6 @@
+package org.apache.commons.ognl.internal;
+
/*
- * $Id$
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,15 +19,16 @@
* under the License.
*/
-package org.apache.commons.ognl.internal;
/**
* Used by {@link ClassCacheImpl} to store entries in the cache.
+ *
+ * $Id$
*/
-class Entry
+class Entry
{
-private Entry next;
+private Entry next;
private final K key;
@@ -54,12 +55,12 @@ class Entry
this.value = value;
}
-public Entry getNext()
+public Entry getNext()
{
return next;
}
-public void setNext( Entry next )
+public void setNext( Entry next )
{
this.next = next;
}
svn commit: r1194950 - in /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal: ConcurrentHashMapCache.java ConcurrentHashMapCacheFactory.java ConcurrentHashMapClassCache.java
Author: mcucchiara
Date: Sat Oct 29 17:52:20 2011
New Revision: 1194950
URL: http://svn.apache.org/viewvc?rev=1194950&view=rev
Log:
OGNL-11: fixed checkstyle errors (Fixed licence header position)
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCache.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCacheFactory.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapClassCache.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCache.java?rev=1194950&r1=1194949&r2=1194950&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCache.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCache.java
Sat Oct 29 17:52:20 2011
@@ -1,7 +1,7 @@
+package org.apache.commons.ognl.internal;
+
/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
@@ -19,8 +19,9 @@
* under the License.
*/
-package org.apache.commons.ognl.internal;
-
+/*
+ * $Id$
+ */
import org.apache.commons.ognl.internal.entry.CacheEntryFactory;
import java.util.concurrent.ConcurrentHashMap;
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCacheFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCacheFactory.java?rev=1194950&r1=1194949&r2=1194950&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCacheFactory.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapCacheFactory.java
Sat Oct 29 17:52:20 2011
@@ -1,7 +1,7 @@
+package org.apache.commons.ognl.internal;
+
/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
@@ -19,7 +19,9 @@
* under the License.
*/
-package org.apache.commons.ognl.internal;
+/*
+ * $Id$
+ */
import org.apache.commons.ognl.internal.entry.CacheEntryFactory;
import org.apache.commons.ognl.internal.entry.ClassCacheEntryFactory;
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapClassCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapClassCache.java?rev=1194950&r1=1194949&r2=1194950&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapClassCache.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ConcurrentHashMapClassCache.java
Sat Oct 29 17:52:20 2011
@@ -1,6 +1,6 @@
+package org.apache.commons.ognl.internal;
+
/*
- * $Id$
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,13 +19,15 @@
* under the License.
*/
-package org.apache.commons.ognl.internal;
-
import org.apache.commons.ognl.ClassCacheInspector;
import org.apache.commons.ognl.internal.entry.CacheEntryFactory;
+/*
+ * $Id$
+ */
+
public class ConcurrentHashMapClassCache
-extends ConcurrentHashMapCache,T>
+extends ConcurrentHashMapCache, T>
implements ClassCache
{
private ClassCacheInspector inspector;
svn commit: r1194946 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheImpl.java
Author: mcucchiara
Date: Sat Oct 29 17:47:02 2011
New Revision: 1194946
URL: http://svn.apache.org/viewvc?rev=1194946&view=rev
Log:
OGNL-11: fixed checkstyle errors (renamed local variables according with the
naming convention)
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheImpl.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheImpl.java?rev=1194946&r1=1194945&r2=1194946&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheImpl.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheImpl.java
Sat Oct 29 17:47:02 2011
@@ -40,18 +40,18 @@ public class ClassCacheImpl
/* ...and now you see why. The table size is used as a mask for generating
hashes */
private static final int TABLE_SIZE_MASK = TABLE_SIZE - 1;
-private Entry, V>[] _table = new Entry[TABLE_SIZE];
+private Entry, V>[] table = new Entry[TABLE_SIZE];
-private ClassCacheInspector _classInspector;
+private ClassCacheInspector classInspector;
-private int _size = 0;
+private int size = 0;
/**
* {@inheritDoc}
*/
public void setClassInspector( ClassCacheInspector inspector )
{
-_classInspector = inspector;
+classInspector = inspector;
}
/**
@@ -59,12 +59,12 @@ public class ClassCacheImpl
*/
public void clear()
{
-for ( int i = 0; i < _table.length; i++ )
+for ( int i = 0; i < table.length; i++ )
{
-_table[i] = null;
+table[i] = null;
}
-_size = 0;
+size = 0;
}
/**
@@ -72,7 +72,7 @@ public class ClassCacheImpl
*/
public int getSize()
{
-return _size;
+return size;
}
/**
@@ -83,7 +83,7 @@ public class ClassCacheImpl
{
int i = key.hashCode() & TABLE_SIZE_MASK;
-Entry, V> entry = _table[i];
+Entry, V> entry = table[i];
while ( entry != null )
{
@@ -102,7 +102,7 @@ public class ClassCacheImpl
*/
public final V put( Class key, V value )
{
-if ( _classInspector != null && !_classInspector.shouldCache( key ) )
+if ( classInspector != null && !classInspector.shouldCache( key ) )
{
return value;
}
@@ -110,12 +110,12 @@ public class ClassCacheImpl
V result = null;
int i = key.hashCode() & TABLE_SIZE_MASK;
-Entry, V> entry = _table[i];
+Entry, V> entry = table[i];
if ( entry == null )
{
-_table[i] = new Entry, V>( key, value );
-_size++;
+table[i] = new Entry, V>( key, value );
+size++;
}
else
{
@@ -157,8 +157,8 @@ public class ClassCacheImpl
@Override
public String toString()
{
-return "ClassCacheImpl[" + "_table=" + ( _table == null ? null :
Arrays.asList( _table ) ) + '\n'
-+ ", _classInspector=" + _classInspector + '\n' + ", _size=" +
_size + '\n' + ']';
+return "ClassCacheImpl[" + "_table=" + ( table == null ? null :
Arrays.asList( table ) ) + '\n'
++ ", _classInspector=" + classInspector + '\n' + ", _size=" + size
+ '\n' + ']';
}
}
svn commit: r1194945 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java
Author: mcucchiara
Date: Sat Oct 29 17:44:52 2011
New Revision: 1194945
URL: http://svn.apache.org/viewvc?rev=1194945&view=rev
Log:
OGNL-11: fixed checkstyle errors (removed inner assignment)
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java?rev=1194945&r1=1194944&r2=1194945&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java
Sat Oct 29 17:44:52 2011
@@ -36,7 +36,8 @@ public class ClassCacheHandler
synchronized ( handlers )
{
-if ( ( answer = handlers.get( forClass ) ) == null )
+answer = handlers.get( forClass );
+if ( answer == null )
{
Class keyFound;
svn commit: r1194944 - in /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal: CacheFactory.java ClassCache.java ClassCacheHandler.java ClassCacheImpl.java
Author: mcucchiara
Date: Sat Oct 29 17:42:47 2011
New Revision: 1194944
URL: http://svn.apache.org/viewvc?rev=1194944&view=rev
Log:
OGNL-11: fixed checkstyle errors (Fixed licence header position)
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/CacheFactory.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCache.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheImpl.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/CacheFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/CacheFactory.java?rev=1194944&r1=1194943&r2=1194944&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/CacheFactory.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/CacheFactory.java
Sat Oct 29 17:42:47 2011
@@ -1,5 +1,24 @@
package org.apache.commons.ognl.internal;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import org.apache.commons.ognl.internal.entry.CacheEntryFactory;
import org.apache.commons.ognl.internal.entry.ClassCacheEntryFactory;
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCache.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCache.java?rev=1194944&r1=1194943&r2=1194944&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCache.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCache.java
Sat Oct 29 17:42:47 2011
@@ -1,6 +1,6 @@
+package org.apache.commons.ognl.internal;
+
/*
- * $Id$
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,8 +19,9 @@
* under the License.
*/
-package org.apache.commons.ognl.internal;
-
+/*
+ * $Id$
+ */
import org.apache.commons.ognl.ClassCacheInspector;
/**
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java?rev=1194944&r1=1194943&r2=1194944&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheHandler.java
Sat Oct 29 17:42:47 2011
@@ -1,6 +1,6 @@
+package org.apache.commons.ognl.internal;
+
/*
- * $Id$
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,8 +19,9 @@
* under the License.
*/
-package org.apache.commons.ognl.internal;
-
+/*
+ * $Id$
+ */
public class ClassCacheHandler
{
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheImpl.java?rev=1194944&r1=1194943&r2=1194944&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheImpl.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/ClassCacheImpl.java
Sat Oct 29 17:42:47 2011
@@ -1,6 +1,6 @@
+package org.apache.commons.ognl.internal;
+
/*
- * $Id$
- *
* Licensed to the Ap
svn commit: r1194943 - in /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal: Cache.java CacheException.java
Author: mcucchiara
Date: Sat Oct 29 17:35:30 2011
New Revision: 1194943
URL: http://svn.apache.org/viewvc?rev=1194943&view=rev
Log:
OGNL-11: fixed checkstyle errors (Line does not match expected licence header)
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Cache.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/CacheException.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Cache.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Cache.java?rev=1194943&r1=1194942&r2=1194943&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Cache.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Cache.java
Sat Oct 29 17:35:30 2011
@@ -1,8 +1,6 @@
package org.apache.commons.ognl.internal;
/*
- * $Id$
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -21,7 +19,9 @@ package org.apache.commons.ognl.internal
* under the License.
*/
-
+/**
+ * $Id$
+ */
public interface Cache
{
void clear();
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/CacheException.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/CacheException.java?rev=1194943&r1=1194942&r2=1194943&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/CacheException.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/CacheException.java
Sat Oct 29 17:35:30 2011
@@ -1,6 +1,6 @@
+package org.apache.commons.ognl.internal;
+
/*
- * $Id$
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,8 +19,9 @@
* under the License.
*/
-package org.apache.commons.ognl.internal;
-
+/*
+ * $Id$
+ */
import org.apache.commons.ognl.OgnlException;
public class CacheException
svn commit: r1194942 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Cache.java
Author: mcucchiara
Date: Sat Oct 29 17:33:19 2011
New Revision: 1194942
URL: http://svn.apache.org/viewvc?rev=1194942&view=rev
Log:
OGNL-11: fixed checkstyle errors (Line does not match expected header line of
'^package)
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Cache.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Cache.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Cache.java?rev=1194942&r1=1194941&r2=1194942&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Cache.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/internal/Cache.java
Sat Oct 29 17:33:19 2011
@@ -1,3 +1,5 @@
+package org.apache.commons.ognl.internal;
+
/*
* $Id$
*
@@ -19,7 +21,6 @@
* under the License.
*/
-package org.apache.commons.ognl.internal;
public interface Cache
{
svn commit: r1194875 - in /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance: LocalReferenceImpl.java OrderedReturn.java package-info.java
Author: mcucchiara
Date: Sat Oct 29 11:21:20 2011
New Revision: 1194875
URL: http://svn.apache.org/viewvc?rev=1194875&view=rev
Log:
OGNL-11: fixed checkstyle errors
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/LocalReferenceImpl.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/OrderedReturn.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/package-info.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/LocalReferenceImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/LocalReferenceImpl.java?rev=1194875&r1=1194874&r2=1194875&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/LocalReferenceImpl.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/LocalReferenceImpl.java
Sat Oct 29 11:21:20 2011
@@ -26,17 +26,17 @@ public class LocalReferenceImpl
implements LocalReference
{
-private final String _name;
+private final String name;
-private final Class _type;
+private final Class type;
-private final String _expression;
+private final String expression;
public LocalReferenceImpl( String name, String expression, Class type )
{
-_name = name;
-_type = type;
-_expression = expression;
+this.name = name;
+this.type = type;
+this.expression = expression;
}
/**
@@ -44,7 +44,7 @@ public class LocalReferenceImpl
*/
public String getName()
{
-return _name;
+return name;
}
/**
@@ -52,7 +52,7 @@ public class LocalReferenceImpl
*/
public String getExpression()
{
-return _expression;
+return expression;
}
/**
@@ -60,7 +60,7 @@ public class LocalReferenceImpl
*/
public Class getType()
{
-return _type;
+return type;
}
/**
@@ -80,15 +80,15 @@ public class LocalReferenceImpl
LocalReferenceImpl that = (LocalReferenceImpl) o;
-if ( _expression != null ? !_expression.equals( that._expression ) :
that._expression != null )
+if ( expression != null ? !expression.equals( that.expression ) :
that.expression != null )
{
return false;
}
-if ( _name != null ? !_name.equals( that._name ) : that._name != null )
+if ( name != null ? !name.equals( that.name ) : that.name != null )
{
return false;
}
-if ( _type != null ? !_type.equals( that._type ) : that._type != null )
+if ( type != null ? !type.equals( that.type ) : that.type != null )
{
return false;
}
@@ -103,9 +103,9 @@ public class LocalReferenceImpl
public int hashCode()
{
int result;
-result = ( _name != null ? _name.hashCode() : 0 );
-result = 31 * result + ( _type != null ? _type.hashCode() : 0 );
-result = 31 * result + ( _expression != null ? _expression.hashCode()
: 0 );
+result = ( name != null ? name.hashCode() : 0 );
+result = 31 * result + ( type != null ? type.hashCode() : 0 );
+result = 31 * result + ( expression != null ? expression.hashCode() :
0 );
return result;
}
@@ -115,7 +115,7 @@ public class LocalReferenceImpl
@Override
public String toString()
{
-return "LocalReferenceImpl[" + "_name='" + _name + '\'' + '\n' + ",
_type=" + _type + '\n' + ", _expression='"
-+ _expression + '\'' + '\n' + ']';
+return "LocalReferenceImpl[" + "_name='" + name + '\'' + '\n' + ",
_type=" + type + '\n' + ", _expression='"
++ expression + '\'' + '\n' + ']';
}
}
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/OrderedReturn.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/OrderedReturn.java?rev=1194875&r1=1194874&r2=1194875&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/OrderedReturn.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/OrderedReturn.java
Sat Oct 29 11:21:20 2011
@@ -19,10 +19,10 @@ package org.apache.commons.ognl.enhance;
* under the License.
*/
-import org.apache.commons.ognl.Node;
/**
- * Marks an ognl expression {@link Node} as needing to have th
svn commit: r1194873 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
Author: mcucchiara
Date: Sat Oct 29 11:16:20 2011
New Revision: 1194873
URL: http://svn.apache.org/viewvc?rev=1194873&view=rev
Log:
OGNL-11: fixed checkstyle errors
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java?rev=1194873&r1=1194872&r2=1194873&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
Sat Oct 29 11:16:20 2011
@@ -74,14 +74,14 @@ public class ExpressionCompiler
/**
* {@link ClassLoader} instances.
*/
-protected Map _loaders = new
HashMap();
+protected Map loaders = new
HashMap();
/**
* Javassist class definition poool.
*/
-protected ClassPool _pool;
+protected ClassPool pool;
-protected int _classCounter = 0;
+protected int classCounter = 0;
/**
* Used by {@link #castExpression(org.apache.commons.ognl.OgnlContext,
org.apache.commons.ognl.Node, String)} to
@@ -151,19 +151,21 @@ public class ExpressionCompiler
if ( ( !ASTList.class.isInstance( expression ) &&
!ASTVarRef.class.isInstance( expression )
&& !ASTStaticMethod.class.isInstance( expression ) &&
!ASTStaticField.class.isInstance( expression )
&& !ASTConst.class.isInstance( expression ) &&
!ExpressionNode.class.isInstance( expression )
-&& !ASTCtor.class.isInstance( expression ) &&
!ASTStaticMethod.class.isInstance( expression ) && root != null )
-|| ( root != null && ASTRootVarRef.class.isInstance( expression )
) )
+&& !ASTCtor.class.isInstance( expression ) &&
!ASTStaticMethod.class.isInstance( expression )
+&& root != null ) || ( root != null &&
ASTRootVarRef.class.isInstance( expression ) ) )
{
Class castClass = OgnlRuntime.getCompiler( context
).getRootExpressionClass( expression, context );
-if ( castClass.isArray() || ASTRootVarRef.class.isInstance(
expression )
-|| ASTThisVarRef.class.isInstance( expression ) )
+if ( castClass.isArray() || ASTRootVarRef.class.isInstance(
expression ) || ASTThisVarRef.class.isInstance(
+expression ) )
{
rootExpr = "((" + getCastString( castClass ) + ")$2)";
if ( ASTProperty.class.isInstance( expression ) && !(
(ASTProperty) expression ).isIndexedAccess() )
+{
rootExpr += ".";
+}
}
else if ( ( ASTProperty.class.isInstance( expression ) && (
(ASTProperty) expression ).isIndexedAccess() )
|| ASTChain.class.isInstance( expression ) )
@@ -182,7 +184,7 @@ public class ExpressionCompiler
/**
* Used by {@link #getRootExpression(org.apache.commons.ognl.Node, Object,
org.apache.commons.ognl.OgnlContext)} to
* determine if the expression needs to be cast at all.
- *
+ *
* @param expression The node to check against.
* @return Yes if the node type should be cast - false otherwise.
*/
@@ -192,9 +194,11 @@ public class ExpressionCompiler
{
Node child = expression.jjtGetChild( 0 );
if ( ASTConst.class.isInstance( child ) ||
ASTStaticMethod.class.isInstance( child )
-|| ASTStaticField.class.isInstance( child )
-|| ( ASTVarRef.class.isInstance( child ) &&
!ASTRootVarRef.class.isInstance( child ) ) )
+|| ASTStaticField.class.isInstance( child ) || (
ASTVarRef.class.isInstance( child )
+&& !ASTRootVarRef.class.isInstance( child ) ) )
+{
return false;
+}
}
return !ASTConst.class.isInstance( expression );
@@ -205,24 +209,21 @@ public class ExpressionCompiler
*/
public String castExpression( OgnlContext context, Node expression, String
body )
{
-// ok - so this looks really f-ed up ...and it is ..eh if you can do
it better I'm all for it :)
+//TODO: ok - so this looks really f-ed up ...and it is ..eh if you can
do it better I'm all for it :)
-if ( context.getCurrentAccessor() == null
-|| context.getPreviousType() == null
-|| context.getCurrentAccessor().isAssignableFrom(
context.getPreviousType()
svn commit: r1194869 [2/2] - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java?rev=1194869&r1=1194868&r2=1194869&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
Sat Oct 29 11:10:16 2011
@@ -103,7 +103,7 @@ public class ASTProperty
public Object getProperty( OgnlContext context, Object source )
throws OgnlException
{
-return _children[0].getValue( context, context.getRoot() );
+return children[0].getValue( context, context.getRoot() );
}
protected Object getValueBody( OgnlContext context, Object source )
@@ -132,8 +132,8 @@ public class ASTProperty
public boolean isNodeSimpleProperty( OgnlContext context )
throws OgnlException
{
-return ( _children != null ) && ( _children.length == 1 )
-&& ( (SimpleNode) _children[0] ).isConstant( context );
+return ( children != null ) && ( children.length == 1 )
+&& ( (SimpleNode) children[0] ).isConstant( context );
}
public Class getGetterClass()
@@ -165,7 +165,7 @@ public class ASTProperty
if ( isIndexedAccess() )
{
-Object value = _children[0].getValue( context,
context.getRoot() );
+Object value = children[0].getValue( context,
context.getRoot() );
if ( value == null || DynamicSubscript.class.isAssignableFrom(
value.getClass() ) )
{
@@ -174,11 +174,11 @@ public class ASTProperty
}
// Get root cast string if the child is a type that needs it
(like a nested ASTProperty)
-String srcString = _children[0].toGetSourceString( context,
context.getRoot() );
+String srcString = children[0].toGetSourceString( context,
context.getRoot() );
srcString =
-ExpressionCompiler.getRootExpression( _children[0],
context.getRoot(), context ) + srcString;
+ExpressionCompiler.getRootExpression( children[0],
context.getRoot(), context ) + srcString;
-if ( ASTChain.class.isInstance( _children[0] ) )
+if ( ASTChain.class.isInstance( children[0] ) )
{
String cast = (String) context.remove(
ExpressionCompiler.PRE_CAST );
if ( cast != null )
@@ -187,7 +187,7 @@ public class ASTProperty
}
}
-if ( ASTConst.class.isInstance( _children[0] )
+if ( ASTConst.class.isInstance( children[0] )
&& String.class.isInstance( context.getCurrentObject() ) )
{
srcString = "\"" + srcString + "\"";
@@ -238,7 +238,7 @@ public class ASTProperty
* + context.getCurrentType());
*/
-if ( ASTConst.class.isInstance( _children[0] )
+if ( ASTConst.class.isInstance( children[0] )
&& Number.class.isInstance( context.getCurrentObject()
) )
{
context.setCurrentType(
@@ -252,7 +252,7 @@ public class ASTProperty
}
}
-String name = ( (ASTConst) _children[0] ).getValue().toString();
+String name = ( (ASTConst) children[0] ).getValue().toString();
target = getTarget( context, target, name );
@@ -287,7 +287,7 @@ public class ASTProperty
}
}
-if ( _parent == null )
+if ( parent == null )
{
// the above pd will be the wrong result sometimes, such
as methods like getValue(int) vs String[]
// getValue()
@@ -346,9 +346,9 @@ public class ASTProperty
Class currType = context.getCurrentType();
Class prevType = context.getPreviousType();
-String srcString = _children[0].toGetSourceString(
context, context.getRoot() );
+String srcString = children[0].toGetSourceString(
context, context.getRoot() );
-if ( ASTConst.class.isInstance( _children[0] )
+if ( ASTConst.class.isInstance( children[0] )
&& String.class.isInstance(
context.getCurrentObject() ) )
{
srcString = "\"" + srcString + "\"";
@@ -452,7 +452,7 @@ public class ASTProperty
if ( isIndexedAccess() )
{
-Object value = _children[0].getValue( con
svn commit: r1194868 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlParserTreeConstants.java
Author: mcucchiara
Date: Sat Oct 29 11:04:16 2011
New Revision: 1194868
URL: http://svn.apache.org/viewvc?rev=1194868&view=rev
Log:
OGNL-11: fixed checkstyle errors
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlParserTreeConstants.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlParserTreeConstants.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlParserTreeConstants.java?rev=1194868&r1=1194867&r2=1194868&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlParserTreeConstants.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlParserTreeConstants.java
Sat Oct 29 11:04:16 2011
@@ -1,5 +1,6 @@
+package org.apache.commons.ognl;
+
/*
- * $Id$
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -17,110 +18,113 @@
* specific language governing permissions and limitations
* under the License.
*/
-/* Generated By:JavaCC: Do not edit this line. OgnlParserTreeConstants.java
Version 4.1d1 */
-package org.apache.commons.ognl;
+
+/**
+ * $Id$
+ * Generated By:JavaCC: Do not edit this line. OgnlParserTreeConstants.java
Version 4.1d1
+ */
public interface OgnlParserTreeConstants
{
-public int JJTVOID = 0;
+int JJTVOID = 0;
-public int JJTSEQUENCE = 1;
+int JJTSEQUENCE = 1;
-public int JJTASSIGN = 2;
+int JJTASSIGN = 2;
-public int JJTTEST = 3;
+int JJTTEST = 3;
-public int JJTOR = 4;
+int JJTOR = 4;
-public int JJTAND = 5;
+int JJTAND = 5;
-public int JJTBITOR = 6;
+int JJTBITOR = 6;
-public int JJTXOR = 7;
+int JJTXOR = 7;
-public int JJTBITAND = 8;
+int JJTBITAND = 8;
-public int JJTEQ = 9;
+int JJTEQ = 9;
-public int JJTNOTEQ = 10;
+int JJTNOTEQ = 10;
-public int JJTLESS = 11;
+int JJTLESS = 11;
-public int JJTGREATER = 12;
+int JJTGREATER = 12;
-public int JJTLESSEQ = 13;
+int JJTLESSEQ = 13;
-public int JJTGREATEREQ = 14;
+int JJTGREATEREQ = 14;
-public int JJTIN = 15;
+int JJTIN = 15;
-public int JJTNOTIN = 16;
+int JJTNOTIN = 16;
-public int JJTSHIFTLEFT = 17;
+int JJTSHIFTLEFT = 17;
-public int JJTSHIFTRIGHT = 18;
+int JJTSHIFTRIGHT = 18;
-public int JJTUNSIGNEDSHIFTRIGHT = 19;
+int JJTUNSIGNEDSHIFTRIGHT = 19;
-public int JJTADD = 20;
+int JJTADD = 20;
-public int JJTSUBTRACT = 21;
+int JJTSUBTRACT = 21;
-public int JJTMULTIPLY = 22;
+int JJTMULTIPLY = 22;
-public int JJTDIVIDE = 23;
+int JJTDIVIDE = 23;
-public int JJTREMAINDER = 24;
+int JJTREMAINDER = 24;
-public int JJTNEGATE = 25;
+int JJTNEGATE = 25;
-public int JJTBITNEGATE = 26;
+int JJTBITNEGATE = 26;
-public int JJTNOT = 27;
+int JJTNOT = 27;
-public int JJTINSTANCEOF = 28;
+int JJTINSTANCEOF = 28;
-public int JJTCHAIN = 29;
+int JJTCHAIN = 29;
-public int JJTEVAL = 30;
+int JJTEVAL = 30;
-public int JJTCONST = 31;
+int JJTCONST = 31;
-public int JJTTHISVARREF = 32;
+int JJTTHISVARREF = 32;
-public int JJTROOTVARREF = 33;
+int JJTROOTVARREF = 33;
-public int JJTVARREF = 34;
+int JJTVARREF = 34;
-public int JJTLIST = 35;
+int JJTLIST = 35;
-public int JJTMAP = 36;
+int JJTMAP = 36;
-public int JJTKEYVALUE = 37;
+int JJTKEYVALUE = 37;
-public int JJTSTATICFIELD = 38;
+int JJTSTATICFIELD = 38;
-public int JJTCTOR = 39;
+int JJTCTOR = 39;
-public int JJTPROPERTY = 40;
+int JJTPROPERTY = 40;
-public int JJTSTATICMETHOD = 41;
+int JJTSTATICMETHOD = 41;
-public int JJTMETHOD = 42;
+int JJTMETHOD = 42;
-public int JJTPROJECT = 43;
+int JJTPROJECT = 43;
-public int JJTSELECT = 44;
+int JJTSELECT = 44;
-public int JJTSELECTFIRST = 45;
+int JJTSELECTFIRST = 45;
-public int JJTSELECTLAST = 46;
+int JJTSELECTLAST = 46;
-public String[] jjtNodeName =
-{ "void", "Sequence", "Assign", "Test", "Or", "And", "BitOr", "Xor",
"BitAnd", "Eq", "NotEq", "Less",
-"Greater", "LessEq", "GreaterEq", "In", "NotIn", "ShiftLeft",
"ShiftRight", "UnsignedShiftRight", "Add",
-"Subtract", "Multiply", "Divide", "Remainder", "Negate",
"BitNegate", "Not", "Instanceof&
svn commit: r1194867 - in /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl: OgnlContext.java OgnlException.java OgnlOps.java
Author: mcucchiara
Date: Sat Oct 29 11:01:56 2011
New Revision: 1194867
URL: http://svn.apache.org/viewvc?rev=1194867&view=rev
Log:
OGNL-11: fixed checkstyle errors
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlException.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlOps.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java?rev=1194867&r1=1194866&r2=1194867&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
Sat Oct 29 11:01:56 2011
@@ -111,11 +111,13 @@ public class OgnlContext
try
{
-if ( ( s = System.getProperty( PROPERTY_KEY_PREFIX +
".traceEvaluations" ) ) != null )
+s = System.getProperty( PROPERTY_KEY_PREFIX + ".traceEvaluations"
);
+if ( s != null )
{
defaultTraceEvaluations = Boolean.valueOf( s.trim() );
}
-if ( ( s = System.getProperty( PROPERTY_KEY_PREFIX +
".keepLastEvaluation" ) ) != null )
+s = System.getProperty( PROPERTY_KEY_PREFIX +
".keepLastEvaluation" );
+if ( s != null )
{
defaultKeepLastEvaluation = Boolean.valueOf( s.trim() );
}
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlException.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlException.java?rev=1194867&r1=1194866&r2=1194867&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlException.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlException.java
Sat Oct 29 11:01:56 2011
@@ -35,12 +35,12 @@ public class OgnlException
private static final long serialVersionUID = -842845048743721078L;
-static Method _initCause;
+static Method initCause;
static
{
try
{
-_initCause = OgnlException.class.getMethod( "initCause", new
Class[] { Throwable.class } );
+initCause = OgnlException.class.getMethod( "initCause", new
Class[] { Throwable.class } );
}
catch ( NoSuchMethodException e )
{
@@ -51,14 +51,14 @@ public class OgnlException
/**
* The root evaluation of the expression when the exception was thrown
*/
-private Evaluation _evaluation;
+private Evaluation evaluation;
/**
* Why this exception was thrown.
*
* @serial
*/
-private Throwable _reason;
+private Throwable reason;
/** Constructs an OgnlException with no message or encapsulated exception.
*/
public OgnlException()
@@ -85,15 +85,15 @@ public class OgnlException
public OgnlException( String msg, Throwable reason )
{
super( msg );
-this._reason = reason;
+this.reason = reason;
-if ( _initCause != null )
+if ( initCause != null )
{
try
{
-_initCause.invoke( this, new Object[] { reason } );
+initCause.invoke( this, reason );
}
-catch ( Exception t )
+catch ( Exception ignored )
{
/** ignore */
}
@@ -107,7 +107,7 @@ public class OgnlException
*/
public Throwable getReason()
{
-return _reason;
+return reason;
}
/**
@@ -117,7 +117,7 @@ public class OgnlException
*/
public Evaluation getEvaluation()
{
-return _evaluation;
+return evaluation;
}
/**
@@ -127,7 +127,7 @@ public class OgnlException
*/
public void setEvaluation( Evaluation value )
{
-_evaluation = value;
+evaluation = value;
}
/**
@@ -138,10 +138,12 @@ public class OgnlException
@Override
public String toString()
{
-if ( _reason == null )
+if ( reason == null )
+{
return super.toString();
+}
-return super.toString() + " [" + _reason + "]";
+return super.toString() + " [" + reason + "]";
}
/**
@@ -162,10 +164,10 @@ public class OgnlException
synchronized ( s )
{
super.printStackTrace( s );
-
svn commit: r1194866 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/
Author: mcucchiara
Date: Sat Oct 29 10:51:32 2011
New Revision: 1194866
URL: http://svn.apache.org/viewvc?rev=1194866&view=rev
Log:
OGNL-11: fixed checkstyle errors
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTList.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethodUtil.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ArrayPropertyAccessor.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/DefaultClassResolver.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/DefaultTypeConverter.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/JJTOgnlParserState.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/JavaSource.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ListPropertyAccessor.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/Node.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/NodeVisitor.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/NumericExpression.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectMethodAccessor.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ObjectPropertyAccessor.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/Ognl.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java?rev=1194866&r1=1194865&r2=1194866&view=diff
==
--- commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java
(original)
+++ commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTAdd.java
Sat Oct 29 10:51:32 2011
@@ -316,14 +316,14 @@ class ASTAdd
if ( _parent == null || ASTSequence.class.isAssignableFrom(
_parent.getClass() ) )
{
-if ( _getterClass != null && String.class.isAssignableFrom(
_getterClass ) )
+if ( getterClass != null && String.class.isAssignableFrom(
getterClass ) )
{
-_getterClass = Object.class;
+getterClass = Object.class;
}
}
else
{
-context.setCurrentType( _getterClass );
+context.setCurrentType( getterClass );
}
try
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTList.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTList.java?rev=1194866&r1=1194865&r2=1194866&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTList.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTList.java
Sat Oct 29 10:51:32 2011
@@ -20,6 +20,7 @@ package org.apache.commons.ognl;
*/
import org.apache.commons.ognl.enhance.ExpressionCompiler;
+import org.apache.commons.ognl.enhance.OgnlExpressionCompiler;
import org.apache.commons.ognl.enhance.UnsupportedCompilationException;
import java.util.ArrayList;
@@ -138,12 +139,12 @@ public class ASTList
{
valueClass = ( (NodeType) _children[i]
).getGetterClass();
}
+final OgnlExpressionCompiler compiler =
OgnlRuntime.getCompiler( context );
if ( valueClass != null && ctorClass.isArray() )
{
value =
-OgnlRuntime
-.getCompiler( context )
+compiler
.createLocalReference( context, "(" +
ExpressionCompiler.getCastString( ctorClass )
+
")org.apache.commons.ognl.OgnlOps.toArray(" + value + ", "
+ ctorClass.getComponentType().getName() +
".class, true)", ctorClass );
@@ -155,8 +156,7 @@ public class ASTList
Class wrapClass =
OgnlRuntime.getPrimitiveWrapperClass( ctorClass );
value =
-OgnlRuntime
-.getCompiler( context )
+compile
svn commit: r1190766 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/JavaSource.java
Author: mcucchiara
Date: Sat Oct 29 07:43:12 2011
New Revision: 1190766
URL: http://svn.apache.org/viewvc?rev=1190766&view=rev
Log:
fixed javadocs warning
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/JavaSource.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/JavaSource.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/JavaSource.java?rev=1190766&r1=1190765&r2=1190766&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/JavaSource.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/JavaSource.java
Sat Oct 29 07:43:12 2011
@@ -30,7 +30,7 @@ public interface JavaSource
/**
* Expected to return a java source representation of itself such that it
could be turned into a literal java
- * expression to be compiled and executed for {@link
ExpressionAccessor#get(OgnlContext, Object)} calls.
+ * expression to be compiled and executed for {@link
org.apache.commons.ognl.enhance.ExpressionAccessor#get(OgnlContext, Object)}
calls.
*
* @return Literal java string representation of an object get.
*/
@@ -38,7 +38,7 @@ public interface JavaSource
/**
* Expected to return a java source representation of itself such that it
could be turned into a literal java
- * expression to be compiled and executed for {@link
ExpressionAccessor#get(OgnlContext, Object)} calls.
+ * expression to be compiled and executed for {@link
org.apache.commons.ognl.enhance.ExpressionAccessor#get(OgnlContext, Object)}
calls.
*
* @return Literal java string representation of an object get.
*/
svn commit: r1190765 - /commons/proper/ognl/trunk/src/changes/changes.xml
Author: mcucchiara Date: Sat Oct 29 07:42:25 2011 New Revision: 1190765 URL: http://svn.apache.org/viewvc?rev=1190765&view=rev Log: Added OGNL-17 in the issues list Modified: commons/proper/ognl/trunk/src/changes/changes.xml Modified: commons/proper/ognl/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/changes/changes.xml?rev=1190765&r1=1190764&r2=1190765&view=diff == --- commons/proper/ognl/trunk/src/changes/changes.xml (original) +++ commons/proper/ognl/trunk/src/changes/changes.xml Sat Oct 29 07:42:25 2011 @@ -34,6 +34,7 @@ Remove dead and broken code from OgnlRuntime/SimpleNode (with contributions by Daniel Pitts) Performance - Replace synchronized blocks with ReentrantReadWriteLock (with contributions by Daniel Pitts) Support visitor pattern on AST (contributed by Daniel Pitts) + Links "Download" and "Release Notes" do not work OGNL needs a new Logo Documentation site has to be published Ant maintenance
svn commit: r1190764 - /commons/proper/ognl/trunk/src/site/site.xml
Author: mcucchiara Date: Sat Oct 29 07:27:54 2011 New Revision: 1190764 URL: http://svn.apache.org/viewvc?rev=1190764&view=rev Log: OGNL-17 - Links "Download" and "Release Notes" do not work Modified: commons/proper/ognl/trunk/src/site/site.xml Modified: commons/proper/ognl/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/site/site.xml?rev=1190764&r1=1190763&r2=1190764&view=diff == --- commons/proper/ognl/trunk/src/site/site.xml (original) +++ commons/proper/ognl/trunk/src/site/site.xml Sat Oct 29 07:27:54 2011 @@ -27,7 +27,7 @@ - http://www.apache.org/dist/commons/ognl/RELEASE-NOTES.txt"; /> +
svn commit: r1190762 - in /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl: ASTMethodUtil.java NodeVisitor.java
Author: mcucchiara
Date: Sat Oct 29 05:59:04 2011
New Revision: 1190762
URL: http://svn.apache.org/viewvc?rev=1190762&view=rev
Log:
Added svn properties
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethodUtil.java
(contents, props changed)
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/NodeVisitor.java
(contents, props changed)
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethodUtil.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethodUtil.java?rev=1190762&r1=1190761&r2=1190762&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethodUtil.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethodUtil.java
Sat Oct 29 05:59:04 2011
@@ -23,7 +23,7 @@ import org.apache.commons.ognl.enhance.O
*/
/**
- * $Id: $
+ * $Id$
*/
class ASTMethodUtil
{
Propchange:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethodUtil.java
--
svn:eol-style = native
Propchange:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethodUtil.java
--
svn:keywords = Date Author Id Revision HeadURL
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/NodeVisitor.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/NodeVisitor.java?rev=1190762&r1=1190761&r2=1190762&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/NodeVisitor.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/NodeVisitor.java
Sat Oct 29 05:59:04 2011
@@ -1,7 +1,7 @@
package org.apache.commons.ognl;
/*
- * $Id: $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/NodeVisitor.java
--
svn:keywords = Date Author Id Revision HeadURL
svn commit: r1190760 - in /commons/proper/ognl/trunk/src: changes/changes.xml main/java/org/apache/commons/ognl/JJTOgnlParserState.java
Author: mcucchiara
Date: Sat Oct 29 05:55:42 2011
New Revision: 1190760
URL: http://svn.apache.org/viewvc?rev=1190760&view=rev
Log:
OGNL-33 - Improvements to JJTOgnlParserState (contributed by Adrian Cumiskey)
Modified:
commons/proper/ognl/trunk/src/changes/changes.xml
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/JJTOgnlParserState.java
Modified: commons/proper/ognl/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/changes/changes.xml?rev=1190760&r1=1190759&r2=1190760&view=diff
==
--- commons/proper/ognl/trunk/src/changes/changes.xml (original)
+++ commons/proper/ognl/trunk/src/changes/changes.xml Sat Oct 29 05:55:42 2011
@@ -23,6 +23,7 @@
+ OGNL-33 -
Improvements to JJTOgnlParserState (contributed by Adrian Cumiskey).
OGNL-32 - CPD fix
to ASTProperty (contributed by Adrian Cumiskey).
OGNL-31 - Some
CPD fixes around ASTMethod and ASTStaticMethod (contributed by Adrian
Cumiskey).
Visitor pattern
needs way to propagate exceptions (contributed by Daniel Pitts).
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/JJTOgnlParserState.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/JJTOgnlParserState.java?rev=1190760&r1=1190759&r2=1190760&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/JJTOgnlParserState.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/JJTOgnlParserState.java
Sat Oct 29 05:55:42 2011
@@ -20,27 +20,30 @@
/* Generated By:JavaCC: Do not edit this line. JJTOgnlParserState.java Version
4.1d1 */
package org.apache.commons.ognl;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* $Id$
*/
public class JJTOgnlParserState
{
-private java.util.List nodes;
+private List nodes;
-private java.util.List marks;
+private List marks;
-private int sp; // number of nodes on stack
+private int numNodesOnStack;
-private int mk; // current mark
+private int currentMark;
-private boolean node_created;
+private boolean nodeCreated;
public JJTOgnlParserState()
{
-nodes = new java.util.ArrayList();
-marks = new java.util.ArrayList();
-sp = 0;
-mk = 0;
+nodes = new ArrayList();
+marks = new ArrayList();
+numNodesOnStack = 0;
+currentMark = 0;
}
/*
@@ -49,7 +52,7 @@ public class JJTOgnlParserState
*/
public boolean nodeCreated()
{
-return node_created;
+return nodeCreated;
}
/*
@@ -59,8 +62,8 @@ public class JJTOgnlParserState
{
nodes.clear();
marks.clear();
-sp = 0;
-mk = 0;
+numNodesOnStack = 0;
+currentMark = 0;
}
/*
@@ -68,14 +71,14 @@ public class JJTOgnlParserState
*/
public Node rootNode()
{
-return (Node) nodes.get( 0 );
+return nodes.get( 0 );
}
/* Pushes a node on to the stack. */
-public void pushNode( Node n )
+public void pushNode( Node node )
{
-nodes.add( n );
-++sp;
+nodes.add( node );
+++numNodesOnStack;
}
/*
@@ -83,17 +86,17 @@ public class JJTOgnlParserState
*/
public Node popNode()
{
-if ( --sp < mk )
+if ( --numNodesOnStack < currentMark )
{
-mk = ( (Integer) marks.remove( marks.size() - 1 ) ).intValue();
+currentMark = marks.remove( marks.size() - 1 );
}
-return (Node) nodes.remove( nodes.size() - 1 );
+return nodes.remove( nodes.size() - 1 );
}
/* Returns the node currently on the top of the stack. */
public Node peekNode()
{
-return (Node) nodes.get( nodes.size() - 1 );
+return nodes.get( nodes.size() - 1 );
}
/*
@@ -101,41 +104,41 @@ public class JJTOgnlParserState
*/
public int nodeArity()
{
-return sp - mk;
+return numNodesOnStack - currentMark;
}
-public void clearNodeScope( Node n )
+public void clearNodeScope( Node unused )
{
-while ( sp > mk )
+while ( numNodesOnStack > currentMark )
{
popNode();
}
-mk = ( (Integer) marks.remove( marks.size() - 1 ) ).intValue();
+currentMark = marks.remove( marks.size() - 1 );
}
-public void openNodeScope( Node n )
+public void openNodeScope( Node node )
{
-marks.add( new Integer( mk ) );
-mk = sp;
-n.jjtOpen();
+marks.add(currentMark);
+currentMark = numNodesOnStack;
+node.jjtOpen();
}
/*
* A definite nod
svn commit: r1190759 - /commons/proper/ognl/trunk/src/changes/changes.xml
Author: mcucchiara Date: Sat Oct 29 05:48:02 2011 New Revision: 1190759 URL: http://svn.apache.org/viewvc?rev=1190759&view=rev Log: Added OGNL-32 in the issue list Modified: commons/proper/ognl/trunk/src/changes/changes.xml Modified: commons/proper/ognl/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/changes/changes.xml?rev=1190759&r1=1190758&r2=1190759&view=diff == --- commons/proper/ognl/trunk/src/changes/changes.xml (original) +++ commons/proper/ognl/trunk/src/changes/changes.xml Sat Oct 29 05:48:02 2011 @@ -23,6 +23,7 @@ + OGNL-32 - CPD fix to ASTProperty (contributed by Adrian Cumiskey). OGNL-31 - Some CPD fixes around ASTMethod and ASTStaticMethod (contributed by Adrian Cumiskey). Visitor pattern needs way to propagate exceptions (contributed by Daniel Pitts). Move "toString" implementations into visitor pattern (contributed by Daniel Pitts).
svn propchange: r1190758 - svn:log
Author: mcucchiara Revision: 1190758 Modified property: svn:log Modified: svn:log at Sat Oct 29 05:46:58 2011 -- --- svn:log (original) +++ svn:log Sat Oct 29 05:46:58 2011 @@ -1 +1 @@ -OGNL-31 - CPD fix to ASTProperty (contributed by Adrian Cumiskey) +OGNL-32 - CPD fix to ASTProperty (contributed by Adrian Cumiskey)
svn commit: r1190758 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
Author: mcucchiara
Date: Sat Oct 29 05:44:09 2011
New Revision: 1190758
URL: http://svn.apache.org/viewvc?rev=1190758&view=rev
Log:
OGNL-31 - CPD fix to ASTProperty (contributed by Adrian Cumiskey)
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java?rev=1190758&r1=1190757&r2=1190758&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTProperty.java
Sat Oct 29 05:44:09 2011
@@ -254,32 +254,7 @@ public class ASTProperty
String name = ( (ASTConst) _children[0] ).getValue().toString();
-if ( !Iterator.class.isAssignableFrom(
context.getCurrentObject().getClass() )
-|| ( Iterator.class.isAssignableFrom(
context.getCurrentObject().getClass() )
- && name.indexOf( "next" ) < 0 ) )
-{
-Object currObj = target;
-
-try
-{
-target = getValue( context, context.getCurrentObject() );
-}
-catch ( NoSuchPropertyException e )
-{
-try
-{
-target = getValue( context, context.getRoot() );
-}
-catch ( NoSuchPropertyException ex )
-{
-// ignore
-}
-}
-finally
-{
-context.setCurrentObject( currObj );
-}
-}
+target = getTarget( context, target, name );
PropertyDescriptor pd = OgnlRuntime.getPropertyDescriptor(
context.getCurrentObject().getClass(), name );
@@ -411,6 +386,39 @@ public class ASTProperty
return result;
}
+Object getTarget( OgnlContext context, Object target, String name )
+throws OgnlException
+{
+Class clazz = context.getCurrentObject().getClass();
+if ( !Iterator.class.isAssignableFrom(clazz)
+|| ( Iterator.class.isAssignableFrom(clazz)
+ && name.indexOf( "next" ) < 0 ) )
+{
+Object currObj = target;
+
+try
+{
+target = getValue( context, context.getCurrentObject() );
+}
+catch ( NoSuchPropertyException e )
+{
+try
+{
+target = getValue( context, context.getRoot() );
+}
+catch ( NoSuchPropertyException ex )
+{
+// ignore
+}
+}
+finally
+{
+context.setCurrentObject( currObj );
+}
+}
+return target;
+}
+
Method getIndexedWriteMethod( PropertyDescriptor pd )
{
if ( IndexedPropertyDescriptor.class.isInstance( pd ) )
@@ -565,36 +573,7 @@ public class ASTProperty
// System.out.println(" astprop(setter) : trying to set " + name +
" on object target " +
// context.getCurrentObject().getClass().getName());
-if ( !Iterator.class.isAssignableFrom(
context.getCurrentObject().getClass() )
-|| ( Iterator.class.isAssignableFrom(
context.getCurrentObject().getClass() )
- && name.indexOf( "next" ) < 0 ) )
-{
-
-Object currObj = target;
-
-try
-{
-target = getValue( context, context.getCurrentObject() );
-}
-catch ( NoSuchPropertyException e )
-{
-try
-{
-
-target = getValue( context, context.getRoot() );
-
-}
-catch ( NoSuchPropertyException ex )
-{
-// TODO: how to handle this accordingly?
-}
-}
-finally
-{
-
-context.setCurrentObject( currObj );
-}
-}
+target = getTarget( context, target, name );
PropertyDescriptor pd =
OgnlRuntime.getPropertyDescriptor(
svn commit: r1190456 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
Author: mcucchiara
Date: Fri Oct 28 17:11:37 2011
New Revision: 1190456
URL: http://svn.apache.org/viewvc?rev=1190456&view=rev
Log:
replaced for loops with foreach version. Also renamed unused var
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java?rev=1190456&r1=1190455&r2=1190456&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/enhance/ExpressionCompiler.java
Fri Oct 28 17:11:37 2011
@@ -257,15 +257,15 @@ public class ExpressionCompiler
Class[] intf = clazz.getInterfaces();
-for ( int i = 0; i < intf.length; i++ )
+for ( Class anIntf : intf )
{
-if ( intf[i].getName().indexOf( "util.List" ) > 0 )
+if ( anIntf.getName().indexOf( "util.List" ) > 0 )
{
-return intf[i].getName();
+return anIntf.getName();
}
-else if ( intf[i].getName().indexOf( "Iterator" ) > 0 )
+else if ( anIntf.getName().indexOf( "Iterator" ) > 0 )
{
-return intf[i].getName();
+return anIntf.getName();
}
}
@@ -287,18 +287,18 @@ public class ExpressionCompiler
Class[] intfs = clazz.getInterfaces();
Class intClass;
-for ( int i = 0; i < intfs.length; i++ )
+for ( Class intf : intfs )
{
-intClass = getSuperOrInterfaceClass( m, intfs[i] );
+intClass = getSuperOrInterfaceClass( m, intf );
if ( intClass != null )
{
return intClass;
}
-if ( Modifier.isPublic( intfs[i].getModifiers() ) &&
containsMethod( m, intfs[i] ) )
+if ( Modifier.isPublic( intf.getModifiers() ) &&
containsMethod( m, intf ) )
{
-return intfs[i];
+return intf;
}
}
}
@@ -338,9 +338,9 @@ public class ExpressionCompiler
return false;
}
-for ( int i = 0; i < methods.length; i++ )
+for ( Method method : methods )
{
-if ( methods[i].getName().equals( m.getName() ) &&
methods[i].getReturnType() == m.getReturnType() )
+if ( method.getName().equals( m.getName() ) &&
method.getReturnType() == m.getReturnType() )
{
Class[] parms = m.getParameterTypes();
if ( parms == null )
@@ -348,7 +348,7 @@ public class ExpressionCompiler
continue;
}
-Class[] mparms = methods[i].getParameterTypes();
+Class[] mparms = method.getParameterTypes();
if ( mparms == null || mparms.length != parms.length )
{
continue;
@@ -375,7 +375,7 @@ public class ExpressionCompiler
continue;
}
-Class[] mexceptions = methods[i].getExceptionTypes();
+Class[] mexceptions = method.getExceptionTypes();
if ( mexceptions == null || mexceptions.length !=
exceptions.length )
{
continue;
@@ -420,25 +420,25 @@ public class ExpressionCompiler
Class[] intf = clazz.getInterfaces();
-for ( int i = 0; i < intf.length; i++ )
+for ( Class anIntf : intf )
{
-if ( List.class.isAssignableFrom( intf[i] ) )
+if ( List.class.isAssignableFrom( anIntf ) )
{
return List.class;
}
-else if ( Iterator.class.isAssignableFrom( intf[i] ) )
+else if ( Iterator.class.isAssignableFrom( anIntf ) )
{
return Iterator.class;
}
-else if ( Map.class.isAssignableFrom( intf[i] ) )
+else if ( Map.class.isAssignableFrom( anIntf ) )
{
return Map.class;
}
-else if ( Set.class.isAssignableFrom( intf[i] ) )
+else if ( Set.class.isAssignableFrom( anIntf ) )
{
return Set.class;
}
-else if ( Collection.class.isAssignableFrom( intf[i] ) )
+else if ( Collection.class.isAssignableFrom( anIntf ) )
{
return Collection.clas
svn commit: r1190446 - in /commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance: ./ invocation/ runtime/
Author: mcucchiara
Date: Fri Oct 28 16:55:05 2011
New Revision: 1190446
URL: http://svn.apache.org/viewvc?rev=1190446&view=rev
Log:
Reformatted code
Modified:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceCommonsOgnlTest.java
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceOldOgnlTest.java
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/FieldInvocation.java
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/FindParameterTypesInvocation.java
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/GetConstructorsInvocation.java
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/GetDeclaredMethodsInvocation.java
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/GetMethodsInvocation.java
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/InvokeMethodInvocation.java
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/MethodParameterTypesInvocation.java
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/PermissionInvocation.java
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/PrimitiveDefaultInvocation.java
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/RepeatableInvocation.java
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/runtime/CommonsRuntimeWrapper.java
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/runtime/RuntimeWrapper.java
Modified:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceCommonsOgnlTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceCommonsOgnlTest.java?rev=1190446&r1=1190445&r2=1190446&view=diff
==
---
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceCommonsOgnlTest.java
(original)
+++
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceCommonsOgnlTest.java
Fri Oct 28 16:55:05 2011
@@ -41,14 +41,14 @@ public class PerformanceCommonsOgnlTest
extends BasePerformanceTest
{
@BeforeClass
-public static void before( )
+public static void before()
{
runtimeWrapper = COMMONS_RUNTIME_WRAPPER;
}
@AfterClass
-public static void after( )
+public static void after()
{
-runtimeWrapper.clearCache( );
+runtimeWrapper.clearCache();
}
}
Modified:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceOldOgnlTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceOldOgnlTest.java?rev=1190446&r1=1190445&r2=1190446&view=diff
==
---
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceOldOgnlTest.java
(original)
+++
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceOldOgnlTest.java
Fri Oct 28 16:55:05 2011
@@ -41,14 +41,14 @@ public class PerformanceOldOgnlTest
extends BasePerformanceTest
{
@BeforeClass
-public static void before( )
+public static void before()
{
runtimeWrapper = OLD_RUNTIME_WRAPPER;
}
@AfterClass
-public static void after( )
+public static void after()
{
-runtimeWrapper.clearCache( );
+runtimeWrapper.clearCache();
}
}
Modified:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/FieldInvocation.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/FieldInvocation.java?rev=1190446&r1=1190445&r2=1190446&view=diff
==
---
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/FieldInvocation.java
(original)
+++
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/FieldInvocation.java
Fri Oct 28 16:55:05 2011
@@ -28,18 +28,26 @@ import org.apache.commons.ognl.performan
* Date: 18/10/11
* Time: 16.28
*/
-public class FieldInvocation extends RepeatableInvocation {
-public FieldInvocation(Runtime
svn commit: r1190445 - /commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/runtime/OldOgnlRuntimeWrapper.java
Author: mcucchiara
Date: Fri Oct 28 16:52:45 2011
New Revision: 1190445
URL: http://svn.apache.org/viewvc?rev=1190445&view=rev
Log:
Reformatted code
Modified:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/runtime/OldOgnlRuntimeWrapper.java
Modified:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/runtime/OldOgnlRuntimeWrapper.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/runtime/OldOgnlRuntimeWrapper.java?rev=1190445&r1=1190444&r2=1190445&view=diff
==
---
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/runtime/OldOgnlRuntimeWrapper.java
(original)
+++
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/runtime/OldOgnlRuntimeWrapper.java
Fri Oct 28 16:52:45 2011
@@ -35,80 +35,80 @@ public class OldOgnlRuntimeWrapper
implements RuntimeWrapper
{
-public void getFields( Class c )
-throws Exception
-{
-OgnlRuntime.getFields( c );
-}
+public void getFields( Class c )
+throws Exception
+{
+OgnlRuntime.getFields( c );
+}
-public void findParameterTypes( Class targetClass, Method method )
-throws Exception
-{
-OgnlRuntime.findParameterTypes( targetClass, method );
-}
+public void findParameterTypes( Class targetClass, Method method )
+throws Exception
+{
+OgnlRuntime.findParameterTypes( targetClass, method );
+}
-public void getConstructors( Class c )
-throws Exception
-{
-OgnlRuntime.getConstructors( c );
-}
+public void getConstructors( Class c )
+throws Exception
+{
+OgnlRuntime.getConstructors( c );
+}
-public void getMethods( Class c, boolean staticMethods )
-throws Exception
-{
-OgnlRuntime.getMethods( c, staticMethods );
-}
+public void getMethods( Class c, boolean staticMethods )
+throws Exception
+{
+OgnlRuntime.getMethods( c, staticMethods );
+}
-public void getDeclaredMethods( Class c, String propertyName,
boolean setters )
-throws Exception
-{
-OgnlRuntime.getDeclaredMethods( c, propertyName, setters );
-}
+public void getDeclaredMethods( Class c, String propertyName, boolean
setters )
+throws Exception
+{
+OgnlRuntime.getDeclaredMethods( c, propertyName, setters );
+}
-public void getParameterTypes( Method method )
-throws Exception
-{
-OgnlRuntime.getParameterTypes( method );
-}
+public void getParameterTypes( Method method )
+throws Exception
+{
+OgnlRuntime.getParameterTypes( method );
+}
-public void getParameterTypes( Constructor constructor )
-throws Exception
-{
-OgnlRuntime.getParameterTypes( constructor );
-}
+public void getParameterTypes( Constructor constructor )
+throws Exception
+{
+OgnlRuntime.getParameterTypes( constructor );
+}
-public void getPermission( Method method )
-throws Exception
-{
-OgnlRuntime.getPermission( method );
-}
+public void getPermission( Method method )
+throws Exception
+{
+OgnlRuntime.getPermission( method );
+}
-public void getPrimitiveDefaultValue( Class type )
-throws Exception
-{
-OgnlRuntime.getPrimitiveDefaultValue( type );
-}
+public void getPrimitiveDefaultValue( Class type )
+throws Exception
+{
+OgnlRuntime.getPrimitiveDefaultValue( type );
+}
-public void invokeMethod( Object o, Method method, Object[] args )
-throws Exception
-{
-OgnlRuntime.invokeMethod( o, method, args );
-}
+public void invokeMethod( Object o, Method method, Object[] args )
+throws Exception
+{
+OgnlRuntime.invokeMethod( o, method, args );
+}
-public void clearCache( )
-{
-OgnlRuntime.clearCache( );
-}
+public void clearCache()
+{
+OgnlRuntime.clearCache();
+}
public void getCompiler()
{
svn commit: r1190444 - /commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/BasePerformanceTest.java
Author: mcucchiara
Date: Fri Oct 28 16:52:11 2011
New Revision: 1190444
URL: http://svn.apache.org/viewvc?rev=1190444&view=rev
Log:
Reformatted code
Modified:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/BasePerformanceTest.java
Modified:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/BasePerformanceTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/BasePerformanceTest.java?rev=1190444&r1=1190443&r2=1190444&view=diff
==
---
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/BasePerformanceTest.java
(original)
+++
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/BasePerformanceTest.java
Fri Oct 28 16:52:11 2011
@@ -51,17 +51,17 @@ import org.junit.rules.MethodRule;
public abstract class BasePerformanceTest
{
@Rule
-public MethodRule benchmarkRun = new BenchmarkRule( );
+public MethodRule benchmarkRun = new BenchmarkRule();
-public static final RuntimeWrapper COMMONS_RUNTIME_WRAPPER = new
CommonsRuntimeWrapper( );
+public static final RuntimeWrapper COMMONS_RUNTIME_WRAPPER = new
CommonsRuntimeWrapper();
-public static final RuntimeWrapper OLD_RUNTIME_WRAPPER = new
OldOgnlRuntimeWrapper( );
+public static final RuntimeWrapper OLD_RUNTIME_WRAPPER = new
OldOgnlRuntimeWrapper();
protected static RuntimeWrapper runtimeWrapper;
@BenchmarkOptions( benchmarkRounds = 50, warmupRounds = 0, concurrency =
1000 )
@Test
-public void constructorCache( )
+public void constructorCache()
throws Exception
{
new GetConstructorsInvocation( runtimeWrapper, 5 );
@@ -69,7 +69,7 @@ public abstract class BasePerformanceTes
@BenchmarkOptions( benchmarkRounds = 50, warmupRounds = 0, concurrency =
1000 )
@Test
-public void declaredMethodCache( )
+public void declaredMethodCache()
throws Exception
{
new GetDeclaredMethodsInvocation( runtimeWrapper );
@@ -77,7 +77,7 @@ public abstract class BasePerformanceTes
@BenchmarkOptions( benchmarkRounds = 50, warmupRounds = 0, concurrency =
1000 )
@Test
-public void fieldCache( )
+public void fieldCache()
throws Exception
{
new FieldInvocation( runtimeWrapper, 5 );
@@ -85,7 +85,7 @@ public abstract class BasePerformanceTes
@BenchmarkOptions( benchmarkRounds = 50, warmupRounds = 0, concurrency =
1000 )
@Test
-public void findParameterTypeCache( )
+public void findParameterTypeCache()
throws Exception
{
new FindParameterTypesInvocation( runtimeWrapper, 100 );
@@ -93,7 +93,7 @@ public abstract class BasePerformanceTes
@BenchmarkOptions( benchmarkRounds = 50, warmupRounds = 0, concurrency =
1000 )
@Test
-public void methodCache( )
+public void methodCache()
throws Exception
{
new GetMethodsInvocation( runtimeWrapper, 2 );
@@ -101,7 +101,7 @@ public abstract class BasePerformanceTes
@BenchmarkOptions( benchmarkRounds = 50, warmupRounds = 0, concurrency =
1000 )
@Test
-public void methodParameterTypeCache( )
+public void methodParameterTypeCache()
throws Exception
{
new MethodParameterTypesInvocation( runtimeWrapper );
@@ -109,7 +109,7 @@ public abstract class BasePerformanceTes
@BenchmarkOptions( benchmarkRounds = 50, warmupRounds = 0, concurrency =
1000 )
@Test
-public void permissionCache( )
+public void permissionCache()
throws Exception
{
new PermissionInvocation( runtimeWrapper );
@@ -117,7 +117,7 @@ public abstract class BasePerformanceTes
@BenchmarkOptions( benchmarkRounds = 50, warmupRounds = 0, concurrency =
1000 )
@Test
-public void primitiveCache( )
+public void primitiveCache()
throws Exception
{
new PrimitiveDefaultInvocation( runtimeWrapper, 10 );
@@ -125,7 +125,7 @@ public abstract class BasePerformanceTes
@BenchmarkOptions( benchmarkRounds = 50, warmupRounds = 0, concurrency =
1000 )
@Test
-public void compiler( )
+public void compiler()
throws Exception
{
new CompilerInvocation( runtimeWrapper, 100 );
svn commit: r1190443 - in /commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance: ./ invocation/ runtime/
Author: mcucchiara
Date: Fri Oct 28 16:51:29 2011
New Revision: 1190443
URL: http://svn.apache.org/viewvc?rev=1190443&view=rev
Log:
OGNL-31 - Added compiler performance test
Added:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/CompilerInvocation.java
Modified:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/BasePerformanceTest.java
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/runtime/CommonsRuntimeWrapper.java
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/runtime/OldOgnlRuntimeWrapper.java
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/runtime/RuntimeWrapper.java
Modified:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/BasePerformanceTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/BasePerformanceTest.java?rev=1190443&r1=1190442&r2=1190443&view=diff
==
---
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/BasePerformanceTest.java
(original)
+++
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/BasePerformanceTest.java
Fri Oct 28 16:51:29 2011
@@ -25,6 +25,7 @@ import com.carrotsearch.junitbenchmarks.
import com.carrotsearch.junitbenchmarks.BenchmarkRule;
import com.carrotsearch.junitbenchmarks.annotation.AxisRange;
import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart;
+import org.apache.commons.ognl.performance.invocation.CompilerInvocation;
import org.apache.commons.ognl.performance.invocation.FieldInvocation;
import
org.apache.commons.ognl.performance.invocation.FindParameterTypesInvocation;
import
org.apache.commons.ognl.performance.invocation.GetConstructorsInvocation;
@@ -121,4 +122,12 @@ public abstract class BasePerformanceTes
{
new PrimitiveDefaultInvocation( runtimeWrapper, 10 );
}
+
+@BenchmarkOptions( benchmarkRounds = 50, warmupRounds = 0, concurrency =
1000 )
+@Test
+public void compiler( )
+throws Exception
+{
+new CompilerInvocation( runtimeWrapper, 100 );
+}
}
Added:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/CompilerInvocation.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/CompilerInvocation.java?rev=1190443&view=auto
==
---
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/CompilerInvocation.java
(added)
+++
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/invocation/CompilerInvocation.java
Fri Oct 28 16:51:29 2011
@@ -0,0 +1,26 @@
+package org.apache.commons.ognl.performance.invocation;
+
+import org.apache.commons.ognl.performance.runtime.RuntimeWrapper;
+
+/**
+ * User: mcucchiara
+ * Date: 28/10/11
+ * Time: 18.42
+ */
+public class CompilerInvocation
+extends RepeatableInvocation
+{
+public CompilerInvocation( RuntimeWrapper runtimeWrapper, int times )
+throws Exception
+{
+super( runtimeWrapper, times );
+
+}
+
+@Override
+protected void invoke( Class c )
+throws Exception
+{
+getRuntime().getCompiler();
+}
+}
Modified:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/runtime/CommonsRuntimeWrapper.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/runtime/CommonsRuntimeWrapper.java?rev=1190443&r1=1190442&r2=1190443&view=diff
==
---
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/runtime/CommonsRuntimeWrapper.java
(original)
+++
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/runtime/CommonsRuntimeWrapper.java
Fri Oct 28 16:51:29 2011
@@ -110,4 +110,9 @@ public class CommonsRuntimeWrapper
{
OgnlRuntime.clearCache( );
}
+
+public void getCompiler()
+{
+OgnlRuntime.getCompiler(null);
+}
}
Modified:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/runtime/OldOgnlRuntimeWrapper.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/runtime/OldOgnlRuntimeWrapper.java?rev=1190443&r1=1190442&r2=1190443&view=diff
==
---
commons/proper/ognl/trunk/src/benchmarks/java
svn commit: r1190437 - /commons/proper/ognl/trunk/src/changes/changes.xml
Author: mcucchiara Date: Fri Oct 28 16:48:41 2011 New Revision: 1190437 URL: http://svn.apache.org/viewvc?rev=1190437&view=rev Log: Added OGNL-31 to the change list Modified: commons/proper/ognl/trunk/src/changes/changes.xml Modified: commons/proper/ognl/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/changes/changes.xml?rev=1190437&r1=1190436&r2=1190437&view=diff == --- commons/proper/ognl/trunk/src/changes/changes.xml (original) +++ commons/proper/ognl/trunk/src/changes/changes.xml Fri Oct 28 16:48:41 2011 @@ -23,6 +23,7 @@ + OGNL-31 - Some CPD fixes around ASTMethod and ASTStaticMethod (contributed by Adrian Cumiskey). Visitor pattern needs way to propagate exceptions (contributed by Daniel Pitts). Move "toString" implementations into visitor pattern (contributed by Daniel Pitts). JUnit Tests produce confusing output.
svn commit: r1190434 - in /commons/proper/ognl/trunk/src: main/java/org/apache/commons/ognl/ test/java/org/apache/commons/ognl/
Author: mcucchiara
Date: Fri Oct 28 16:42:27 2011
New Revision: 1190434
URL: http://svn.apache.org/viewvc?rev=1190434&view=rev
Log:
OGNL-31 - Some CPD fixes around ASTMethod and ASTStaticMethod (contributed by
Adrian Cumiskey)
Added:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethodUtil.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTStaticMethod.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/EvaluationPool.java
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlRuntime.java
commons/proper/ognl/trunk/src/test/java/org/apache/commons/ognl/TestOgnlRuntime.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java?rev=1190434&r1=1190433&r2=1190434&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/ASTMethod.java
Fri Oct 28 16:42:27 2011
@@ -19,38 +19,8 @@ package org.apache.commons.ognl;
* under the License.
*/
-//--
-//Copyright (c) 1998-2004, Drew Davidson and Luke Blanshard
-//All rights reserved.
-
-//Redistribution and use in source and binary forms, with or without
-//modification, are permitted provided that the following conditions are
-//met:
-
-//Redistributions of source code must retain the above copyright notice,
-//this list of conditions and the following disclaimer.
-//Redistributions in binary form must reproduce the above copyright
-//notice, this list of conditions and the following disclaimer in the
-//documentation and/or other materials provided with the distribution.
-//Neither the name of the Drew Davidson nor the names of its contributors
-//may be used to endorse or promote products derived from this software
-//without specific prior written permission.
-
-//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-//OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-//AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-//OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-//THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-//DAMAGE.
-//--
-
import org.apache.commons.ognl.enhance.ExpressionCompiler;
+import org.apache.commons.ognl.enhance.OgnlExpressionCompiler;
import org.apache.commons.ognl.enhance.OrderedReturn;
import org.apache.commons.ognl.enhance.UnsupportedCompilationException;
@@ -58,6 +28,7 @@ import java.lang.reflect.Method;
/**
* $Id$
+ *
* @author Luke Blanshard (blans...@netscape.net)
* @author Drew Davidson (d...@ognl.org)
*/
@@ -85,8 +56,9 @@ public class ASTMethod
}
/**
- * Called from parser action.
- * @param methodName sets the name of the method
+ * Called from parser action.
+ *
+ * @param methodName sets the name of the method
*/
public void setMethodName( String methodName )
{
@@ -95,6 +67,7 @@ public class ASTMethod
/**
* Returns the method name that this node will call.
+ *
* @return the method name
*/
public String getMethodName()
@@ -152,6 +125,7 @@ public class ASTMethod
{
return getterClass;
}
+
public String toGetSourceString( OgnlContext context, Object target )
{
/*
@@ -162,43 +136,42 @@ public class ASTMethod
{
throw new UnsupportedCompilationException( "Target object is
null." );
}
-
+
String post = "";
String result;
-Method m;
+Method method;
+OgnlExpressionCompiler compiler = OgnlRuntime.getCompiler( context );
try
{
-m =
-OgnlRuntime.getMethod( context,
- context.getCurrentType() != null ?
context.getCurrentType() : target.getClass(),
- methodName, _children, false );
-if ( m == null )
+method = OgnlRuntime.getMeth
svn commit: r1190425 - /commons/proper/ognl/trunk/pom.xml
Author: mcucchiara
Date: Fri Oct 28 16:22:31 2011
New Revision: 1190425
URL: http://svn.apache.org/viewvc?rev=1190425&view=rev
Log:
Removed jub.customkey declaration
Modified:
commons/proper/ognl/trunk/pom.xml
Modified: commons/proper/ognl/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/pom.xml?rev=1190425&r1=1190424&r2=1190425&view=diff
==
--- commons/proper/ognl/trunk/pom.xml (original)
+++ commons/proper/ognl/trunk/pom.xml Fri Oct 28 16:22:31 2011
@@ -466,7 +466,6 @@ limitations under the License.
maven-surefire-plugin
-TODO
CONSOLE,XML,H2
${project.build.directory}/benchmarks/database
${project.build.directory}/benchmarks.xml
svn commit: r1189677 - /commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceOldOgnlTest.java
Author: mcucchiara
Date: Thu Oct 27 08:48:55 2011
New Revision: 1189677
URL: http://svn.apache.org/viewvc?rev=1189677&view=rev
Log:
PerformanceOldOgnlTest was extending the wrong base class
Modified:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceOldOgnlTest.java
Modified:
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceOldOgnlTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceOldOgnlTest.java?rev=1189677&r1=1189676&r2=1189677&view=diff
==
---
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceOldOgnlTest.java
(original)
+++
commons/proper/ognl/trunk/src/benchmarks/java/org/apache/commons/ognl/performance/PerformanceOldOgnlTest.java
Thu Oct 27 08:48:55 2011
@@ -38,7 +38,7 @@ import org.junit.BeforeClass;
@BenchmarkMethodChart( filePrefix = "benchmark-old-ognl" )
@BenchmarkHistoryChart( labelWith = LabelType.CUSTOM_KEY, maxRuns = 20 )
public class PerformanceOldOgnlTest
-extends PerformanceCommonsOgnlTest
+extends BasePerformanceTest
{
@BeforeClass
public static void before( )
svn commit: r1189632 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
Author: mcucchiara
Date: Thu Oct 27 06:29:22 2011
New Revision: 1189632
URL: http://svn.apache.org/viewvc?rev=1189632&view=rev
Log:
Minor changes
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java?rev=1189632&r1=1189631&r2=1189632&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
Thu Oct 27 06:29:22 2011
@@ -24,7 +24,6 @@ import org.apache.commons.ognl.enhance.L
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
@@ -114,11 +113,11 @@ public class OgnlContext
{
if ( ( s = System.getProperty( PROPERTY_KEY_PREFIX +
".traceEvaluations" ) ) != null )
{
-DEFAULT_TRACE_EVALUATIONS = Boolean.valueOf( s.trim()
).booleanValue();
+DEFAULT_TRACE_EVALUATIONS = Boolean.valueOf( s.trim() );
}
if ( ( s = System.getProperty( PROPERTY_KEY_PREFIX +
".keepLastEvaluation" ) ) != null )
{
-DEFAULT_KEEP_LAST_EVALUATION = Boolean.valueOf( s.trim()
).booleanValue();
+DEFAULT_KEEP_LAST_EVALUATION = Boolean.valueOf( s.trim() );
}
}
catch ( SecurityException ex )
@@ -178,12 +177,7 @@ public class OgnlContext
public void setValues( Map value )
{
-for ( Iterator it = value.keySet().iterator(); it.hasNext(); )
-{
-String k = it.next();
-
-_values.put( k, value.get( k ) );
-}
+_values.putAll( value );
}
public Map getValues()
@@ -706,12 +700,10 @@ public class OgnlContext
return result;
}
-public void putAll( Map t )
+public void putAll( Map t )
{
-for ( Iterator it = t.keySet().iterator();
it.hasNext(); )
+for ( String k : t.keySet() )
{
-String k = it.next();
-
put( k, t.get( k ) );
}
}
svn commit: r1189626 - /commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
Author: mcucchiara
Date: Thu Oct 27 06:20:48 2011
New Revision: 1189626
URL: http://svn.apache.org/viewvc?rev=1189626&view=rev
Log:
Removed explicit object extension
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
Modified:
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
URL:
http://svn.apache.org/viewvc/commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java?rev=1189626&r1=1189625&r2=1189626&view=diff
==
---
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
(original)
+++
commons/proper/ognl/trunk/src/main/java/org/apache/commons/ognl/OgnlContext.java
Thu Oct 27 06:20:48 2011
@@ -37,7 +37,6 @@ import java.util.Stack;
* @author Drew Davidson (d...@ognl.org)
*/
public class OgnlContext
-extends Object
implements Map
{
