Fix code cleanups (#1441)

* Fix immutable properties It was intentionally designed the previous way * Restore limit in for loop * Another ImmutableProperties
square · Dec 1, 2021 · 751e821 · 751e821
1 parent 9f81ac8
commit 751e821
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/...s/codegen-only/src/test/kotlin/com/squareup/moshi/kotlin/codegen/GeneratedAdaptersTest.kt b/...s/codegen-only/src/test/kotlin/com/squareup/moshi/kotlin/codegen/GeneratedAdaptersTest.kt
@@ -436,7 +436,10 @@ class GeneratedAdaptersTest {
   }
 
   @JsonClass(generateAdapter = true)
-  class ImmutableProperties(val a: Int, val b: Int)
+  class ImmutableProperties(a: Int, b: Int) {
+    val a = a
+    val b = b
+  }
 
   @Test fun constructorDefaults() {
     val moshi = Moshi.Builder().build()

diff --git a/kotlin/tests/src/test/kotlin/com/squareup/moshi/kotlin/reflect/KotlinJsonAdapterTest.kt b/kotlin/tests/src/test/kotlin/com/squareup/moshi/kotlin/reflect/KotlinJsonAdapterTest.kt
@@ -115,7 +115,10 @@ class KotlinJsonAdapterTest {
     assertThat(decoded.b).isEqualTo(5)
   }
 
-  class ImmutableProperties(val a: Int, val b: Int)
+  class ImmutableProperties(a: Int, b: Int) {
+    val a = a
+    val b = b
+  }
 
   @Test fun constructorDefaults() {
     val moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build()

diff --git a/moshi/src/main/java/com/squareup/moshi/Moshi.java b/moshi/src/main/java/com/squareup/moshi/Moshi.java
@@ -185,7 +185,7 @@ public <T> JsonAdapter<T> nextAdapter(
   @CheckReturnValue
   public Moshi.Builder newBuilder() {
     Builder result = new Builder();
-    for (int i = 0; i < lastOffset; i++) {
+    for (int i = 0, limit = lastOffset; i < limit; i++) {
       result.add(factories.get(i));
     }
     for (int i = lastOffset, limit = factories.size() - BUILT_IN_FACTORIES.size(); i < limit; i++) {