ATLAS-1155 Errors in Eclipse when I bring in the latest code (davidrad via shwethags)

release-log.txt

@@ -9,6 +9,7 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al
 ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
 
 ALL CHANGES:
+ATLAS-1155 Errors in Eclipse when I bring in the latest code (davidrad via shwethags)
 ATLAS-1098 Atlas allows creation of tag with name "isa" which causes exceptions during search (apoorvnaik via shwethags)
 ATLAS-1142 Lineage UI Improvement (kevalbhatt via shwethags)
 ATLAS-712 Support getTrait() API (svimal2106 via shwethags)

repository/src/main/java/org/apache/atlas/discovery/graph/GraphBackedDiscoveryService.java

@@ -150,8 +150,7 @@ public class GraphBackedDiscoveryService implements DiscoveryService {
         //If the final limit is 0, don't launch the query, return with 0 rows
         if (validatedExpression instanceof Expressions.LimitExpression
                 && ((Integer)((Expressions.LimitExpression) validatedExpression).limit().rawValue()) == 0) {
-            return new GremlinQueryResult(dslQuery, validatedExpression.dataType(),
-                    scala.collection.immutable.List.empty());
+            return new GremlinQueryResult(dslQuery, validatedExpression.dataType());
         }
 
         GremlinQuery gremlinQuery = new GremlinTranslator(validatedExpression, graphPersistenceStrategy).translate();

repository/src/main/scala/org/apache/atlas/query/GremlinEvaluator.scala

@@ -33,6 +33,10 @@ import org.apache.atlas.query.Expressions._
 case class GremlinQueryResult(query: String,
                               resultDataType: IDataType[_],
                               rows: List[_]) {
+    def this(query: String,resultDataType: IDataType[_]) {
+      this(query,resultDataType,List.empty)
+    }
+  
     def toJson = JsonHelper.toJson(this)
 }
 

repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepositoryTest.java

@@ -188,7 +188,7 @@ public class GraphBackedMetadataRepositoryTest {
 
     private boolean assertEdge(String id, String typeName) throws Exception {
         TitanGraph graph = graphProvider.get();
-        Vertex vertex = graph.query().has(Constants.GUID_PROPERTY_KEY, id).vertices().iterator().next();
+        Vertex vertex = (Vertex)graph.query().has(Constants.GUID_PROPERTY_KEY, id).vertices().iterator().next();
         Iterable<Edge> edges = vertex.getEdges(Direction.OUT, Constants.INTERNAL_PROPERTY_KEY_PREFIX + typeName + ".ref");
         if (!edges.iterator().hasNext()) {
             ITypedReferenceableInstance entity = repositoryService.getEntityDefinition(id);