svn commit: r1674092 - in /sling/trunk/bundles/scripting/javascript/src: main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java test/java/org/apache/sling/scripting/wrapper/ScriptableResourceTest.java

[ju...@apache.org]

Author: justin
Date: Thu Apr 16 15:22:42 2015
New Revision: 1674092

URL: http://svn.apache.org/r1674092
Log:
SLING-3413 - adding parent property getter to ScriptableResource. Also correcting JavaDoc

Modified:
    sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java
    sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableResourceTest.java

Modified: sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java?rev=1674092&r1=1674091&r2=1674092&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java (original)
+++ sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java Thu Apr 16 15:22:42 2015
@@ -31,9 +31,26 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Resource in JavaScript has following signature: [Object] getData(); [Object]
- * data [Item] getItem(); [Item] item [String] getResourceType(); [String] type
- * [String] getPath(); [String] path
+ * Resource in JavaScript has following signature:
+ * <ul>
+ * <li>[String] getName()</li>
+ * <li>[String] name</li>
+ * <li>[Object] getResourceMetadata()</li>
+ * <li>[Object] resourceMetadata</li>
+ * <li>[String] getPath()</li>
+ * <li>[String] path</li>
+ * <li>[String] getResourceType()</li>
+ * <li>[String] resourceType</li>
+ * <li>[String] getResourceSuperType()</li>
+ * <li>[String] resourceSuperType</li>
+ * <li>[Resource] getParent()</li>
+ * <li>[Resource] parent</li>
+ * <li>[ResourceResolver] getResourceResolver()</li>
+ * <li>[ResourceResolver] resourceResolver</li>
+ * <li>[Resource] getChild(String)</li>
+ * <li>[Resource[]] getChildren()</li>
+ * <li>[Resource[]] listChildren()</li>
+ * <li>[Boolean] isResourceType(String)</li>
  */
 public class ScriptableResource extends ScriptableObject implements
         SlingWrapper {
@@ -119,6 +136,16 @@ public class ScriptableResource extends
         return new NativeArray(IteratorUtils.toArray(resource.listChildren()));
     }
 
+    /**
+     * Maps getParent() method as parent property.
+     */
+    public Object jsGet_parent() {
+        return this.jsFunction_getParent();
+    }
+
+    /**
+     * Maps getParent() method as getParent() method.
+     */
     public Object jsFunction_getParent() {
         return resource.getParent();
     }

Modified: sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableResourceTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableResourceTest.java?rev=1674092&r1=1674091&r2=1674092&view=diff
==============================================================================
--- sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableResourceTest.java (original)
+++ sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableResourceTest.java Thu Apr 16 15:22:42 2015
@@ -134,6 +134,16 @@ public class ScriptableResourceTest exte
         assertEquals(child.getPath(), script.eval("resource.getParent().getPath()", data));
     }
 
+    public void testParent() throws Exception {
+        Node child = node.addNode("child");
+        Node grandChild = child.addNode("grandchild");
+
+        final ScriptEngineHelper.Data data = new ScriptEngineHelper.Data();
+        data.put("resource", new TestResource(grandChild));
+
+        assertEquals(child.getPath(), script.eval("resource.parent.path", data));
+    }
+
     public void testIsResourceType() throws Exception {
         final ScriptEngineHelper.Data data = new ScriptEngineHelper.Data();
         data.put("resource", new TestResource(node));