Applying rewrite to all modules

core/src/test/java/feign/stream/StreamDecoderTest.java

@@ -57,17 +57,18 @@ class Car {
   }
 
   private String carsJson =
-      "" //
-          + "[\n" //
-          + "  {\n" //
-          + "    \"name\": \"Megane\",\n" //
-          + "    \"manufacturer\": \"Renault\"\n" //
-          + "  },\n" //
-          + "  {\n" //
-          + "    \"name\": \"C4\",\n" //
-          + "    \"manufacturer\": \"Citroën\"\n" //
-          + "  }\n" //
-          + "]\n";
+      """
+      [
+        {
+          "name": "Megane",
+          "manufacturer": "Renault"
+        },
+        {
+          "name": "C4",
+          "manufacturer": "Citroën"
+        }
+      ]
+      """;
 
   @Test
   void simpleStreamTest() {

feign-form-spring/src/test/java/feign/form/feign/spring/Dto.java → form-spring/src/test/java/feign/form/feign/spring/Dto.java

@@ -17,6 +17,7 @@
 
 import static lombok.AccessLevel.PRIVATE;
 
+import java.io.Serial;
 import java.io.Serializable;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -30,7 +31,7 @@
 @FieldDefaults(level = PRIVATE)
 public class Dto implements Serializable {
 
-  private static final long serialVersionUID = -4218390863359894943L;
+  @Serial private static final long serialVersionUID = -4218390863359894943L;
 
   String field1;
 

feign-form/src/test/java/feign/form/BasicClientTest.java → form/src/test/java/feign/form/BasicClientTest.java

@@ -27,7 +27,7 @@
 import feign.jackson.JacksonEncoder;
 import java.io.File;
 import java.nio.file.Files;
-import java.nio.file.Paths;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Map;
 import lombok.val;
@@ -61,7 +61,7 @@ void testFormException() {
   @Test
   void testUpload() throws Exception {
     val path =
-        Paths.get(Thread.currentThread().getContextClassLoader().getResource("file.txt").toURI());
+        Path.of(Thread.currentThread().getContextClassLoader().getResource("file.txt").toURI());
     assertThat(path).exists();
 
     assertThat(API.upload(path.toFile())).asLong().isEqualTo(Files.size(path));
@@ -70,7 +70,7 @@ void testUpload() throws Exception {
   @Test
   void testUploadWithParam() throws Exception {
     val path =
-        Paths.get(Thread.currentThread().getContextClassLoader().getResource("file.txt").toURI());
+        Path.of(Thread.currentThread().getContextClassLoader().getResource("file.txt").toURI());
     assertThat(path).exists();
 
     assertThat(API.upload(10, Boolean.TRUE, path.toFile())).asLong().isEqualTo(Files.size(path));
@@ -94,11 +94,11 @@ void testQueryMap() {
   @Test
   void testMultipleFilesArray() throws Exception {
     val path1 =
-        Paths.get(Thread.currentThread().getContextClassLoader().getResource("file.txt").toURI());
+        Path.of(Thread.currentThread().getContextClassLoader().getResource("file.txt").toURI());
     assertThat(path1).exists();
 
     val path2 =
-        Paths.get(
+        Path.of(
             Thread.currentThread().getContextClassLoader().getResource("another_file.txt").toURI());
     assertThat(path2).exists();
 
@@ -110,11 +110,11 @@ void testMultipleFilesArray() throws Exception {
   @Test
   void testMultipleFilesList() throws Exception {
     val path1 =
-        Paths.get(Thread.currentThread().getContextClassLoader().getResource("file.txt").toURI());
+        Path.of(Thread.currentThread().getContextClassLoader().getResource("file.txt").toURI());
     assertThat(path1).exists();
 
     val path2 =
-        Paths.get(
+        Path.of(
             Thread.currentThread().getContextClassLoader().getResource("another_file.txt").toURI());
     assertThat(path2).exists();
 
@@ -128,7 +128,7 @@ void testUploadWithDto() throws Exception {
     val dto = new Dto("Artem", 11);
 
     val path =
-        Paths.get(Thread.currentThread().getContextClassLoader().getResource("file.txt").toURI());
+        Path.of(Thread.currentThread().getContextClassLoader().getResource("file.txt").toURI());
     assertThat(path).exists();
 
     assertThat(API.uploadWithDto(dto, path.toFile()))
@@ -140,7 +140,7 @@ void testUploadWithDto() throws Exception {
   @Test
   void testUnknownTypeFile() throws Exception {
     val path =
-        Paths.get(Thread.currentThread().getContextClassLoader().getResource("file.abc").toURI());
+        Path.of(Thread.currentThread().getContextClassLoader().getResource("file.abc").toURI());
     assertThat(path).exists();
 
     assertThat(API.uploadUnknownType(path.toFile())).isEqualTo("application/octet-stream");

feign-form/src/test/java/feign/form/Dto.java → form/src/test/java/feign/form/Dto.java

@@ -17,6 +17,7 @@
 
 import static lombok.AccessLevel.PRIVATE;
 
+import java.io.Serial;
 import java.io.Serializable;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -29,7 +30,7 @@
 @FieldDefaults(level = PRIVATE)
 class Dto implements Serializable {
 
-  private static final long serialVersionUID = 4743133513526293872L;
+  @Serial private static final long serialVersionUID = 4743133513526293872L;
 
   String name;
 

gson/src/test/java/feign/gson/GsonCodecTest.java

@@ -49,11 +49,11 @@ void encodesMapObjectNumericalValuesAsInteger() {
     new GsonEncoder().encode(map, map.getClass(), template);
 
     assertThat(template)
-        .hasBody(
-            "" //
-                + "{\n" //
-                + "  \"foo\": 1\n" //
-                + "}");
+        .hasBody("""
+            {
+              "foo": 1
+            }\
+            """);
   }
 
   @Test
@@ -87,14 +87,15 @@ void encodesFormParams() {
 
     assertThat(template)
         .hasBody(
-            "" //
-                + "{\n" //
-                + "  \"foo\": 1,\n" //
-                + "  \"bar\": [\n" //
-                + "    2,\n" //
-                + "    3\n" //
-                + "  ]\n" //
-                + "}");
+            """
+            {
+              "foo": 1,
+              "bar": [
+                2,
+                3
+              ]
+            }\
+            """);
   }
 
   static class Zone extends LinkedHashMap<String, Object> {
@@ -165,16 +166,17 @@ void emptyBodyDecodesToNull() throws Exception {
   }
 
   private String zonesJson =
-      "" //
-          + "[\n" //
-          + "  {\n" //
-          + "    \"name\": \"denominator.io.\"\n" //
-          + "  },\n" //
-          + "  {\n" //
-          + "    \"name\": \"denominator.io.\",\n" //
-          + "    \"id\": \"ABCD\"\n" //
-          + "  }\n" //
-          + "]\n";
+      """
+      [
+        {
+          "name": "denominator.io."
+        },
+        {
+          "name": "denominator.io.",
+          "id": "ABCD"
+        }
+      ]
+      """;
 
   final TypeAdapter upperZone =
       new TypeAdapter<Zone>() {
@@ -233,16 +235,16 @@ void customEncoder() {
 
     assertThat(template)
         .hasBody(
-            "" //
-                + "[\n" //
-                + "  {\n" //
-                + "    \"name\": \"DENOMINATOR.IO.\"\n" //
-                + "  },\n" //
-                + "  {\n" //
-                + "    \"name\": \"DENOMINATOR.IO.\",\n" //
-                + "    \"id\": \"ABCD\"\n" //
-                + "  }\n" //
-                + "]");
+            """
+            [
+              {
+                "name": "DENOMINATOR.IO."
+              },
+              {
+                "name": "DENOMINATOR.IO.",
+                "id": "ABCD"
+              }
+            ]""");
   }
 
   /** Enabled via {@link feign.Feign.Builder#dismiss404()} */

moshi/src/test/java/feign/moshi/MoshiDecoderTest.java

@@ -69,16 +69,17 @@ class Zone extends LinkedHashMap<String, Object> {
   }
 
   private String zonesJson =
-      "" //
-          + "[\n" //
-          + "  {\n" //
-          + "    \"name\": \"denominator.io.\"\n" //
-          + "  },\n" //
-          + "  {\n" //
-          + "    \"name\": \"denominator.io.\",\n" //
-          + "    \"id\": \"ABCD\"\n" //
-          + "  }\n" //
-          + "]\n";
+      """
+      [
+        {
+          "name": "denominator.io."
+        },
+        {
+          "name": "denominator.io.",
+          "id": "ABCD"
+        }
+      ]
+      """;
 
   private final String videoGamesJson =
       """

moshi/src/test/java/feign/moshi/MoshiEncoderTest.java

@@ -39,10 +39,11 @@ void encodesMapObjectNumericalValuesAsInteger() {
     new MoshiEncoder().encode(map, Map.class, template);
 
     assertThat(template)
-        .hasBody(
-            "{\n" //
-                + "  \"foo\": 1\n" //
-                + "}");
+        .hasBody("""
+            {
+              "foo": 1
+            }\
+            """);
   }
 
   @Test
@@ -58,13 +59,15 @@ void encodesFormParams() {
 
     assertThat(template)
         .hasBody(
-            "{\n" //
-                + "  \"foo\": 1,\n" //
-                + "  \"bar\": [\n" //
-                + "    2,\n" //
-                + "    3\n" //
-                + "  ]\n" //
-                + "}");
+            """
+            {
+              "foo": 1,
+              "bar": [
+                2,
+                3
+              ]
+            }\
+            """);
   }
 
   @Test
@@ -82,16 +85,16 @@ void customEncoder() {
 
     assertThat(template)
         .hasBody(
-            "" //
-                + "[\n" //
-                + "  {\n" //
-                + "    \"name\": \"DENOMINATOR.IO.\"\n" //
-                + "  },\n" //
-                + "  {\n" //
-                + "    \"name\": \"DENOMINATOR.IO.\",\n" //
-                + "    \"id\": \"ABCD\"\n" //
-                + "  }\n" //
-                + "]");
+            """
+            [
+              {
+                "name": "DENOMINATOR.IO."
+              },
+              {
+                "name": "DENOMINATOR.IO.",
+                "id": "ABCD"
+              }
+            ]""");
   }
 
   @Test

moshi/src/test/java/feign/moshi/Zone.java

@@ -15,6 +15,7 @@
  */
 package feign.moshi;
 
+import java.io.Serial;
 import java.util.LinkedHashMap;
 
 public class Zone extends LinkedHashMap<String, Object> {
@@ -34,5 +35,5 @@ public class Zone extends LinkedHashMap<String, Object> {
     }
   }
 
-  private static final long serialVersionUID = 1L;
+  @Serial private static final long serialVersionUID = 1L;
 }

pom.xml

@@ -124,8 +124,8 @@
     <module>benchmark</module>
     <module>moshi</module>
     <module>fastjson2</module>
-    <module>feign-form</module>
-    <module>feign-form-spring</module>
+    <module>form</module>
+    <module>form-spring</module>
     <module>vertx</module>
   </modules>
 

vertx/src/test/java/feign/vertx/AbstractClientReconnectTest.java

@@ -50,7 +50,7 @@ static void setupMockServer() {
 
   @Test
   @DisplayName("All requests should be answered")
-  void testAllRequestsShouldBeAnswered(VertxTestContext testContext) {
+  void allRequestsShouldBeAnswered(VertxTestContext testContext) {
     sendRequests(10).compose(responses -> assertAllRequestsAnswered(responses, testContext));
   }
 
@@ -65,7 +65,7 @@ void shutDownServer() {
 
     @Test
     @DisplayName("All requests should fail")
-    void testAllRequestsShouldFail(VertxTestContext testContext) {
+    void allRequestsShouldFail(VertxTestContext testContext) {
       sendRequests(10)
           .onComplete(
               responses ->
@@ -104,7 +104,7 @@ void shutDownServer() {
 
       @Test
       @DisplayName("All requests should be answered")
-      void testAllRequestsShouldBeAnswered(VertxTestContext testContext) {
+      void allRequestsShouldBeAnswered(VertxTestContext testContext) {
         sendRequests(10).compose(responses -> assertAllRequestsAnswered(responses, testContext));
       }
     }