Merge pull request #1548 from hchiorean/MODE-2594

MODE-2594 Adds better query handling by the REST service for multi-valued properties

Author: Horia Chiorean

web/modeshape-web-jcr-rest-war/src/test/java/org/modeshape/web/jcr/rest/ModeShapeRestServiceTest.java

@@ -874,6 +874,21 @@ public void shouldPerformRepositoryRestore() throws Exception {
         FileUtil.delete(new File(new URI(backupURL)));
     }
 
+
+    @Test
+    @FixFor( "MODE-2594" )
+    public void shouldReturnAllValuesWhenQueryingMultiValuedProperty() throws Exception {
+        doPost("post/node_multivalue_prop_request.json", itemsUrl(TEST_NODE)).isCreated();
+        String query = "SELECT property FROM [nt:unstructured] WHERE [jcr:path] = '/" + TEST_NODE + "'";
+        JSONObject result = jcrSQL2Query(query, queryUrl()).isOk().json();
+        JSONArray rows = result.getJSONArray("rows");
+        assertEquals(1, rows.length());
+        JSONObject row = rows.getJSONObject(0);
+        JSONArray values = row.getJSONArray("property");
+        assertEquals("[\"value1\",\"value2\",\"value3\"]", values.toString());
+    }
+
+
     private void assertUpload( String url,
                                boolean expectCreated,
                                boolean useMultiPart ) throws Exception {

web/modeshape-web-jcr-rest-war/src/test/resources/post/node_multivalue_prop_request.json

@@ -1,4 +1,4 @@
 {
     "jcr:primaryType":"nt:unstructured",
-    "property":["value1"]
+    "property":["value1", "value2", "value3"]
 }

web/modeshape-web-jcr-rest/src/main/java/org/modeshape/web/jcr/rest/handler/RestQueryHandler.java

@@ -21,7 +21,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
 import javax.jcr.Property;
 import javax.jcr.PropertyIterator;
 import javax.jcr.PropertyType;
@@ -194,8 +197,55 @@ private RestQueryResult.RestRow createRestRow( Session session,
                                                    Row resultRow ) throws RepositoryException {
         RestQueryResult.RestRow restRow = restQueryResult.new RestRow();
         Map<Value, String> binaryPropertyPaths = null;
-
+        Map<String, Node> nodesBySelectorName = null;
+        Node defaultNode = null;
+        String defaultSelectorName = null;
+        try {
+            defaultNode = resultRow.getNode();
+            defaultSelectorName = result.getSelectorNames()[0];
+        } catch (RepositoryException e) {
+            // there are multiple selectors....
+            nodesBySelectorName = Arrays.stream(result.getSelectorNames())
+                                        .collect(Collectors.toMap(Function.identity(), selectorName -> {
+                                            try {
+                                                return resultRow.getNode(selectorName);
+                                            } catch (RepositoryException re) {
+                                                throw new RuntimeException(re);
+                                            }
+                                        }));
+        }
+     
         for (String columnName : columnNames) {
+            Node activeNode = defaultNode;
+            String activeSelectorName = defaultSelectorName;
+            if (defaultNode == null) {
+                // there are multiple selectors so we must see which one refers to the current column...
+                assert nodesBySelectorName != null;
+                for (Map.Entry<String, Node> nodeBySelector : nodesBySelectorName.entrySet()) {
+                    String selectorName = nodeBySelector.getKey();
+                    if (columnName.startsWith(selectorName)) {
+                        activeNode = nodeBySelector.getValue();
+                        activeSelectorName = selectorName;
+                        break;
+                    }
+                }
+            }
+            
+            if (activeNode != null) {
+                // the column name by default has the [selectorName].[propertyName] format...
+                String propertyName = columnName.replaceFirst(activeSelectorName + "\\.", "");
+                Property property = null;
+                try {
+                    // try to locate the actual property based on the column name 
+                    property = activeNode.getProperty(propertyName);
+                    List<String> values = restPropertyValues(property, baseUrl, session);
+                    restRow.addValue(columnName, values.size() == 1 ? values.get(0) : values);
+                    continue;
+                } catch (PathNotFoundException e) {
+                    // we didn't locate the actual node property, so just read the value from the result row
+                }
+            }
+            
             Value value = resultRow.getValue(columnName);
             if (value == null) {
                 continue;

web/modeshape-web-jcr-rest/src/main/java/org/modeshape/web/jcr/rest/model/RestQueryResult.java

@@ -17,6 +17,7 @@
 package org.modeshape.web.jcr.rest.model;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -85,16 +86,24 @@ public JSONObject toJSON() throws JSONException {
     }
 
     public class RestRow implements JSONAble {
-        private final Map<String, String> values;
+        private final Map<String, Object> values;
 
         public RestRow() {
-            this.values = new LinkedHashMap<String, String>();
+            this.values = new LinkedHashMap<>();
         }
 
-        public void addValue( String name,
-                              String value ) {
-            if (!StringUtil.isBlank(name) && !StringUtil.isBlank(value)) {
+        public void addValue(String name,
+                             Object value) {
+            if (value == null || StringUtil.isBlank(name)) {
+                return;
+            }
+            if (value instanceof Collection<?>) {
                 values.put(name, value);
+            } else {
+                String valueString = value.toString();
+                if (!StringUtil.isBlank(valueString)) {
+                    values.put(name, valueString);
+                }
             }
         }