Add Java8 Optional generation (#499)

apollographql · May 17, 2017 · 46fb4e2 · 46fb4e2
1 parent ada0575
commit 46fb4e2
Show file tree

Hide file tree

Showing 10 changed files with 615 additions and 9 deletions.
diff --git a/apollo-compiler/src/main/kotlin/com/apollographql/android/compiler/ClassNames.kt b/apollo-compiler/src/main/kotlin/com/apollographql/android/compiler/ClassNames.kt
@@ -23,6 +23,7 @@ object ClassNames {
   val UNMODIFIABLE_MAP_BUILDER: ClassName = ClassName.get(UnmodifiableMapBuilder::class.java)
   val OPTIONAL: ClassName = ClassName.get(Optional::class.java)
   val GUAVA_OPTIONAL: ClassName = ClassName.get("com.google.common.base", "Optional")
+  val JAVA_OPTIONAL: ClassName = ClassName.get("java.util", "Optional")
   val API_UTILS: ClassName = ClassName.get(Utils::class.java)
   val FRAGMENT: ClassName = ClassName.get(GraphqlFragment::class.java)
 
@@ -57,4 +58,7 @@ object ClassNames {
   fun parameterizedGuavaOptional(type: TypeName): TypeName =
       ParameterizedTypeName.get(GUAVA_OPTIONAL, type)
 
+  fun parameterizedJavaOptional(type: TypeName): TypeName =
+      ParameterizedTypeName.get(JAVA_OPTIONAL, type)
+
 }
diff --git a/apollo-compiler/src/main/kotlin/com/apollographql/android/compiler/JavaTypeResolver.kt b/apollo-compiler/src/main/kotlin/com/apollographql/android/compiler/JavaTypeResolver.kt
@@ -1,6 +1,7 @@
 package com.apollographql.android.compiler
 
 import com.apollographql.android.compiler.ClassNames.parameterizedGuavaOptional
+import com.apollographql.android.compiler.ClassNames.parameterizedJavaOptional
 import com.apollographql.android.compiler.ClassNames.parameterizedOptional
 import com.apollographql.android.compiler.ir.CodeGenerationContext
 import com.squareup.javapoet.ClassName
@@ -31,6 +32,7 @@ class JavaTypeResolver(
       when (context.nullableValueType) {
         NullableValueType.APOLLO_OPTIONAL -> parameterizedOptional(javaType)
         NullableValueType.GUAVA_OPTIONAL -> parameterizedGuavaOptional(javaType)
+        NullableValueType.JAVA_OPTIONAL -> parameterizedJavaOptional(javaType)
         else -> javaType.annotated(Annotations.NULLABLE)
       }
     } else {

diff --git a/apollo-compiler/src/main/kotlin/com/apollographql/android/compiler/NullableValueType.kt b/apollo-compiler/src/main/kotlin/com/apollographql/android/compiler/NullableValueType.kt
@@ -3,7 +3,8 @@ package com.apollographql.android.compiler
 enum class NullableValueType(val value: String) {
   ANNOTATED("annotated"),
   APOLLO_OPTIONAL("apolloOptional"),
-  GUAVA_OPTIONAL("guavaOptional");
+  GUAVA_OPTIONAL("guavaOptional"),
+  JAVA_OPTIONAL("javaOptional");
 
   companion object {
     fun findByValue(value: String): NullableValueType? = NullableValueType.values().find { it.value == value }

diff --git a/...o-compiler/src/main/kotlin/com/apollographql/android/compiler/OperationTypeSpecBuilder.kt b/...o-compiler/src/main/kotlin/com/apollographql/android/compiler/OperationTypeSpecBuilder.kt
@@ -84,7 +84,9 @@ class OperationTypeSpecBuilder(
         .addParameter(ParameterSpec.builder(DATA_VAR_TYPE, "data").build())
         .returns(wrapperType(context))
         .addStatement(
-            if (context.nullableValueType != NullableValueType.ANNOTATED) {
+            if (context.nullableValueType == NullableValueType.JAVA_OPTIONAL) {
+              "return Optional.ofNullable(data)"
+            } else if (context.nullableValueType != NullableValueType.ANNOTATED) {
               "return Optional.fromNullable(data)"
             } else {
               "return data"
@@ -126,6 +128,7 @@ class OperationTypeSpecBuilder(
   private fun wrapperType(context: CodeGenerationContext) = when (context.nullableValueType) {
     NullableValueType.GUAVA_OPTIONAL -> ClassNames.parameterizedGuavaOptional(DATA_VAR_TYPE)
     NullableValueType.APOLLO_OPTIONAL -> ClassNames.parameterizedOptional(DATA_VAR_TYPE)
+    NullableValueType.JAVA_OPTIONAL -> ClassNames.parameterizedJavaOptional(DATA_VAR_TYPE)
     else -> DATA_VAR_TYPE
   }
 

diff --git a/apollo-compiler/src/main/kotlin/com/apollographql/android/compiler/Util.kt b/apollo-compiler/src/main/kotlin/com/apollographql/android/compiler/Util.kt
@@ -50,11 +50,12 @@ fun TypeSpec.withValueInitConstructor(nullableValueGenerationType: NullableValue
               .filter { !it.modifiers.contains(Modifier.STATIC) }
               .map {
                 if (it.type.isOptional() && nullableValueGenerationType != NullableValueType.ANNOTATED) {
-                  val optionalType = if (nullableValueGenerationType == NullableValueType.GUAVA_OPTIONAL)
-                    ClassNames.GUAVA_OPTIONAL
-                  else
-                    ClassNames.OPTIONAL
-                  CodeBlock.of("this.\$L = \$T.fromNullable(\$L);\n", it.name, optionalType, it.name)
+                  val factory = when (nullableValueGenerationType) {
+                    NullableValueType.GUAVA_OPTIONAL -> ClassNames.GUAVA_OPTIONAL to "fromNullable"
+                    NullableValueType.JAVA_OPTIONAL -> ClassNames.JAVA_OPTIONAL to "ofNullable"
+                    else -> ClassNames.OPTIONAL to "fromNullable"
+                  }
+                  CodeBlock.of("this.\$L = \$T.\$L(\$L);\n", it.name, factory.first, factory.second, it.name)
                 } else {
                   CodeBlock.of("this.\$L = \$L;\n", it.name, it.name)
                 }
@@ -217,7 +218,7 @@ fun ClassName.mapperFieldName(): String = "${simpleName().decapitalize()}${Util.
 
 fun TypeName.isOptional(): Boolean {
   val rawType = (this as? ParameterizedTypeName)?.rawType ?: this
-  return rawType == ClassNames.OPTIONAL || rawType == ClassNames.GUAVA_OPTIONAL
+  return rawType == ClassNames.OPTIONAL || rawType == ClassNames.GUAVA_OPTIONAL || rawType == ClassNames.JAVA_OPTIONAL
 }
 
 fun TypeName.unwrapOptionalType(): TypeName {

diff --git a/apollo-compiler/src/test/graphql/com/example/hero_details_java_optional/TestQuery.graphql b/apollo-compiler/src/test/graphql/com/example/hero_details_java_optional/TestQuery.graphql
@@ -0,0 +1,13 @@
+query TestQuery {
+  hero {
+    name
+    friendsConnection {
+      totalCount
+      edges {
+        node {
+          name
+        }
+      }
+    }
+  }
+}