From 751e8219e992a9aecd286aac830fef81da790baa Mon Sep 17 00:00:00 2001
From: Zac Sweers <zac.sweers@gmail.com>
Date: Tue, 30 Nov 2021 21:56:00 -0500
Subject: [PATCH] Fix code cleanups (#1441)

* Fix immutable properties

It was intentionally designed the previous way

* Restore limit in for loop

* Another ImmutableProperties
---
 .../squareup/moshi/kotlin/codegen/GeneratedAdaptersTest.kt   | 5 ++++-
 .../squareup/moshi/kotlin/reflect/KotlinJsonAdapterTest.kt   | 5 ++++-
 moshi/src/main/java/com/squareup/moshi/Moshi.java            | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/kotlin/tests/codegen-only/src/test/kotlin/com/squareup/moshi/kotlin/codegen/GeneratedAdaptersTest.kt b/kotlin/tests/codegen-only/src/test/kotlin/com/squareup/moshi/kotlin/codegen/GeneratedAdaptersTest.kt
index 86a4bb2..e447b2b 100644
--- a/kotlin/tests/codegen-only/src/test/kotlin/com/squareup/moshi/kotlin/codegen/GeneratedAdaptersTest.kt
+++ b/kotlin/tests/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
index bb6bf4e..295a61c 100644
--- 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
index 51a82a6..312e520 100644
--- 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 final class Moshi {
   @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++) {