Merge pull request #6 from scorebet/vkondrav/marshaller_fix

Marshaller codegen fix

Author: vkondrav

apollo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/SchemaTypeSpecBuilder.kt

@@ -222,7 +222,7 @@ class SchemaTypeSpecBuilder(
     fun responseMarshallerSpec(fieldSpecs: List<FieldSpec>): MethodSpec {
       val code = fieldSpecs
           .map { fieldSpec ->
-            if (fieldSpec.type.isOptional()) {
+            if (fieldSpec.type.isNullable()) {
               CodeBlock.builder()
                   .addStatement("final \$T \$L = \$L", fieldSpec.type.unwrapOptionalType().withoutAnnotations(),
                       "\$${fieldSpec.name}", fieldSpec.type.unwrapOptionalValue(fieldSpec.name))

apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition_nullable/TestQuery.java

@@ -377,8 +377,14 @@ public ResponseFieldMarshaller marshaller() {
         return new ResponseFieldMarshaller() {
           @Override
           public void marshal(ResponseWriter writer) {
-            writer.writeFragment(humanDetails.marshaller());
-            writer.writeFragment(droidDetails.marshaller());
+            final HumanDetails $humanDetails = humanDetails;
+            if ($humanDetails != null) {
+              writer.writeFragment($humanDetails.marshaller());
+            }
+            final DroidDetails $droidDetails = droidDetails;
+            if ($droidDetails != null) {
+              writer.writeFragment($droidDetails.marshaller());
+            }
           }
         };
       }
@@ -575,8 +581,14 @@ public ResponseFieldMarshaller marshaller() {
         return new ResponseFieldMarshaller() {
           @Override
           public void marshal(ResponseWriter writer) {
-            writer.writeFragment(humanDetails.marshaller());
-            writer.writeFragment(droidDetails.marshaller());
+            final HumanDetails $humanDetails = humanDetails;
+            if ($humanDetails != null) {
+              writer.writeFragment($humanDetails.marshaller());
+            }
+            final DroidDetails $droidDetails = droidDetails;
+            if ($droidDetails != null) {
+              writer.writeFragment($droidDetails.marshaller());
+            }
           }
         };
       }

apollo-compiler/src/test/graphql/com/example/union_fragment/TestQuery.java

@@ -363,8 +363,14 @@ public ResponseFieldMarshaller marshaller() {
         return new ResponseFieldMarshaller() {
           @Override
           public void marshal(ResponseWriter writer) {
-            writer.writeFragment(character.marshaller());
-            writer.writeFragment(starship.marshaller());
+            final Character $character = character;
+            if ($character != null) {
+              writer.writeFragment($character.marshaller());
+            }
+            final Starship $starship = starship;
+            if ($starship != null) {
+              writer.writeFragment($starship.marshaller());
+            }
           }
         };
       }