From 82987854df6b21d34864c4f8f09132554a3aa39f Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Mon, 20 Dec 2021 16:46:39 -0500 Subject: [PATCH] Remove redundant static modifiers on records They are implicit --- .../squareup/moshi/records/RecordsTest.java | 18 +++++++++--------- .../com/squareup/moshi/RecordJsonAdapter.java | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/moshi/records-tests/src/test/java/com/squareup/moshi/records/RecordsTest.java b/moshi/records-tests/src/test/java/com/squareup/moshi/records/RecordsTest.java index 5c814ac..00f613f 100644 --- a/moshi/records-tests/src/test/java/com/squareup/moshi/records/RecordsTest.java +++ b/moshi/records-tests/src/test/java/com/squareup/moshi/records/RecordsTest.java @@ -76,7 +76,7 @@ public final class RecordsTest { assertThat(deserialized).isEqualTo(instance); } - public static record SmokeTestType( + public record SmokeTestType( @Json(name = "first_name") String firstName, @Json(name = "last_name") String lastName, int age, @@ -150,7 +150,7 @@ public final class RecordsTest { assertThat(adapter.fromJson("{\"value\":\"Okay!\"}")).isEqualTo(new GenericRecord<>("Okay!")); } - public static record GenericRecord(T value) {} + public record GenericRecord(T value) {} @Test public void genericBoundedRecord() throws IOException { @@ -172,9 +172,9 @@ public final class RecordsTest { assertThat(jsonAdapter.fromJson(json)).isEqualTo(value); } - public static record IndirectGenerics(T single, List list, Map map) {} + public record IndirectGenerics(T single, List list, Map map) {} - public static record HasIndirectGenerics(IndirectGenerics value) {} + public record HasIndirectGenerics(IndirectGenerics value) {} @Test public void qualifiedValues() throws IOException { @@ -183,7 +183,7 @@ public final class RecordsTest { .isEqualTo(new QualifiedValues(16711680)); } - public static record QualifiedValues(@HexColor int value) {} + public record QualifiedValues(@HexColor int value) {} @Retention(RUNTIME) @JsonQualifier @@ -203,7 +203,7 @@ public final class RecordsTest { } } - public static record GenericBoundedRecord(T value) {} + public record GenericBoundedRecord(T value) {} @Test public void jsonName() throws IOException { @@ -211,7 +211,7 @@ public final class RecordsTest { assertThat(adapter.fromJson("{\"actualValue\":3}")).isEqualTo(new JsonName(3)); } - public static record JsonName(@Json(name = "actualValue") int value) {} + public record JsonName(@Json(name = "actualValue") int value) {} /** * We had a bug where we were incorrectly wrapping exceptions thrown when delegating to the @@ -248,7 +248,7 @@ public final class RecordsTest { } } - public static record BooleanRecord(boolean value) {} + public record BooleanRecord(boolean value) {} @Test public void absentPrimitiveFails() throws IOException { @@ -290,5 +290,5 @@ public final class RecordsTest { assertThat(adapter.toJson(value)).isEqualTo("{\"i\":5}"); } - public static record AbsentValues(String s, int i) {} + public record AbsentValues(String s, int i) {} } diff --git a/moshi/src/main/java16/com/squareup/moshi/RecordJsonAdapter.java b/moshi/src/main/java16/com/squareup/moshi/RecordJsonAdapter.java index cc69e40..973ad81 100644 --- a/moshi/src/main/java16/com/squareup/moshi/RecordJsonAdapter.java +++ b/moshi/src/main/java16/com/squareup/moshi/RecordJsonAdapter.java @@ -112,7 +112,7 @@ final class RecordJsonAdapter extends JsonAdapter { } }; - private static record ComponentBinding( + private record ComponentBinding( String componentName, String jsonName, JsonAdapter adapter, MethodHandle accessor) {} private final String targetClass;