Upgraded KotlinPoet to 1.3.0

Author: YetAnotherMatt

README.md

@@ -15,8 +15,8 @@ apply plugin: 'kotlin-kapt'
 ...
 dependencies {
     ...
-    implementation 'com.thinkinglogic.builder:kotlin-builder-annotation:1.1.0'
-    kapt 'com.thinkinglogic.builder:kotlin-builder-processor:1.1.0'
+    implementation 'com.thinkinglogic.builder:kotlin-builder-annotation:1.2.0'
+    kapt 'com.thinkinglogic.builder:kotlin-builder-processor:1.2.0'
 }
 ```
 ##### Maven
@@ -26,7 +26,7 @@ dependencies {
     <dependency>
         <groupId>com.thinkinglogic.builder</groupId>
         <artifactId>kotlin-builder-annotation</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
     </dependency>
     ...
 </dependencies>
@@ -46,7 +46,7 @@ dependencies {
             <annotationProcessorPath>
                 <groupId>com.thinkinglogic.builder</groupId>
                 <artifactId>kotlin-builder-processor</artifactId>
-                <version>1.1.0</version>
+                <version>1.2.0</version>
             </annotationProcessorPath>
         </annotationProcessorPaths>
     </configuration>

build.gradle

@@ -21,7 +21,7 @@ buildscript {
 
 allprojects {
     group = 'com.thinkinglogic.builder'
-    version = '1.1.0'
+    version = '1.2.0'
     apply plugin: "kotlin"
 
     repositories {

kotlin-builder-example-usage/src/main/kotlin/com/thinkinglogic/example/DataClassWithLongPropertyNames.kt

@@ -0,0 +1,22 @@
+package com.thinkinglogic.example
+
+import com.thinkinglogic.builder.annotation.Builder
+import com.thinkinglogic.builder.annotation.DefaultValue
+import java.time.LocalDate
+
+@Builder
+data class DataClassWithLongPropertyNames(
+        @DefaultValue("myDefault") val stringWithAVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryLongNameThatWouldCauseLineWrappingInTheGeneratedFile: String = "myDefault",
+        val nullableString: String?
+) {
+
+    /**
+     * @return a Builder initialised with fields from this object.
+     */
+    fun toBuilder() = DataClassWithLongPropertyNamesBuilder(this)
+
+    companion object {
+        @JvmStatic
+        fun builder() = DataClassWithLongPropertyNamesBuilder()
+    }
+}

kotlin-builder-processor/build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'maven-publish'
 dependencies {
     implementation project(':kotlin-builder-annotation')
 
-    implementation 'com.squareup:kotlinpoet:1.0.0-RC1'
+    implementation 'com.squareup:kotlinpoet:1.3.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
 }

kotlin-builder-processor/src/main/kotlin/com/thinkinglogic/builder/processor/BuilderProcessor.kt

@@ -126,7 +126,7 @@ class BuilderProcessor : AbstractProcessor() {
         val code = StringBuilder()
         fields.forEach { field ->
             if (getterFieldNames.contains(field.simpleName.toString())) {
-                code.append("    this.${field.simpleName} = $source.${field.simpleName}")
+                code.append("    this.${field.simpleName}·=·$source.${field.simpleName}")
                         .appendln()
             }
         }
@@ -149,11 +149,11 @@ class BuilderProcessor : AbstractProcessor() {
     /** Creates a 'build()' function that will invoke a constructor for [returnType], passing [fields] as arguments and returning the new instance. */
     private fun createBuildFunction(fields: List<Element>, returnType: TypeElement): FunSpec {
         val code = StringBuilder("$CHECK_REQUIRED_FIELDS_FUNCTION_NAME()")
-        code.appendln().append("return ${returnType.simpleName}(")
+        code.appendln().append("return·${returnType.simpleName}(")
         val iterator = fields.listIterator()
         while (iterator.hasNext()) {
             val field = iterator.next()
-            code.appendln().append("    ${field.simpleName} = ${field.simpleName}")
+            code.appendln().append("    ${field.simpleName}·=·${field.simpleName}")
             if (!field.isNullable()) {
                 code.append("!!")
             }
@@ -174,7 +174,7 @@ class BuilderProcessor : AbstractProcessor() {
         val code = StringBuilder()
         fields.filterNot { it.isNullable() }
                 .forEach { field ->
-                    code.append("    check(${field.simpleName} != null, {\"${field.simpleName} must not be null\"})").appendln()
+                    code.append("    check(${field.simpleName}·!=·null, {\"${field.simpleName}·must·not·be·null\"})").appendln()
                 }
 
         return FunSpec.builder(CHECK_REQUIRED_FIELDS_FUNCTION_NAME)
@@ -185,7 +185,8 @@ class BuilderProcessor : AbstractProcessor() {
 
     /** Creates a property for the field identified by this element. */
     private fun Element.asProperty(): PropertySpec =
-            PropertySpec.varBuilder(simpleName.toString(), asKotlinTypeName().asNullable(), KModifier.PRIVATE)
+            PropertySpec.builder(simpleName.toString(), asKotlinTypeName().copy(nullable = true), KModifier.PRIVATE)
+                    .mutable()
                     .initializer(defaultValue())
                     .build()
 
@@ -208,14 +209,14 @@ class BuilderProcessor : AbstractProcessor() {
     private fun Element.asSetterFunctionReturning(builder: ClassName): FunSpec {
         val fieldType = asKotlinTypeName()
         val parameterClass = if (isNullable()) {
-            fieldType.asNullable()
+            fieldType.copy(nullable = true)
         } else {
             fieldType
         }
         return FunSpec.builder(simpleName.toString())
                 .addParameter(ParameterSpec.builder("value", parameterClass).build())
                 .returns(builder)
-                .addCode("return apply { $simpleName = value }\n")
+                .addCode("return apply·{ $simpleName·=·value }\n")
                 .build()
     }
 
@@ -245,7 +246,7 @@ class BuilderProcessor : AbstractProcessor() {
      * @throws NoSuchElementException if [this.typeArguments] is empty.
      */
     private fun ParameterizedTypeName.withNullableType(): ParameterizedTypeName {
-        val lastType = this.typeArguments.last().asNullable()
+        val lastType = this.typeArguments.last().copy(nullable = true)
         val typeArguments = ArrayList<TypeName>()
         typeArguments.addAll(this.typeArguments.dropLast(1))
         typeArguments.add(lastType)
@@ -261,9 +262,9 @@ class BuilderProcessor : AbstractProcessor() {
     private fun ParameterizedTypeName.asMutableCollection(): ParameterizedTypeName {
         val mutable = MUTABLE_COLLECTIONS[rawType]!!
                 .parameterizedBy(*this.typeArguments.toTypedArray())
-                .annotated(this.annotations)
-        return if (nullable) {
-            mutable.asNullable()
+                .copy(annotations = this.annotations)
+        return if (isNullable) {
+            mutable.copy(nullable = true)
         } else {
             mutable
         }