Merge pull request #9 from ThinkingLogic/develop

Develop

Author: YetAnotherMatt

README.md

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

build.gradle

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

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

@@ -11,6 +11,7 @@ data class SimpleDataClass(
         val notNullLong: Long,
         val nullableLong: Long?,
         val date: LocalDate,
+        val value: String,
         @DefaultValue("withDefaultValue") val stringWithDefault: String = "withDefaultValue",
         @DefaultValue("LocalDate.MIN") val defaultDate: LocalDate = LocalDate.MIN
 ) {

kotlin-builder-example-usage/src/test/java/com/thinkinglogic/example/SimpleDataClassJavaTest.java

@@ -32,6 +32,7 @@ void toBuilderShouldReturnInitialisedBuilder() {
                 .notNullString("Foo")
                 .nullableString("Bar")
                 .notNullLong(123L)
+                .value("valueProperty")
                 .build();
 
         // when

kotlin-builder-example-usage/src/test/kotlin/com/thinkinglogic/example/SimpleDataClassTest.kt

@@ -19,7 +19,8 @@ internal class SimpleDataClassTest {
                 nullableString = null,
                 notNullLong = 123,
                 nullableLong = 345,
-                date = LocalDate.now()
+                date = LocalDate.now(),
+                value = "valueProperty"
         )
 
         // when
@@ -28,6 +29,7 @@ internal class SimpleDataClassTest {
                 .notNullLong(expected.notNullLong)
                 .nullableLong(expected.nullableLong)
                 .date(expected.date)
+                .value(expected.value)
                 .stringWithDefault(expected.stringWithDefault)
                 .defaultDate(expected.defaultDate)
                 .build()
@@ -44,7 +46,8 @@ internal class SimpleDataClassTest {
                 nullableString = null,
                 notNullLong = 123,
                 nullableLong = 345,
-                date = LocalDate.now()
+                date = LocalDate.now(),
+                value = "valueProperty"
         )
 
         // when
@@ -53,6 +56,7 @@ internal class SimpleDataClassTest {
                 .notNullLong(expected.notNullLong)
                 .nullableLong(expected.nullableLong)
                 .date(expected.date)
+                .value(expected.value)
                 .build()
 
         // then
@@ -67,7 +71,8 @@ internal class SimpleDataClassTest {
                 nullableString = null,
                 notNullLong = 123,
                 nullableLong = 345,
-                date = LocalDate.now()
+                date = LocalDate.now(),
+                value = "valueProperty"
         )
 
         // when
@@ -86,7 +91,8 @@ internal class SimpleDataClassTest {
                 nullableString = null,
                 notNullLong = 123,
                 nullableLong = 345,
-                date = LocalDate.now()
+                date = LocalDate.now(),
+                value = "valueProperty"
         )
         val newStringValue = "New value"
 

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

@@ -216,7 +216,7 @@ class BuilderProcessor : AbstractProcessor() {
         return FunSpec.builder(simpleName.toString())
                 .addParameter(ParameterSpec.builder("value", parameterClass).build())
                 .returns(builder)
-                .addCode("return apply·{ $simpleName·=·value }\n")
+                .addCode("return apply·{ this.$simpleName·=·value }\n")
                 .build()
     }