[kie-issues#698] Fix SCA quality issue on generated code (apache#3287)

Co-authored-by: BAMOE CI <bamoe.ci@ibm.com>
kiegroup · Dec 13, 2023 · f1bf4a8 · f1bf4a8
1 parent 3b80d86
commit f1bf4a8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/...gen-decisions/src/main/resources/class-templates/DecisionRestResourceQuarkusTemplate.java b/...gen-decisions/src/main/resources/class-templates/DecisionRestResourceQuarkusTemplate.java
@@ -18,6 +18,8 @@
  */
 package org.kie.dmn.kogito.quarkus.example;
 
+import java.io.InputStream;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import javax.ws.rs.Consumes;
@@ -29,6 +31,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.ResponseBuilder;
 
+import org.kie.dmn.feel.codegen.feel11.CodegenStringUtil;
 import org.kie.kogito.Application;
 import org.kie.kogito.dmn.rest.DMNEvaluationErrorException;
 import org.kie.kogito.dmn.rest.DMNJSONUtils;
@@ -70,10 +73,9 @@ public Response dmn($inputType$ variables) {
     @GET
     @Produces(MediaType.APPLICATION_XML)
     public String dmn() throws java.io.IOException {
-        return new String(org.drools.util.IoUtils.
-                          readBytesFromInputStream(this.getClass()
-                                                   .getResourceAsStream(org.kie.dmn.feel.codegen.feel11.CodegenStringUtil.escapeIdentifier("$modelName$") + 
-                                                                        ".dmn_nologic")));
+        try (InputStream is = this.getClass().getResourceAsStream(CodegenStringUtil.escapeIdentifier("$modelName$") + ".dmn_nologic")) {
+            return new String(org.drools.util.IoUtils.readBytesFromInputStream(Objects.requireNonNull(is)));
+        }
     }
 
     private ResponseBuilder extractContextIfSucceded(KogitoDMNResult result){

diff --git a/...egen-decisions/src/main/resources/class-templates/DecisionRestResourceSpringTemplate.java b/...egen-decisions/src/main/resources/class-templates/DecisionRestResourceSpringTemplate.java
@@ -18,10 +18,13 @@
  */
 package org.kie.dmn.kogito.quarkus.example;
 
+import java.io.InputStream;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
+import org.kie.dmn.feel.codegen.feel11.CodegenStringUtil;
 import org.kie.kogito.Application;
 import org.kie.kogito.dmn.rest.DMNEvaluationErrorException;
 import org.kie.kogito.dmn.rest.DMNJSONUtils;
@@ -73,10 +76,9 @@ public ResponseEntity<?> dmn(@RequestBody(required = false) $inputType$ variable
 
     @GetMapping(produces = MediaType.APPLICATION_XML_VALUE)
     public String dmn() throws java.io.IOException {
-        return new String(org.drools.util.IoUtils.
-                          readBytesFromInputStream(this.getClass()
-                                                   .getResourceAsStream(org.kie.dmn.feel.codegen.feel11.CodegenStringUtil.escapeIdentifier("$modelName$") + 
-                                                                        ".dmn_nologic")));
+        try (InputStream is = this.getClass().getResourceAsStream(CodegenStringUtil.escapeIdentifier("$modelName$") + ".dmn_nologic")) {
+            return new String(org.drools.util.IoUtils.readBytesFromInputStream(Objects.requireNonNull(is)));
+        }
     }
 
     private Entry<HttpStatus, ?> buildFailedEvaluationResponse(KogitoDMNResult result){