This is an automated email from the ASF dual-hosted git repository.
gitgabrio pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git
The following commit(s) were added to refs/heads/main by this push:
new 8460bcac48 [kie-issues#698] Fix SCA quality issue on generated code
(#3287)
8460bcac48 is described below
commit 8460bcac483517944a72292a69a646a8fd872e03
Author: Gabriele Cardosi <[email protected]>
AuthorDate: Thu Nov 23 16:24:11 2023 +0100
[kie-issues#698] Fix SCA quality issue on generated code (#3287)
Co-authored-by: BAMOE CI <[email protected]>
---
.../class-templates/DecisionRestResourceQuarkusTemplate.java | 10 ++++++----
.../class-templates/DecisionRestResourceSpringTemplate.java | 10 ++++++----
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git
a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionRestResourceQuarkusTemplate.java
b/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionRestResourceQuarkusTemplate.java
index 57d3dfcc69..bc71d6ad53 100644
---
a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionRestResourceQuarkusTemplate.java
+++
b/kogito-codegen-modules/kogito-codegen-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.MediaType;
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 class DMNRestResourceTemplate {
@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/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionRestResourceSpringTemplate.java
b/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionRestResourceSpringTemplate.java
index 2bf855cb9c..27bfc5a33a 100644
---
a/kogito-codegen-modules/kogito-codegen-decisions/src/main/resources/class-templates/DecisionRestResourceSpringTemplate.java
+++
b/kogito-codegen-modules/kogito-codegen-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 class DMNRestResourceTemplate {
@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){
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
