Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync main branch with Apache main branch (OSL 1.35 cut-off) #44

Merged
merged 9 commits into from
Nov 7, 2024
Merged

Sync main branch with Apache main branch (OSL 1.35 cut-off) #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b28b8c7
[incubator-kie-issues#1572] Fix CVE-2024-40094 (#2127)
gitgabrio Oct 25, 2024
079ebe4
NO_ISSUE: upgrading sql versions for `persistence-commons-postgresql`…
pefernan Oct 25, 2024
7ea7fa4
[Fix #3721] Reducing group event size (#2122)
fjtirado Oct 25, 2024
543d0db
[Fixes_2129] Microprofile config in data-index-common sets the log le…
gmunozfe Oct 25, 2024
1e9edd2
[incubator-kie-issues#1570] Fix CVE-2022-45688 CVE-2023-5072 (#2133)
gitgabrio Oct 29, 2024
262af48
[incubator-kie-issues#1591] Aggregate evaluationHitIds to Map<String,…
gitgabrio Oct 30, 2024
2ee31a0
[incubator-kie-issues#1578] Enhance JobSchedulerManager to handle ove…
martinweiler Nov 1, 2024
0ef7b40
[incubator-kie-issues#1534] Remove mvn wrapper (#2115)
mcruzdev Nov 1, 2024
ebb5fcc
[incubator-kie-issues#1607] Fix JPA mappings for PostgresQL jsonb col…
pefernan Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed .mvn/wrapper/maven-wrapper.jar
View file
Open in desktop
Binary file not shown.
79 changes: 0 additions & 79 deletions ...src/main/java/org/kie/kogito/app/audit/json/JsonProcessInstanceDataEventDeserializer.java
View file
Open in desktop

This file was deleted.

82 changes: 0 additions & 82 deletions ...rc/main/java/org/kie/kogito/app/audit/json/JsonUserTaskInstanceDataEventDeserializer.java
View file
Open in desktop

This file was deleted.

15 changes: 2 additions & 13 deletions ...udit/data-audit-common-service/src/main/java/org/kie/kogito/app/audit/json/JsonUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,10 @@
package org.kie.kogito.app.audit.json;

import org.kie.kogito.event.job.JobInstanceDataEvent;
import org.kie.kogito.event.process.ProcessInstanceDataEvent;
import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;

import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;

import io.cloudevents.jackson.JsonFormat;

Expand All @@ -41,15 +38,7 @@ public static ObjectMapper getObjectMapper() {
}

public static ObjectMapper configure(ObjectMapper objectMapper) {
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
objectMapper.registerModule(JsonFormat.getCloudEventJacksonModule());
objectMapper.registerModule(new JavaTimeModule());

SimpleModule module = new SimpleModule("Kogito Cloud Events");
module.addDeserializer(ProcessInstanceDataEvent.class, new JsonProcessInstanceDataEventDeserializer());
module.addDeserializer(UserTaskInstanceDataEvent.class, new JsonUserTaskInstanceDataEventDeserializer());
module.addDeserializer(JobInstanceDataEvent.class, new JsonJobDataEventDeserializer());
objectMapper.registerModule(module);
return objectMapper;
return objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).registerModule(JsonFormat.getCloudEventJacksonModule())
.registerModule(new SimpleModule("Data Audit").addDeserializer(JobInstanceDataEvent.class, new JsonJobDataEventDeserializer())).findAndRegisterModules();
}
}
79 changes: 0 additions & 79 deletions ...mon/src/main/java/org/kie/kogito/index/json/JsonProcessInstanceDataEventDeserializer.java
View file
Open in desktop

This file was deleted.

82 changes: 0 additions & 82 deletions ...on/src/main/java/org/kie/kogito/index/json/JsonUserTaskInstanceDataEventDeserializer.java
View file
Open in desktop

This file was deleted.

14 changes: 1 addition & 13 deletions data-index/data-index-common/src/main/java/org/kie/kogito/index/json/JsonUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,13 @@
*/
package org.kie.kogito.index.json;

import org.kie.kogito.event.process.ProcessInstanceDataEvent;
import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
import org.kie.kogito.jackson.utils.JsonObjectUtils;
import org.kie.kogito.jackson.utils.MergeUtils;
import org.kie.kogito.jackson.utils.ObjectMapperFactory;

import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;

import io.cloudevents.jackson.JsonFormat;

Expand All @@ -44,15 +40,7 @@ public static ObjectMapper getObjectMapper() {
}

public static ObjectMapper configure(ObjectMapper objectMapper) {
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
objectMapper.registerModule(JsonFormat.getCloudEventJacksonModule());
objectMapper.registerModule(new JavaTimeModule());

SimpleModule module = new SimpleModule("Kogito Cloud Events");
module.addDeserializer(ProcessInstanceDataEvent.class, new JsonProcessInstanceDataEventDeserializer());
module.addDeserializer(UserTaskInstanceDataEvent.class, new JsonUserTaskInstanceDataEventDeserializer());
objectMapper.registerModule(module);
return objectMapper;
return objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).registerModule(JsonFormat.getCloudEventJacksonModule()).findAndRegisterModules();
}

public static ObjectNode mergeVariable(String variableName, Object variableValue, ObjectNode variables) {
Expand Down
Loading
Loading