Fix #599: allow default versions in references

Author: Burak Serdar

crud/src/test/java/com/redhat/lightblue/mediator/CompositeFinderTest.java

@@ -244,6 +244,21 @@ public void retrieveAandBonly() throws Exception {
         Assert.assertEquals("A", qplan.getSources()[0].getMetadata().getName());
     }
 
+    @Test
+    public void retrieveAandBonly_defaultVersion() throws Exception {
+        FindRequest fr = new FindRequest();
+        fr.setQuery(query("{'field':'_id','op':'=','rvalue':'A01'}"));
+        fr.setProjection(projection("[{'field':'*','recursive':1},{'field':'b'}]"));
+        fr.setEntityVersion(new EntityVersion("A_def", "1.0.0"));
+        Response response = mediator.find(fr);
+        Assert.assertEquals(1, response.getEntityData().size());
+        Assert.assertEquals("A01", response.getEntityData().get(0).get("_id").asText());
+        QueryPlan qplan = (QueryPlan) getLastContext(mediator).getProperty(Mediator.CTX_QPLAN);
+        // This one must have A -> B
+        Assert.assertEquals(1, qplan.getSources().length);
+        Assert.assertEquals("A_def", qplan.getSources()[0].getMetadata().getName());
+    }
+
     @Test
     public void retrieveAandBonly_manyA() throws Exception {
         FindRequest fr = new FindRequest();

crud/src/test/resources/composite/B.json

@@ -5,7 +5,8 @@
         "backend":"mongo",
         "datasource": "mongodata",
         "collection": "user"
-    }
+    },
+      "defaultVersion":"1.0.0"
   },
   "schema" : {
     "name" : "B",

metadata/src/main/java/com/redhat/lightblue/metadata/parser/MetadataParser.java

@@ -873,7 +873,7 @@ private ReferenceField parseReferenceField(String name,
                                                T object) {
         ReferenceField field = new ReferenceField(name);
         field.setEntityName(getRequiredStringProperty(object, STR_ENTITY));
-        field.setVersionValue(getRequiredStringProperty(object, STR_VERSION_VALUE));
+        field.setVersionValue(getStringProperty(object, STR_VERSION_VALUE));
         field.setProjection(getProjection(object, STR_PROJECTION));
         field.setQuery(getQuery(object, STR_QUERY));
         field.setSort(getSort(object, STR_SORT));
@@ -1493,7 +1493,8 @@ private void convertArrayField(ArrayField field, T fieldObject) {
 
     private void convertReferenceField(ReferenceField field, T fieldObject) {
         putString(fieldObject, STR_ENTITY, field.getEntityName());
-        putString(fieldObject, STR_VERSION_VALUE, field.getVersionValue());
+        if(field.getVersionValue()!=null)
+            putString(fieldObject, STR_VERSION_VALUE, field.getVersionValue());
         if (field.getProjection() != null) {
             putProjection(fieldObject, STR_PROJECTION, field.getProjection());
         }

metadata/src/test/java/com/redhat/lightblue/metadata/CompositeMetadataTest.java

@@ -291,4 +291,12 @@ public void fieldResolutionTest() throws Exception {
         Assert.assertTrue(field == a.resolve(new Path("obj1.c.*._id")));
         Assert.assertEquals("obj1.c.*._id", field.getFullPath().toString());
     }
+
+    @Test
+    public void defaultVersionInRefTest() throws Exception {
+        EntityMetadata md=getMd("composite/A_def.json");
+        CompositeMetadata a = CompositeMetadata.buildCompositeMetadata(md, new SimpleGMD());
+        ResolvedReferenceField ref = (ResolvedReferenceField) a.resolve(new Path("obj1.c"));
+        Assert.assertNotNull(ref);
+    }
 }