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 101eb03ad2 [incubator-kie-issues#2161] Dump referred json for decision
engine in refs subfolder (#4114)
101eb03ad2 is described below
commit 101eb03ad2acb9161bc4e02919ea98c235342af7
Author: Gabriele Cardosi <[email protected]>
AuthorDate: Sat Nov 1 08:58:53 2025 +0100
[incubator-kie-issues#2161] Dump referred json for decision engine in refs
subfolder (#4114)
* [incubator-kie-issues#2161] Dump referred json for decision engine in
refs subfolder
* [incubator-kie-issues#2161] Fix tests
* [incubator-kie-issues#2161] Fix tests
---------
Co-authored-by: Gabriele-Cardosi <[email protected]>
---
.../java/org/kie/kogito/codegen/decision/DecisionCodegenUtils.java | 3 ++-
.../kie/kogito/codegen/decision/DecisionRestResourceGenerator.java | 4 +++-
.../src/test/java/org/kie/kogito/quarkus/dmn/DMNIT.java | 4 ++--
.../test/java/org/kie/kogito/integrationtests/quarkus/OASIT.java | 6 +++---
.../src/test/java/org/kie/kogito/quarkus/EndpointsIT.java | 2 +-
.../src/test/java/org/kie/kogito/quarkus/EndpointsIT.java | 2 +-
.../java/org/kie/kogito/integrationtests/springboot/OASTest.java | 6 +++---
7 files changed, 15 insertions(+), 12 deletions(-)
diff --git
a/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionCodegenUtils.java
b/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionCodegenUtils.java
index 8429c06be8..c21375c02a 100644
---
a/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionCodegenUtils.java
+++
b/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionCodegenUtils.java
@@ -76,6 +76,7 @@ import static
org.kie.efesto.common.core.utils.JSONUtils.getGeneratedResourcesOb
import static
org.kie.efesto.common.core.utils.JSONUtils.getGeneratedResourcesString;
import static
org.kie.kogito.codegen.decision.CodegenUtils.getDefinitionsFileFromModel;
import static
org.kie.kogito.codegen.decision.DecisionCodegen.STRONGLY_TYPED_CONFIGURATION_KEY;
+import static
org.kie.kogito.codegen.decision.DecisionRestResourceGenerator.DMN_DEFINITIONS_JSON_REFS;
@SuppressWarnings({ "unchecked", "rawtypes" })
public class DecisionCodegenUtils {
@@ -235,7 +236,7 @@ public class DecisionCodegenUtils {
}
try {
String jsonContent = new
ObjectMapper().writeValueAsString(oasResult.getJsonSchemaNode());
- final String DMN_DEFINITIONS_JSON =
getDefinitionsFileFromModel(dmnModel);
+ final String DMN_DEFINITIONS_JSON = DMN_DEFINITIONS_JSON_REFS +
getDefinitionsFileFromModel(dmnModel);
storeFile(generatedFiles, GeneratedFileType.STATIC_HTTP_RESOURCE,
DMN_DEFINITIONS_JSON, jsonContent);
} catch (Exception e) {
LOGGER.warn("Failed to write OAS schema");
diff --git
a/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionRestResourceGenerator.java
b/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionRestResourceGenerator.java
index 54f55ef2cb..40b8c3c184 100644
---
a/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionRestResourceGenerator.java
+++
b/kogito-codegen-modules/kogito-codegen-decisions/src/main/java/org/kie/kogito/codegen/decision/DecisionRestResourceGenerator.java
@@ -88,6 +88,8 @@ public class DecisionRestResourceGenerator {
private static final String DMN_RESULT_ENDPOINT_OPERATION_ID =
"evaluateDmnFullResults_";
private static final String DECISION_SERVICE_ENDPOINT_OPERATION_ID =
"evaluateDmnService_";
private static final String DECISION_SERVICE_RESULT_ENDPOINT_OPERATION_ID
= "evaluateDmnServiceFullResults_";
+ public static final String DMN_DEFINITIONS_JSON_REFS = "refs/";
+ private static final String DMN_DEFINITIONS_JSON_ROOT = "/" +
DMN_DEFINITIONS_JSON_REFS;
public DecisionRestResourceGenerator(KogitoBuildContext context, DMNModel
model, String appCanonicalName) {
this.context = context;
@@ -221,7 +223,7 @@ public class DecisionRestResourceGenerator {
inputRef =
withOASResult.getNamingPolicy().getRef(identifyInputSet);
outputRef =
withOASResult.getNamingPolicy().getRef(identifyOutputSet);
}
- final String DMN_DEFINITIONS_JSON = "/" +
getDefinitionsFileFromModel(dmnModel);
+ final String DMN_DEFINITIONS_JSON = DMN_DEFINITIONS_JSON_ROOT +
getDefinitionsFileFromModel(dmnModel);
// MP / Quarkus
final String Q_CTX_PATH =
context.getApplicationProperty("quarkus.http.root-path").filter(not("/"::equals)).orElse("");
processAnnForRef(dmnMethod,
diff --git
a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/test/java/org/kie/kogito/quarkus/dmn/DMNIT.java
b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/test/java/org/kie/kogito/quarkus/dmn/DMNIT.java
index a931ee0397..1211f41e3c 100644
---
a/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/test/java/org/kie/kogito/quarkus/dmn/DMNIT.java
+++
b/quarkus/extensions/kogito-quarkus-decisions-extension/kogito-quarkus-decisions-integration-test/src/test/java/org/kie/kogito/quarkus/dmn/DMNIT.java
@@ -38,12 +38,12 @@ public class DMNIT {
@Test
public void testOASdmnDefinitions() {
RestAssured.given()
- .get("/OneOfEachType.json")
+ .get("/refs/OneOfEachType.json")
.then()
.statusCode(200)
.body("definitions", aMapWithSize(greaterThan(0)));
RestAssured.given()
- .get("/a.json")
+ .get("/refs/a.json")
.then()
.statusCode(200)
.body("definitions", aMapWithSize(greaterThan(0)));
diff --git
a/quarkus/integration-tests/integration-tests-quarkus-decisions/src/test/java/org/kie/kogito/integrationtests/quarkus/OASIT.java
b/quarkus/integration-tests/integration-tests-quarkus-decisions/src/test/java/org/kie/kogito/integrationtests/quarkus/OASIT.java
index c2ac17f5e2..6bd1a17eb2 100644
---
a/quarkus/integration-tests/integration-tests-quarkus-decisions/src/test/java/org/kie/kogito/integrationtests/quarkus/OASIT.java
+++
b/quarkus/integration-tests/integration-tests-quarkus-decisions/src/test/java/org/kie/kogito/integrationtests/quarkus/OASIT.java
@@ -79,8 +79,8 @@ class OASIT {
OpenAPI openAPI = result.getOpenAPI();
PathItem p1 = openAPI.getPaths().get("/" + DMN_MODEL_NAME);
assertThat(p1).isNotNull();
-
assertThat(p1.getPost().getRequestBody().getContent().get("application/json").getSchema().get$ref()).startsWith("/basicAdd.json#");
-
assertThat(p1.getPost().getResponses().getDefault().getContent().get("application/json").getSchema().get$ref()).startsWith("/basicAdd.json#");
+
assertThat(p1.getPost().getRequestBody().getContent().get("application/json").getSchema().get$ref()).startsWith("/refs/basicAdd.json#");
+
assertThat(p1.getPost().getResponses().getDefault().getContent().get("application/json").getSchema().get$ref()).startsWith("/refs/basicAdd.json#");
}
@ParameterizedTest
@@ -95,7 +95,7 @@ class OASIT {
"StatusService" })
public void testOASdmnDefinitions(String name) {
RestAssured.given()
- .get("/" + name + ".json")
+ .get("/refs/" + name + ".json")
.then()
.statusCode(200)
.body("definitions", aMapWithSize(greaterThan(0)));
diff --git
a/quarkus/integration-tests/integration-tests-quarkus-resteasy-classic/src/test/java/org/kie/kogito/quarkus/EndpointsIT.java
b/quarkus/integration-tests/integration-tests-quarkus-resteasy-classic/src/test/java/org/kie/kogito/quarkus/EndpointsIT.java
index 97b0691952..473c3fbff6 100644
---
a/quarkus/integration-tests/integration-tests-quarkus-resteasy-classic/src/test/java/org/kie/kogito/quarkus/EndpointsIT.java
+++
b/quarkus/integration-tests/integration-tests-quarkus-resteasy-classic/src/test/java/org/kie/kogito/quarkus/EndpointsIT.java
@@ -70,7 +70,7 @@ public class EndpointsIT {
given()
.contentType(ContentType.JSON)
.when()
- .get("/a.json")
+ .get("/refs/a.json")
.then()
.statusCode(200)
.body("definitions.tAddress.type", is("object"));
diff --git
a/quarkus/integration-tests/integration-tests-quarkus-resteasy-reactive/src/test/java/org/kie/kogito/quarkus/EndpointsIT.java
b/quarkus/integration-tests/integration-tests-quarkus-resteasy-reactive/src/test/java/org/kie/kogito/quarkus/EndpointsIT.java
index 97b0691952..473c3fbff6 100644
---
a/quarkus/integration-tests/integration-tests-quarkus-resteasy-reactive/src/test/java/org/kie/kogito/quarkus/EndpointsIT.java
+++
b/quarkus/integration-tests/integration-tests-quarkus-resteasy-reactive/src/test/java/org/kie/kogito/quarkus/EndpointsIT.java
@@ -70,7 +70,7 @@ public class EndpointsIT {
given()
.contentType(ContentType.JSON)
.when()
- .get("/a.json")
+ .get("/refs/a.json")
.then()
.statusCode(200)
.body("definitions.tAddress.type", is("object"));
diff --git
a/springboot/integration-tests/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/OASTest.java
b/springboot/integration-tests/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/OASTest.java
index 0c93b5ac5a..58dc660bf2 100644
---
a/springboot/integration-tests/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/OASTest.java
+++
b/springboot/integration-tests/integration-tests-springboot-decisions-it/src/test/java/org/kie/kogito/integrationtests/springboot/OASTest.java
@@ -81,8 +81,8 @@ class OASTest extends BaseRestTest {
OpenAPI openAPI = result.getOpenAPI();
PathItem p1 = openAPI.getPaths().get("/" + DMN_MODEL_NAME);
assertThat(p1).isNotNull();
-
assertThat(p1.getPost().getRequestBody().getContent().get("application/json").getSchema().get$ref()).startsWith("/basicAdd.json#");
-
assertThat(p1.getPost().getResponses().getDefault().getContent().get("application/json").getSchema().get$ref()).startsWith("/basicAdd.json#");
+
assertThat(p1.getPost().getRequestBody().getContent().get("application/json").getSchema().get$ref()).startsWith("/refs/basicAdd.json#");
+
assertThat(p1.getPost().getResponses().getDefault().getContent().get("application/json").getSchema().get$ref()).startsWith("/refs/basicAdd.json#");
}
@ParameterizedTest
@@ -97,7 +97,7 @@ class OASTest extends BaseRestTest {
"StatusService" })
public void testOASdmnDefinitions(String name) {
RestAssured.given()
- .get("/" + name + ".json")
+ .get("/refs/" + name + ".json")
.then()
.statusCode(200)
.body("definitions", aMapWithSize(greaterThan(0)));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
