Fixed nullablity in DefaultEdge (graphql-java#658)

bbakerman · web-flow · commit 6011fd3b4dc7 · 2017-08-28T21:50:19.000+10:00
diff --git a/src/main/java/graphql/relay/DefaultEdge.java b/src/main/java/graphql/relay/DefaultEdge.java
@@ -8,8 +8,8 @@
 public class DefaultEdge<T> implements Edge<T> {
 
     public DefaultEdge(T node, ConnectionCursor cursor) {
-        this.node = assertNotNull(node, "node cannot be null");
         this.cursor = assertNotNull(cursor, "cursor cannot be null");
+        this.node = node;
     }
 
     /**
diff --git a/src/test/groovy/graphql/relay/SimpleListConnectionTest.groovy b/src/test/groovy/graphql/relay/SimpleListConnectionTest.groovy
@@ -67,4 +67,17 @@ class SimpleListConnectionTest extends Specification {
         notThrown(InvalidCursorException)
 
     }
+
+    def "can accept a list with nulls"() {
+        given:
+        def dataWithNull = ["a", null, "b"]
+        def env = newDataFetchingEnvironment().build()
+
+        when:
+        def connection = new SimpleListConnection(dataWithNull).get(env)
+
+        then:
+        connection.getEdges().size() == 3
+        connection.getEdges().get(1).getNode() == null
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@`
`8`	`8`	`public class DefaultEdge<T> implements Edge<T> {`
`9`	`9`
`10`	`10`	`public DefaultEdge(T node, ConnectionCursor cursor) {`
`11`		`- this.node = assertNotNull(node, "node cannot be null");`
`12`	`11`	`this.cursor = assertNotNull(cursor, "cursor cannot be null");`
	`12`	`+ this.node = node;`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`/**`