add try-with-resources around json parsing in controllers (#19)

Author: countableSet

build.gradle

@@ -1,12 +1,13 @@
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id 'dev.poolside.gradle.semantic-version' version '0.1.5'
+    id 'dev.poolside.gradle.semantic-version' version '1.0.0'
 }
 
 allprojects {
     apply plugin: 'java-library'
     apply plugin: 'maven-publish'
+    apply plugin: 'dev.poolside.gradle.semantic-version'
 
     repositories {
         mavenCentral()

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

plugin/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "8.1.1"
+    id 'com.gradleup.shadow' version '8.3.8'
 }
 
 dependencies {

plugin/src/main/java/com/flit/protoc/gen/server/jakarta/RpcGenerator.java

@@ -78,10 +78,14 @@ private void addHandleMethod(MethodDescriptorProto mdp) {
         .nextControlFlow("else if (request.getContentType().startsWith($S))", "application/json")
         .addStatement("json = true")
         .addStatement("$T.Builder builder = $T.newBuilder()", inputType, inputType)
-        .addStatement("$T.parser().merge(new $T(request.getInputStream(), $T.UTF_8), builder)",
-            Types.JsonFormat,
+        // try with resources
+        .beginControlFlow("try ($T reader = new $T(request.getInputStream(), $T.UTF_8))",
+            Types.InputStreamReader,
             Types.InputStreamReader,
             Types.StandardCharsets)
+        .addStatement("$T.parser().merge(reader, builder)",
+            Types.JsonFormat)
+        .endControlFlow()
         .addStatement("data = builder.build()")
         .nextControlFlow("else")
         .addStatement("response.setStatus(415)")

plugin/src/main/java/com/flit/protoc/gen/server/jaxrs/RpcGenerator.java

@@ -78,10 +78,14 @@ private void addHandleMethod(MethodDescriptorProto mdp) {
         .nextControlFlow("else if (request.getContentType().startsWith($S))", "application/json")
         .addStatement("json = true")
         .addStatement("$T.Builder builder = $T.newBuilder()", inputType, inputType)
-        .addStatement("$T.parser().merge(new $T(request.getInputStream(), $T.UTF_8), builder)",
-            Types.JsonFormat,
+        // try with resources
+        .beginControlFlow("try ($T reader = new $T(request.getInputStream(), $T.UTF_8))",
+            Types.InputStreamReader,
             Types.InputStreamReader,
             Types.StandardCharsets)
+        .addStatement("$T.parser().merge(reader, builder)",
+            Types.JsonFormat)
+        .endControlFlow()
         .addStatement("data = builder.build()")
         .nextControlFlow("else")
         .addStatement("response.setStatus(415)")

plugin/src/main/java/com/flit/protoc/gen/server/spring/RpcGenerator.java

@@ -61,10 +61,14 @@ private void addHandleMethod(DescriptorProtos.MethodDescriptorProto m) {
       .nextControlFlow("else if (request.getContentType().startsWith($S))", "application/json")
       .addStatement("json = true")
       .addStatement("$T.Builder builder = $T.newBuilder()", inputType, inputType)
-      .addStatement("$T.parser().merge(new $T(request.getInputStream(), $T.UTF_8), builder)",
-        Types.JsonFormat,
+      // try with resources
+      .beginControlFlow("try ($T reader = new $T(request.getInputStream(), $T.UTF_8))",
+        Types.InputStreamReader,
         Types.InputStreamReader,
         Types.StandardCharsets)
+      .addStatement("$T.parser().merge(reader, builder)",
+        Types.JsonFormat)
+      .endControlFlow()
       .addStatement("data = builder.build()")
       .nextControlFlow("else")
       .addStatement("response.setStatus(415)")

plugin/src/main/java/com/flit/protoc/gen/server/undertow/RpcGenerator.java

@@ -137,7 +137,14 @@ private void writeHandleMethod(DescriptorProtos.MethodDescriptorProto m) {
       .nextControlFlow("else if (contentType.startsWith($S))", "application/json")
       .addStatement("json = true")
       .addStatement("$T.Builder builder = $T.newBuilder()", inputType, inputType)
-      .addStatement("$T.parser().merge(new $T(exchange.getInputStream(), $T.UTF_8), builder)", JsonFormat, InputStreamReader, StandardCharsets)
+      // try with resources
+      .beginControlFlow("try ($T reader = new $T(exchange.getInputStream(), $T.UTF_8))",
+          InputStreamReader,
+          InputStreamReader,
+          StandardCharsets)
+      .addStatement("$T.parser().merge(reader, builder)",
+          JsonFormat)
+      .endControlFlow()
       .addStatement("data = builder.build()")
       .nextControlFlow("else")
       .addStatement("exchange.setStatusCode(415)")

plugin/src/test/java/com/flit/protoc/gen/server/jakarta/HelloworldGeneratorTest.test_Generate.approved.txt

@@ -37,7 +37,9 @@ public class RpcHelloWorldResource {
     } else if (request.getContentType().startsWith("application/json")) {
       json = true;
       Helloworld.HelloReq.Builder builder = Helloworld.HelloReq.newBuilder();
-      JsonFormat.parser().merge(new InputStreamReader(request.getInputStream(), StandardCharsets.UTF_8), builder);
+      try (InputStreamReader reader = new InputStreamReader(request.getInputStream(), StandardCharsets.UTF_8)) {
+        JsonFormat.parser().merge(reader, builder);
+      }
       data = builder.build();
     } else {
       response.setStatus(415);
@@ -67,7 +69,9 @@ public class RpcHelloWorldResource {
     } else if (request.getContentType().startsWith("application/json")) {
       json = true;
       Helloworld.HelloReq.Builder builder = Helloworld.HelloReq.newBuilder();
-      JsonFormat.parser().merge(new InputStreamReader(request.getInputStream(), StandardCharsets.UTF_8), builder);
+      try (InputStreamReader reader = new InputStreamReader(request.getInputStream(), StandardCharsets.UTF_8)) {
+        JsonFormat.parser().merge(reader, builder);
+      }
       data = builder.build();
     } else {
       response.setStatus(415);

plugin/src/test/java/com/flit/protoc/gen/server/jakarta/HelloworldGeneratorTest.test_GenerateWithRequest.approved.txt

@@ -39,7 +39,9 @@ public class RpcHelloWorldResource {
     } else if (request.getContentType().startsWith("application/json")) {
       json = true;
       Helloworld.HelloReq.Builder builder = Helloworld.HelloReq.newBuilder();
-      JsonFormat.parser().merge(new InputStreamReader(request.getInputStream(), StandardCharsets.UTF_8), builder);
+      try (InputStreamReader reader = new InputStreamReader(request.getInputStream(), StandardCharsets.UTF_8)) {
+        JsonFormat.parser().merge(reader, builder);
+      }
       data = builder.build();
     } else {
       response.setStatus(415);
@@ -69,7 +71,9 @@ public class RpcHelloWorldResource {
     } else if (request.getContentType().startsWith("application/json")) {
       json = true;
       Helloworld.HelloReq.Builder builder = Helloworld.HelloReq.newBuilder();
-      JsonFormat.parser().merge(new InputStreamReader(request.getInputStream(), StandardCharsets.UTF_8), builder);
+      try (InputStreamReader reader = new InputStreamReader(request.getInputStream(), StandardCharsets.UTF_8)) {
+        JsonFormat.parser().merge(reader, builder);
+      }
       data = builder.build();
     } else {
       response.setStatus(415);

plugin/src/test/java/com/flit/protoc/gen/server/jakarta/StatusGeneratorTest.test_Generate.approved.txt

@@ -35,7 +35,9 @@ public class RpcStatusResource {
     } else if (request.getContentType().startsWith("application/json")) {
       json = true;
       Core.Empty.Builder builder = Core.Empty.newBuilder();
-      JsonFormat.parser().merge(new InputStreamReader(request.getInputStream(), StandardCharsets.UTF_8), builder);
+      try (InputStreamReader reader = new InputStreamReader(request.getInputStream(), StandardCharsets.UTF_8)) {
+        JsonFormat.parser().merge(reader, builder);
+      }
       data = builder.build();
     } else {
       response.setStatus(415);