Merge pull request #532 from square/jwilson.0514.move_kompiler

Move the Kotlin code generator to the kotlin/ module

kotlin/codegen/pom.xml

@@ -10,7 +10,7 @@
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
-  <artifactId>moshi-kotlin-codegen-compiler</artifactId>
+  <artifactId>moshi-kotlin-codegen</artifactId>
 
   <dependencies>
     <dependency>

kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/AdapterGenerator.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi
+package com.squareup.moshi.kotlin.codegen
 
 import com.squareup.kotlinpoet.ARRAY
 import com.squareup.kotlinpoet.AnnotationSpec
@@ -30,6 +30,11 @@ import com.squareup.kotlinpoet.TypeSpec
 import com.squareup.kotlinpoet.TypeVariableName
 import com.squareup.kotlinpoet.asClassName
 import com.squareup.kotlinpoet.asTypeName
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonDataException
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.Moshi
 import me.eugeniomarletti.kotlin.metadata.isDataClass
 import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.Visibility
 import me.eugeniomarletti.kotlin.metadata.visibility
@@ -101,7 +106,7 @@ internal class AdapterGenerator(
 
     generatedOption?.let {
       result.addAnnotation(AnnotationSpec.builder(it.asClassName())
-          .addMember("%S", JsonClassCodeGenProcessor::class.java.canonicalName)
+          .addMember("%S", JsonClassCodegenProcessor::class.java.canonicalName)
           .addMember("%S", "https://github.com/square/moshi")
           .build())
     }

kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/AppliedType.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi
+package com.squareup.moshi.kotlin.codegen
 
 import com.squareup.kotlinpoet.TypeName
 import com.squareup.kotlinpoet.TypeVariableName

kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/DelegateKey.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi
+package com.squareup.moshi.kotlin.codegen
 
 import com.google.auto.common.MoreTypes
 import com.squareup.kotlinpoet.AnnotationSpec
@@ -29,6 +29,8 @@ import com.squareup.kotlinpoet.TypeName
 import com.squareup.kotlinpoet.TypeVariableName
 import com.squareup.kotlinpoet.WildcardTypeName
 import com.squareup.kotlinpoet.asTypeName
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.Types
 import java.lang.annotation.ElementType
 import java.lang.annotation.RetentionPolicy
 import javax.annotation.processing.Messager

kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessor.kt

@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi
+package com.squareup.moshi.kotlin.codegen
 
 import com.google.auto.service.AutoService
 import com.squareup.kotlinpoet.TypeSpec
+import com.squareup.moshi.JsonClass
 import me.eugeniomarletti.kotlin.metadata.KotlinMetadataUtils
 import me.eugeniomarletti.kotlin.metadata.declaresDefaultValue
 import me.eugeniomarletti.kotlin.processing.KotlinAbstractProcessor
@@ -41,7 +42,7 @@ import javax.tools.Diagnostic.Kind.ERROR
  * If you don't want this though, you can use the runtime [JsonClass] factory implementation.
  */
 @AutoService(Processor::class)
-class JsonClassCodeGenProcessor : KotlinAbstractProcessor(), KotlinMetadataUtils {
+class JsonClassCodegenProcessor : KotlinAbstractProcessor(), KotlinMetadataUtils {
 
   companion object {
     /**

kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/PropertyGenerator.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi
+package com.squareup.moshi.kotlin.codegen
 
 import com.squareup.kotlinpoet.BOOLEAN
 import com.squareup.kotlinpoet.NameAllocator

kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TargetConstructor.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi
+package com.squareup.moshi.kotlin.codegen
 
 import me.eugeniomarletti.kotlin.metadata.KotlinClassMetadata
 import me.eugeniomarletti.kotlin.metadata.isPrimary

kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TargetParameter.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi
+package com.squareup.moshi.kotlin.codegen
 
 import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.ValueParameter
 import javax.lang.model.element.VariableElement

kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TargetProperty.kt

@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi
+package com.squareup.moshi.kotlin.codegen
 
 import com.google.auto.common.AnnotationMirrors
 import com.squareup.kotlinpoet.TypeName
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonQualifier
 import me.eugeniomarletti.kotlin.metadata.declaresDefaultValue
 import me.eugeniomarletti.kotlin.metadata.hasSetter
 import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.Property

kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TargetType.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi
+package com.squareup.moshi.kotlin.codegen
 
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.KModifier

kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TypeRenderer.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi
+package com.squareup.moshi.kotlin.codegen
 
 import com.squareup.kotlinpoet.ARRAY
 import com.squareup.kotlinpoet.BOOLEAN
@@ -31,6 +31,7 @@ import com.squareup.kotlinpoet.TypeName
 import com.squareup.kotlinpoet.TypeVariableName
 import com.squareup.kotlinpoet.WildcardTypeName
 import com.squareup.kotlinpoet.asTypeName
+import com.squareup.moshi.Types
 
 /**
  * Renders literals like `Types.newParameterizedType(List::class.java, String::class.java)`.

kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TypeResolver.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi
+package com.squareup.moshi.kotlin.codegen
 
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.ParameterizedTypeName

kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/kotlintypes.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi
+package com.squareup.moshi.kotlin.codegen
 
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.ParameterizedTypeName

kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/metadata.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi
+package com.squareup.moshi.kotlin.codegen
 
 import com.squareup.kotlinpoet.ANY
 import com.squareup.kotlinpoet.ClassName

kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JavaSuperclass.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi;
+package com.squareup.moshi.kotlin.codegen;
 
-/** For {@link CompilerTest#extendJavaType}. */
+/** For {@link JsonClassCodegenProcessorTest#extendJavaType}. */
 public class JavaSuperclass {
   public int a = 1;
 }

kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessorTest.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi
+package com.squareup.moshi.kotlin.codegen
 
 import org.assertj.core.api.Assertions.assertThat
 import org.jetbrains.kotlin.cli.common.ExitCode
@@ -24,13 +24,13 @@ import org.junit.rules.TemporaryFolder
 import javax.annotation.processing.Processor
 
 /** Execute kotlinc to confirm that either files are generated or errors are printed. */
-class CompilerTest {
+class JsonClassCodegenProcessorTest {
   @Rule @JvmField var temporaryFolder: TemporaryFolder = TemporaryFolder()
 
   @Test fun privateConstructor() {
     val call = KotlinCompilerCall(temporaryFolder.root)
     call.inheritClasspath = true
-    call.addService(Processor::class, JsonClassCodeGenProcessor::class)
+    call.addService(Processor::class, JsonClassCodegenProcessor::class)
     call.addKt("source.kt", """
         |import com.squareup.moshi.JsonClass
         |
@@ -52,7 +52,7 @@ class CompilerTest {
   @Test fun privateConstructorParameter() {
     val call = KotlinCompilerCall(temporaryFolder.root)
     call.inheritClasspath = true
-    call.addService(Processor::class, JsonClassCodeGenProcessor::class)
+    call.addService(Processor::class, JsonClassCodegenProcessor::class)
     call.addKt("source.kt", """
         |import com.squareup.moshi.JsonClass
         |
@@ -68,7 +68,7 @@ class CompilerTest {
   @Test fun privateProperties() {
     val call = KotlinCompilerCall(temporaryFolder.root)
     call.inheritClasspath = true
-    call.addService(Processor::class, JsonClassCodeGenProcessor::class)
+    call.addService(Processor::class, JsonClassCodegenProcessor::class)
     call.addKt("source.kt", """
         |import com.squareup.moshi.JsonClass
         |
@@ -87,7 +87,7 @@ class CompilerTest {
   @Test fun interfacesNotSupported() {
     val call = KotlinCompilerCall(temporaryFolder.root)
     call.inheritClasspath = true
-    call.addService(Processor::class, JsonClassCodeGenProcessor::class)
+    call.addService(Processor::class, JsonClassCodegenProcessor::class)
     call.addKt("source.kt", """
         |import com.squareup.moshi.JsonClass
         |
@@ -104,7 +104,7 @@ class CompilerTest {
   @Test fun abstractClassesNotSupported() {
     val call = KotlinCompilerCall(temporaryFolder.root)
     call.inheritClasspath = true
-    call.addService(Processor::class, JsonClassCodeGenProcessor::class)
+    call.addService(Processor::class, JsonClassCodegenProcessor::class)
     call.addKt("source.kt", """
         |import com.squareup.moshi.JsonClass
         |
@@ -121,7 +121,7 @@ class CompilerTest {
   @Test fun innerClassesNotSupported() {
     val call = KotlinCompilerCall(temporaryFolder.root)
     call.inheritClasspath = true
-    call.addService(Processor::class, JsonClassCodeGenProcessor::class)
+    call.addService(Processor::class, JsonClassCodegenProcessor::class)
     call.addKt("source.kt", """
         |import com.squareup.moshi.JsonClass
         |
@@ -140,7 +140,7 @@ class CompilerTest {
   @Test fun enumClassesNotSupported() {
     val call = KotlinCompilerCall(temporaryFolder.root)
     call.inheritClasspath = true
-    call.addService(Processor::class, JsonClassCodeGenProcessor::class)
+    call.addService(Processor::class, JsonClassCodegenProcessor::class)
     call.addKt("source.kt", """
         |import com.squareup.moshi.JsonClass
         |
@@ -162,7 +162,7 @@ class CompilerTest {
   @Test fun localClassesNotSupported() {
     val call = KotlinCompilerCall(temporaryFolder.root)
     call.inheritClasspath = true
-    call.addService(Processor::class, JsonClassCodeGenProcessor::class)
+    call.addService(Processor::class, JsonClassCodegenProcessor::class)
     call.addKt("source.kt", """
         |import com.squareup.moshi.JsonClass
         |
@@ -181,7 +181,7 @@ class CompilerTest {
   @Test fun objectDeclarationsNotSupported() {
     val call = KotlinCompilerCall(temporaryFolder.root)
     call.inheritClasspath = true
-    call.addService(Processor::class, JsonClassCodeGenProcessor::class)
+    call.addService(Processor::class, JsonClassCodegenProcessor::class)
     call.addKt("source.kt", """
         |import com.squareup.moshi.JsonClass
         |
@@ -199,7 +199,7 @@ class CompilerTest {
   @Test fun objectExpressionsNotSupported() {
     val call = KotlinCompilerCall(temporaryFolder.root)
     call.inheritClasspath = true
-    call.addService(Processor::class, JsonClassCodeGenProcessor::class)
+    call.addService(Processor::class, JsonClassCodegenProcessor::class)
     call.addKt("source.kt", """
         |import com.squareup.moshi.JsonClass
         |
@@ -218,7 +218,7 @@ class CompilerTest {
   @Test fun requiredTransientConstructorParameterFails() {
     val call = KotlinCompilerCall(temporaryFolder.root)
     call.inheritClasspath = true
-    call.addService(Processor::class, JsonClassCodeGenProcessor::class)
+    call.addService(Processor::class, JsonClassCodegenProcessor::class)
     call.addKt("source.kt", """
         |import com.squareup.moshi.JsonClass
         |
@@ -235,7 +235,7 @@ class CompilerTest {
   @Test fun nonPropertyConstructorParameter() {
     val call = KotlinCompilerCall(temporaryFolder.root)
     call.inheritClasspath = true
-    call.addService(Processor::class, JsonClassCodeGenProcessor::class)
+    call.addService(Processor::class, JsonClassCodegenProcessor::class)
     call.addKt("source.kt", """
         |import com.squareup.moshi.JsonClass
         |
@@ -252,8 +252,8 @@ class CompilerTest {
   @Test fun badGeneratedAnnotation() {
     val call = KotlinCompilerCall(temporaryFolder.root)
     call.inheritClasspath = true
-    call.addService(Processor::class, JsonClassCodeGenProcessor::class)
+    call.addService(Processor::class, JsonClassCodegenProcessor::class)
-    call.kaptArgs[JsonClassCodeGenProcessor.OPTION_GENERATED] = "javax.annotation.GeneratedBlerg"
+    call.kaptArgs[JsonClassCodegenProcessor.OPTION_GENERATED] = "javax.annotation.GeneratedBlerg"
     call.addKt("source.kt", """
         |import com.squareup.moshi.JsonClass
         |
@@ -264,13 +264,13 @@ class CompilerTest {
     val result = call.execute()
     assertThat(result.exitCode).isEqualTo(ExitCode.COMPILATION_ERROR)
     assertThat(result.systemErr).contains(
-        "Invalid option value for ${JsonClassCodeGenProcessor.OPTION_GENERATED}")
+        "Invalid option value for ${JsonClassCodegenProcessor.OPTION_GENERATED}")
   }
 
   @Test fun multipleErrors() {
     val call = KotlinCompilerCall(temporaryFolder.root)
     call.inheritClasspath = true
-    call.addService(Processor::class, JsonClassCodeGenProcessor::class)
+    call.addService(Processor::class, JsonClassCodegenProcessor::class)
     call.addKt("source.kt", """
         |import com.squareup.moshi.JsonClass
         |
@@ -291,7 +291,7 @@ class CompilerTest {
   @Test fun extendPlatformType() {
     val call = KotlinCompilerCall(temporaryFolder.root)
     call.inheritClasspath = true
-    call.addService(Processor::class, JsonClassCodeGenProcessor::class)
+    call.addService(Processor::class, JsonClassCodegenProcessor::class)
     call.addKt("source.kt", """
         |import com.squareup.moshi.JsonClass
         |import java.util.Date
@@ -308,10 +308,10 @@ class CompilerTest {
   @Test fun extendJavaType() {
     val call = KotlinCompilerCall(temporaryFolder.root)
     call.inheritClasspath = true
-    call.addService(Processor::class, JsonClassCodeGenProcessor::class)
+    call.addService(Processor::class, JsonClassCodegenProcessor::class)
     call.addKt("source.kt", """
         |import com.squareup.moshi.JsonClass
-        |import com.squareup.moshi.JavaSuperclass
+        |import com.squareup.moshi.kotlin.codegen.JavaSuperclass
         |
         |@JsonClass(generateAdapter = true)
         |class ExtendsJavaType(var b: Int) : JavaSuperclass()
@@ -320,14 +320,14 @@ class CompilerTest {
     val result = call.execute()
     assertThat(result.exitCode).isEqualTo(ExitCode.COMPILATION_ERROR)
     assertThat(result.systemErr)
-        .contains("supertype com.squareup.moshi.JavaSuperclass is not a Kotlin type")
+        .contains("supertype com.squareup.moshi.kotlin.codegen.JavaSuperclass is not a Kotlin type")
   }
 
   @Test
   fun nonFieldApplicableQualifier() {
     val call = KotlinCompilerCall(temporaryFolder.root)
     call.inheritClasspath = true
-    call.addService(Processor::class, JsonClassCodeGenProcessor::class)
+    call.addService(Processor::class, JsonClassCodegenProcessor::class)
     call.addKt("source.kt", """
         |import com.squareup.moshi.JsonClass
         |import com.squareup.moshi.JsonQualifier
@@ -355,7 +355,7 @@ class CompilerTest {
   fun nonRuntimeQualifier() {
     val call = KotlinCompilerCall(temporaryFolder.root)
     call.inheritClasspath = true
-    call.addService(Processor::class, JsonClassCodeGenProcessor::class)
+    call.addService(Processor::class, JsonClassCodegenProcessor::class)
     call.addKt("source.kt", """
         |import com.squareup.moshi.JsonClass
         |import com.squareup.moshi.JsonQualifier

kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/KotlinCompilerCall.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi
+package com.squareup.moshi.kotlin.codegen
 
 import com.google.common.collect.LinkedHashMultimap
 import okio.Buffer
@@ -151,7 +151,7 @@ class KotlinCompilerCall(var scratchDir: File) {
 
   /** Returns the files on the host process' classpath. */
   private fun classpathFiles(): List<File> {
-    val classLoader = CompilerTest::class.java.classLoader
+    val classLoader = JsonClassCodegenProcessorTest::class.java.classLoader
     if (classLoader !is URLClassLoader) {
       throw UnsupportedOperationException("unable to extract classpath from $classLoader")
     }

kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/KotlinCompilerResult.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi
+package com.squareup.moshi.kotlin.codegen
 
 import org.jetbrains.kotlin.cli.common.ExitCode
 

kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/TypeResolverTest.kt

@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi
+package com.squareup.moshi.kotlin.codegen
 
 import com.google.common.truth.Truth.assertThat
 import com.squareup.kotlinpoet.ParameterizedTypeName
 import com.squareup.kotlinpoet.WildcardTypeName
 import com.squareup.kotlinpoet.asClassName
+import com.squareup.moshi.kotlin.codegen.TypeResolver
 import org.junit.Test
 
 class TypeResolverTest {

kotlin/tests/pom.xml

@@ -10,7 +10,7 @@
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
-  <artifactId>moshi-kotlin-codegen-integration</artifactId>
+  <artifactId>moshi-kotlin-tests</artifactId>
 
   <dependencies>
     <dependency>
@@ -52,7 +52,7 @@
               <annotationProcessorPaths>
                 <annotationProcessorPath>
                   <groupId>com.squareup.moshi</groupId>
-                  <artifactId>moshi-kotlin-codegen-compiler</artifactId>
+                  <artifactId>moshi-kotlin-codegen</artifactId>
                   <version>${project.version}</version>
                 </annotationProcessorPath>
               </annotationProcessorPaths>
@@ -83,7 +83,7 @@
               <annotationProcessorPaths>
                 <annotationProcessorPath>
                   <groupId>com.squareup.moshi</groupId>
-                  <artifactId>moshi-kotlin-codegen-compiler</artifactId>
+                  <artifactId>moshi-kotlin-codegen</artifactId>
                   <version>${project.version}</version>
                 </annotationProcessorPath>
               </annotationProcessorPaths>

kotlin/tests/src/test/kotlin/com/squareup/moshi/kotlin/codgen/GeneratedAdaptersTest.kt

@@ -13,8 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.squareup.moshi
+package com.squareup.moshi.kotlin.codgen
 
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import com.squareup.moshi.JsonDataException
+import com.squareup.moshi.JsonQualifier
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.ToJson
+import com.squareup.moshi.Types
 import org.assertj.core.api.Assertions.assertThat
 import org.intellij.lang.annotations.Language
 import org.junit.Assert.fail
@@ -244,14 +252,11 @@ class GeneratedAdaptersTest {
     assertThat(nullSerializedNullableTypeParams).isEqualTo(nullableTypeParams)
   }
 
-  @Test
+  @Test fun doNotGenerateAdapter() {
-  fun doNotGenerateAdapter() {
     try {
-      StandardJsonAdapters.generatedAdapter(
+      Class.forName("${GeneratedAdaptersTest::class.java.name}_DoNotGenerateAdapterJsonAdapter")
-          moshi, DoNotGenerateAdapter::class.java, DoNotGenerateAdapter::class.java)
       fail("found a generated adapter for a type that shouldn't have one")
-    } catch (e: RuntimeException) {
+    } catch (expected: ClassNotFoundException) {
-      assertThat(e).hasCauseInstanceOf(ClassNotFoundException::class.java)
     }
   }
 

pom.xml

@@ -22,8 +22,8 @@
     <module>examples</module>
     <module>adapters</module>
     <module>kotlin</module>
-    <module>kotlin-codegen/compiler</module>
+    <module>kotlin/codegen</module>
-    <module>kotlin-codegen/integration-test</module>
+    <module>kotlin/tests</module>
   </modules>
 
   <properties>