Skip to content

Commit

Permalink
Merge pull request #2 from pefernan/incubator-kie-issues-576
Browse files Browse the repository at this point in the history 
Quarkus 3 upgrade fixes
  • Loading branch information
@pefernan
pefernan authored Dec 21, 2023
2 parents d6bcde7 + 24335a1 commit 31bb8b9
Show file tree
Hide file tree
Showing 43 changed files with 190 additions and 180 deletions.
2 changes: 1 addition & 1 deletion data-audit/data-audit-common-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>data-audit</artifactId>
<groupId>org.kie.kogito</groupId>
<version>2.0.0-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<artifactId>data-audit-common-service</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion data-audit/data-audit-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.kie.kogito</groupId>
<artifactId>data-audit</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>
<artifactId>data-audit-common</artifactId>
<name>Kogito Apps :: Data Audit :: Common</name>
Expand Down
5 changes: 2 additions & 3 deletions ...data-audit-common/src/main/java/org/kie/kogito/app/audit/graphql/type/JobExecutionTO.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
*/
package org.kie.kogito.app.audit.graphql.type;

import java.math.BigInteger;
import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.util.Date;
Expand Down Expand Up @@ -54,13 +53,13 @@ public JobExecutionTO() {
}

public JobExecutionTO(String jobId, Date expirationtime, Integer priority, String processInstanceId, String nodeInstanceId,
BigInteger repeatInterval, Integer repeatLimit, String scheduledId, Integer retries, String status, Integer executionCounter, Date eventDate) {
Long repeatInterval, Integer repeatLimit, String scheduledId, Integer retries, String status, Integer executionCounter, Date eventDate) {
this.jobId = jobId;
this.expirationTime = OffsetDateTime.ofInstant(expirationtime.toInstant(), ZoneId.of("UTC"));
this.priority = priority;
this.processInstanceId = processInstanceId;
this.nodeInstanceId = nodeInstanceId;
this.repeatInterval = repeatInterval != null ? repeatInterval.longValue() : null;
this.repeatInterval = repeatInterval;
this.repeatLimit = repeatLimit;
this.scheduledId = scheduledId;
this.retries = retries;
Expand Down
2 changes: 1 addition & 1 deletion data-audit/data-audit-quarkus-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>data-audit</artifactId>
<groupId>org.kie.kogito</groupId>
<version>2.0.0-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>


Expand Down
8 changes: 4 additions & 4 deletions ...rc/main/java/org/kie/kogito/app/audit/quarkus/QuarkusDataAuditMessagingEventConsumer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
*/
package org.kie.kogito.app.audit.quarkus;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.transaction.Transactional;

import org.eclipse.microprofile.reactive.messaging.Incoming;
import org.kie.kogito.event.EventPublisher;
import org.kie.kogito.event.job.JobInstanceDataEvent;
Expand All @@ -32,6 +28,10 @@

import io.smallrye.common.annotation.Blocking;

import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.transaction.Transactional;

import static org.kie.kogito.app.audit.api.SubsystemConstants.KOGITO_JOBS_EVENTS;
import static org.kie.kogito.app.audit.api.SubsystemConstants.KOGITO_PROCESSINSTANCES_EVENTS;
import static org.kie.kogito.app.audit.api.SubsystemConstants.KOGITO_USERTASKINSTANCES_EVENTS;
Expand Down
2 changes: 1 addition & 1 deletion data-audit/kogito-addons-data-audit-jpa/data-audit-quarkus-jpa-service/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>kogito-addons-data-audit-jpa</artifactId>
<groupId>org.kie.kogito</groupId>
<version>2.0.0-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>

<artifactId>data-audit-quarkus-jpa-service</artifactId>
Expand Down
7 changes: 3 additions & 4 deletions data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-addons-data-audit-jpa</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>999-SNAPSHOT</version>
</parent>
<artifactId>kogito-addons-data-audit-jpa-common</artifactId>
<name>Kogito Apps :: Data Audit :: JPA :: Common</name>
Expand All @@ -28,9 +28,8 @@
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId>
<version>2.2</version>
<groupId>jakarta.persistence</groupId>
<artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
4 changes: 2 additions & 2 deletions ...s-data-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/JPADataAuditStore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
import java.util.Map;
import java.util.function.Supplier;

import javax.persistence.EntityManager;

import org.kie.kogito.app.audit.api.DataAuditContext;
import org.kie.kogito.app.audit.jpa.model.AbstractProcessInstanceLog;
import org.kie.kogito.app.audit.jpa.model.AbstractUserTaskInstanceLog;
Expand Down Expand Up @@ -71,6 +69,8 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;

import jakarta.persistence.EntityManager;

public class JPADataAuditStore implements DataAuditStore {

private static final Logger LOGGER = LoggerFactory.getLogger(JPADataAuditStore.class);
Expand Down
12 changes: 6 additions & 6 deletions ...a-common/src/main/java/org/kie/kogito/app/audit/jpa/model/AbstractProcessInstanceLog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@

import java.util.Date;

import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import jakarta.persistence.Column;
import jakarta.persistence.MappedSuperclass;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;
import jakarta.persistence.Transient;

import static org.kie.kogito.app.audit.jpa.model.ModelConstants.BUSINESS_KEY_LOG_LENGTH;

@MappedSuperclass
Expand Down
12 changes: 6 additions & 6 deletions ...-common/src/main/java/org/kie/kogito/app/audit/jpa/model/AbstractUserTaskInstanceLog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@

import java.util.Date;

import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.persistence.Transient;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import jakarta.persistence.Column;
import jakarta.persistence.MappedSuperclass;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;
import jakarta.persistence.Transient;

@MappedSuperclass
public abstract class AbstractUserTaskInstanceLog {

Expand Down
18 changes: 9 additions & 9 deletions ...ta-audit-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/JobExecutionLog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
import java.sql.Timestamp;
import java.util.Date;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.SequenceGenerator;
import jakarta.persistence.Table;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;

@Entity
@Table(name = "Job_Execution_Log")
Expand Down
20 changes: 10 additions & 10 deletions ...-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceErrorLog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@

package org.kie.kogito.app.audit.jpa.model;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.Transient;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.SequenceGenerator;
import jakarta.persistence.Table;
import jakarta.persistence.Transient;

import static org.kie.kogito.app.audit.jpa.model.ModelConstants.ERROR_LOG_LENGTH;

@Entity
Expand Down Expand Up @@ -91,4 +91,4 @@ public void setNodeInstanceId(String nodeInstanceId) {
this.nodeInstanceId = nodeInstanceId;
}

}
}
22 changes: 11 additions & 11 deletions ...t-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceNodeLog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@

import java.util.Date;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.SequenceGenerator;
import jakarta.persistence.Table;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;

@Entity
@Table(name = "Process_Instance_Node_Log")
Expand Down
30 changes: 15 additions & 15 deletions ...-jpa-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceStateLog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@
import java.util.Date;
import java.util.Set;

import javax.persistence.CollectionTable;
import javax.persistence.Column;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.EnumType;
import javax.persistence.Enumerated;
import javax.persistence.ForeignKey;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import jakarta.persistence.CollectionTable;
import jakarta.persistence.Column;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Entity;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import jakarta.persistence.ForeignKey;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.SequenceGenerator;
import jakarta.persistence.Table;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;

@Entity
@Table(name = "Process_Instance_State_Log")
Expand Down
20 changes: 10 additions & 10 deletions ...a-common/src/main/java/org/kie/kogito/app/audit/jpa/model/ProcessInstanceVariableLog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@

package org.kie.kogito.app.audit.jpa.model;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.Transient;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.SequenceGenerator;
import jakarta.persistence.Table;
import jakarta.persistence.Transient;

@Entity
@Table(name = "Process_Instance_Variable_Log")
@SequenceGenerator(name = "processInstanceVariableLogIdSeq", sequenceName = "PROCESS_INSTANCE_VARIABLE_LOG_ID_SEQ")
Expand Down Expand Up @@ -84,4 +84,4 @@ public void setVariableValue(String variableValue) {
this.variableValue = variableValue;
}

}
}
22 changes: 11 additions & 11 deletions ...ommon/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceAssignmentLog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@

import java.util.List;

import javax.persistence.CollectionTable;
import javax.persistence.Column;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.ForeignKey;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import jakarta.persistence.CollectionTable;
import jakarta.persistence.Column;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Entity;
import jakarta.persistence.ForeignKey;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.SequenceGenerator;
import jakarta.persistence.Table;

@Entity
@Table(name = "Task_Instance_Assignment_Log")
Expand Down
14 changes: 7 additions & 7 deletions ...ommon/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceAttachmentLog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@

import java.net.URL;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.SequenceGenerator;
import jakarta.persistence.Table;

@Entity
@Table(name = "Task_Instance_Attachment_Log")
Expand Down
14 changes: 7 additions & 7 deletions ...a-common/src/main/java/org/kie/kogito/app/audit/jpa/model/UserTaskInstanceCommentLog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@

package org.kie.kogito.app.audit.jpa.model;

import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.SequenceGenerator;
import jakarta.persistence.Table;

@Entity
@Table(name = "Task_Instance_Comment_Log")
Expand Down
Loading

0 comments on commit 31bb8b9

Please sign in to comment.