diff --git a/kotlin-codegen/compiler/pom.xml b/kotlin/codegen/pom.xml similarity index 98% rename from kotlin-codegen/compiler/pom.xml rename to kotlin/codegen/pom.xml index 9e869eb..662434f 100644 --- a/kotlin-codegen/compiler/pom.xml +++ b/kotlin/codegen/pom.xml @@ -10,7 +10,7 @@ ../../pom.xml - moshi-kotlin-codegen-compiler + moshi-kotlin-codegen diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/AdapterGenerator.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/AdapterGenerator.kt similarity index 97% rename from kotlin-codegen/compiler/src/main/java/com/squareup/moshi/AdapterGenerator.kt rename to kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/AdapterGenerator.kt index 70137ad..b79abd0 100644 --- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/AdapterGenerator.kt +++ b/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()) } diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/AppliedType.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/AppliedType.kt similarity index 98% rename from kotlin-codegen/compiler/src/main/java/com/squareup/moshi/AppliedType.kt rename to kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/AppliedType.kt index d71beeb..06baf79 100644 --- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/AppliedType.kt +++ b/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 diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/DelegateKey.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/DelegateKey.kt similarity index 97% rename from kotlin-codegen/compiler/src/main/java/com/squareup/moshi/DelegateKey.kt rename to kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/DelegateKey.kt index 3fc7f74..4343b8e 100644 --- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/DelegateKey.kt +++ b/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 diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/JsonClassCodeGenProcessor.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessor.kt similarity index 97% rename from kotlin-codegen/compiler/src/main/java/com/squareup/moshi/JsonClassCodeGenProcessor.kt rename to kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessor.kt index 4660a43..c62f092 100644 --- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/JsonClassCodeGenProcessor.kt +++ b/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 { /** diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/PropertyGenerator.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/PropertyGenerator.kt similarity index 97% rename from kotlin-codegen/compiler/src/main/java/com/squareup/moshi/PropertyGenerator.kt rename to kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/PropertyGenerator.kt index 61e85a3..37c4c0c 100644 --- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/PropertyGenerator.kt +++ b/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 diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetConstructor.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TargetConstructor.kt similarity index 98% rename from kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetConstructor.kt rename to kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TargetConstructor.kt index dd8abb8..df8a22c 100644 --- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetConstructor.kt +++ b/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 diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetParameter.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TargetParameter.kt similarity index 95% rename from kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetParameter.kt rename to kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TargetParameter.kt index c656792..2294d87 100644 --- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetParameter.kt +++ b/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 diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetProperty.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TargetProperty.kt similarity index 97% rename from kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetProperty.kt rename to kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TargetProperty.kt index b8a174e..1f2a700 100644 --- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetProperty.kt +++ b/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 diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetType.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TargetType.kt similarity index 99% rename from kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetType.kt rename to kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TargetType.kt index bea4e6e..c354bff 100644 --- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TargetType.kt +++ b/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 diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TypeRenderer.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TypeRenderer.kt similarity index 98% rename from kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TypeRenderer.kt rename to kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TypeRenderer.kt index 289be39..e1259eb 100644 --- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TypeRenderer.kt +++ b/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)`. diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TypeResolver.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TypeResolver.kt similarity index 98% rename from kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TypeResolver.kt rename to kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TypeResolver.kt index 89ed9b6..1d580cc 100644 --- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/TypeResolver.kt +++ b/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 diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/kotlintypes.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/kotlintypes.kt similarity index 96% rename from kotlin-codegen/compiler/src/main/java/com/squareup/moshi/kotlintypes.kt rename to kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/kotlintypes.kt index fd4c6d1..279dc75 100644 --- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/kotlintypes.kt +++ b/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 diff --git a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/metadata.kt b/kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/metadata.kt similarity index 99% rename from kotlin-codegen/compiler/src/main/java/com/squareup/moshi/metadata.kt rename to kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/metadata.kt index d26170b..59936f7 100644 --- a/kotlin-codegen/compiler/src/main/java/com/squareup/moshi/metadata.kt +++ b/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 diff --git a/kotlin-codegen/compiler/src/test/java/com/squareup/moshi/JavaSuperclass.java b/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JavaSuperclass.java similarity index 85% rename from kotlin-codegen/compiler/src/test/java/com/squareup/moshi/JavaSuperclass.java rename to kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JavaSuperclass.java index 90a4525..c394f63 100644 --- a/kotlin-codegen/compiler/src/test/java/com/squareup/moshi/JavaSuperclass.java +++ b/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; } diff --git a/kotlin-codegen/compiler/src/test/java/com/squareup/moshi/CompilerTest.kt b/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessorTest.kt similarity index 89% rename from kotlin-codegen/compiler/src/test/java/com/squareup/moshi/CompilerTest.kt rename to kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/JsonClassCodegenProcessorTest.kt index e7460bd..2d66f21 100644 --- a/kotlin-codegen/compiler/src/test/java/com/squareup/moshi/CompilerTest.kt +++ b/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.kaptArgs[JsonClassCodeGenProcessor.OPTION_GENERATED] = "javax.annotation.GeneratedBlerg" + call.addService(Processor::class, JsonClassCodegenProcessor::class) + 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 diff --git a/kotlin-codegen/compiler/src/test/java/com/squareup/moshi/KotlinCompilerCall.kt b/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/KotlinCompilerCall.kt similarity index 98% rename from kotlin-codegen/compiler/src/test/java/com/squareup/moshi/KotlinCompilerCall.kt rename to kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/KotlinCompilerCall.kt index d533768..8b03a5c 100644 --- a/kotlin-codegen/compiler/src/test/java/com/squareup/moshi/KotlinCompilerCall.kt +++ b/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 { - val classLoader = CompilerTest::class.java.classLoader + val classLoader = JsonClassCodegenProcessorTest::class.java.classLoader if (classLoader !is URLClassLoader) { throw UnsupportedOperationException("unable to extract classpath from $classLoader") } diff --git a/kotlin-codegen/compiler/src/test/java/com/squareup/moshi/KotlinCompilerResult.kt b/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/KotlinCompilerResult.kt similarity index 94% rename from kotlin-codegen/compiler/src/test/java/com/squareup/moshi/KotlinCompilerResult.kt rename to kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/KotlinCompilerResult.kt index 27a65a3..cb4dba0 100644 --- a/kotlin-codegen/compiler/src/test/java/com/squareup/moshi/KotlinCompilerResult.kt +++ b/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 diff --git a/kotlin-codegen/compiler/src/test/java/com/squareup/moshi/TypeResolverTest.kt b/kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/TypeResolverTest.kt similarity index 94% rename from kotlin-codegen/compiler/src/test/java/com/squareup/moshi/TypeResolverTest.kt rename to kotlin/codegen/src/test/java/com/squareup/moshi/kotlin/codegen/TypeResolverTest.kt index 0358347..b4985a1 100644 --- a/kotlin-codegen/compiler/src/test/java/com/squareup/moshi/TypeResolverTest.kt +++ b/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 { diff --git a/kotlin-codegen/integration-test/pom.xml b/kotlin/tests/pom.xml similarity index 95% rename from kotlin-codegen/integration-test/pom.xml rename to kotlin/tests/pom.xml index c8b8b2b..97026ae 100644 --- a/kotlin-codegen/integration-test/pom.xml +++ b/kotlin/tests/pom.xml @@ -10,7 +10,7 @@ ../../pom.xml - moshi-kotlin-codegen-integration + moshi-kotlin-tests @@ -52,7 +52,7 @@ com.squareup.moshi - moshi-kotlin-codegen-compiler + moshi-kotlin-codegen ${project.version} @@ -83,7 +83,7 @@ com.squareup.moshi - moshi-kotlin-codegen-compiler + moshi-kotlin-codegen ${project.version} diff --git a/kotlin-codegen/integration-test/src/test/kotlin/com/squareup/moshi/GeneratedAdaptersTest.kt b/kotlin/tests/src/test/kotlin/com/squareup/moshi/kotlin/codgen/GeneratedAdaptersTest.kt similarity index 98% rename from kotlin-codegen/integration-test/src/test/kotlin/com/squareup/moshi/GeneratedAdaptersTest.kt rename to kotlin/tests/src/test/kotlin/com/squareup/moshi/kotlin/codgen/GeneratedAdaptersTest.kt index cd6ce96..b332516 100644 --- a/kotlin-codegen/integration-test/src/test/kotlin/com/squareup/moshi/GeneratedAdaptersTest.kt +++ b/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 - fun doNotGenerateAdapter() { + @Test fun doNotGenerateAdapter() { try { - StandardJsonAdapters.generatedAdapter( - moshi, DoNotGenerateAdapter::class.java, DoNotGenerateAdapter::class.java) + Class.forName("${GeneratedAdaptersTest::class.java.name}_DoNotGenerateAdapterJsonAdapter") fail("found a generated adapter for a type that shouldn't have one") - } catch (e: RuntimeException) { - assertThat(e).hasCauseInstanceOf(ClassNotFoundException::class.java) + } catch (expected: ClassNotFoundException) { } } diff --git a/pom.xml b/pom.xml index 50e2725..b1ed608 100644 --- a/pom.xml +++ b/pom.xml @@ -22,8 +22,8 @@ examples adapters kotlin - kotlin-codegen/compiler - kotlin-codegen/integration-test + kotlin/codegen + kotlin/tests