You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2017/01/11 11:57:58 UTC
svn commit: r1778282 - in /sling/trunk/bundles/scripting/sightly:
compiler/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/
java-compiler/src/main/java/org/apache/sling/scripting/sightly/render/
java-compiler/src/test/java/org/apache/sli...
Author: radu
Date: Wed Jan 11 11:57:58 2017
New Revision: 1778282
URL: http://svn.apache.org/viewvc?rev=1778282&view=rev
Log:
SLING-6450 - [HTL] Cannot retrieve "length" property for arrays of primitive types
* treated all arrays in a unitary way, irrespective of their type, for "length" retrieval
Added:
sling/trunk/bundles/scripting/sightly/java-compiler/src/test/java/org/apache/sling/scripting/sightly/render/
sling/trunk/bundles/scripting/sightly/java-compiler/src/test/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModelTest.java
Modified:
sling/trunk/bundles/scripting/sightly/compiler/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/CompileTimeObjectModel.java
sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModel.java
Modified: sling/trunk/bundles/scripting/sightly/compiler/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/CompileTimeObjectModel.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/compiler/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/CompileTimeObjectModel.java?rev=1778282&r1=1778281&r2=1778282&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/compiler/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/CompileTimeObjectModel.java (original)
+++ sling/trunk/bundles/scripting/sightly/compiler/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/CompileTimeObjectModel.java Wed Jan 11 11:57:58 2017
@@ -16,6 +16,7 @@
******************************************************************************/
package org.apache.sling.scripting.sightly.impl.compiler;
+import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -281,11 +282,10 @@ public final class CompileTimeObjectMode
}
private static Object getField(Object obj, String property) {
- if (obj instanceof Object[] && "length".equals(property)) {
- // Working around this limitation: http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html#getFields%28%29
- return ((Object[]) obj).length;
- }
Class<?> cls = obj.getClass();
+ if (cls.isArray() && "length".equals(property)) {
+ return Array.getLength(obj);
+ }
try {
Field field = cls.getDeclaredField(property);
return field.get(obj);
Modified: sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModel.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModel.java?rev=1778282&r1=1778281&r2=1778282&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModel.java (original)
+++ sling/trunk/bundles/scripting/sightly/java-compiler/src/main/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModel.java Wed Jan 11 11:57:58 2017
@@ -16,6 +16,7 @@
******************************************************************************/
package org.apache.sling.scripting.sightly.render;
+import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
@@ -306,11 +307,10 @@ public abstract class AbstractRuntimeObj
}
protected static Object getField(Object obj, String property) {
- if (obj instanceof Object[] && "length".equals(property)) {
- // Working around this limitation: http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html#getFields%28%29
- return ((Object[]) obj).length;
- }
Class<?> cls = obj.getClass();
+ if (cls.isArray() && "length".equals(property)) {
+ return Array.getLength(obj);
+ }
try {
Field field = cls.getDeclaredField(property);
return field.get(obj);
Added: sling/trunk/bundles/scripting/sightly/java-compiler/src/test/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModelTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/java-compiler/src/test/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModelTest.java?rev=1778282&view=auto
==============================================================================
--- sling/trunk/bundles/scripting/sightly/java-compiler/src/test/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModelTest.java (added)
+++ sling/trunk/bundles/scripting/sightly/java-compiler/src/test/java/org/apache/sling/scripting/sightly/render/AbstractRuntimeObjectModelTest.java Wed Jan 11 11:57:58 2017
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * 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.
+ ******************************************************************************/
+package org.apache.sling.scripting.sightly.render;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class AbstractRuntimeObjectModelTest {
+
+ private AbstractRuntimeObjectModel runtimeObjectModel = new AbstractRuntimeObjectModel() {};
+
+ @Test
+ public void testResolveProperty_ArrayLength() throws Exception {
+ int[] ints = new int[] {1, 2, 3};
+ Integer[] integers = new Integer[] {1, 2, 3};
+ assertEquals(ints.length, runtimeObjectModel.resolveProperty(ints, "length"));
+ assertEquals(integers.length, runtimeObjectModel.resolveProperty(integers, "length"));
+ }
+}