Skip to content

feat: Upgrade to Spring Boot 4.1 - Meeds-io/meeds#3889 #492

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

Merged
boubaker merged 1 commit into from
Sep 4, 2026
Merged

feat: Upgrade to Spring Boot 4.1 - Meeds-io/meeds#3889 #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 18 additions & 11 deletions processes-services/src/main/java/org/exoplatform/processes/entity/WorkEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,33 @@
*/
package org.exoplatform.processes.entity;

import lombok.Data;
import org.exoplatform.commons.api.persistence.ExoEntity;

import jakarta.persistence.*;
import java.io.Serializable;
import java.util.Date;

import io.meeds.common.persistence.PortableSequence;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.FetchType;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.Table;
import lombok.Data;

@Entity(name = "Work")
@ExoEntity
@Table(name = "PROCESSES_WORK")
@Data
@NamedQueries({
@NamedQuery(name = "Work.findAllWorkDraftsByUser", query = "SELECT DISTINCT w FROM Work w where w.creatorId = :userId and w.isDraft = true order by w.id desc"),
@NamedQuery(name = "Work.getWorkDraftByTaskId", query = "SELECT DISTINCT w FROM Work w where w.taskId = :taskId and w.isDraft = true"),
@NamedQuery(name = "Work.findAllWorkDraftsByWorkflowId", query = "SELECT DISTINCT w FROM Work w where w.workFlow.id = :workflowId and w.isDraft = true"),})
@NamedQuery(name = "Work.findAllWorkDraftsByUser", query = "SELECT DISTINCT w FROM Work w where w.creatorId = :userId and w.isDraft = true order by w.id desc")
@NamedQuery(name = "Work.getWorkDraftByTaskId", query = "SELECT DISTINCT w FROM Work w where w.taskId = :taskId and w.isDraft = true")
@NamedQuery(name = "Work.findAllWorkDraftsByWorkflowId", query = "SELECT DISTINCT w FROM Work w where w.workFlow.id = :workflowId and w.isDraft = true")
public class WorkEntity implements Serializable {

private static final long serialVersionUID = -8490912256477367410L;

@Id
@SequenceGenerator(name = "SEQ_WORK_ID", sequenceName = "SEQ_WORK_ID", allocationSize = 1)
@GeneratedValue(strategy = GenerationType.AUTO, generator = "SEQ_WORK_ID")
@PortableSequence(name = "SEQ_WORK_ID")
@Column(name = "WORK_ID", nullable = false)
private Long id;

Expand Down
36 changes: 19 additions & 17 deletions processes-services/src/main/java/org/exoplatform/processes/entity/WorkFlowEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,33 @@
import java.util.HashSet;
import java.util.Set;

import jakarta.persistence.*;

import org.exoplatform.commons.api.persistence.ExoEntity;

import io.meeds.common.persistence.PortableSequence;

import jakarta.persistence.CollectionTable;
import jakarta.persistence.Column;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.Table;
import lombok.Data;

@Entity(name = "WorkFlow")
@ExoEntity
@Table(name = "PROCESSES_WORK_FLOW")
@Data
@NamedQueries({
@NamedQuery(name = "WorkFlow.getWorkFlowByProjectId", query = "SELECT DISTINCT c FROM WorkFlow c where c.projectId = :projectId"),
@NamedQuery(name = "WorkFlow.findAllWorkFlowsByUser", query = "SELECT DISTINCT c FROM WorkFlow c where c.creatorId = :userId order by c.id desc"),
@NamedQuery(name = "WorkFlow.findEnabledWorkFlowsByUser", query = "SELECT DISTINCT c FROM WorkFlow c where c.creatorId = :userId and c.enabled = true order by c.id desc"),
@NamedQuery(name = "WorkFlow.findAllWorkFlows", query = "SELECT DISTINCT c FROM WorkFlow c order by c.id desc"),
@NamedQuery(name = "WorkFlow.findEnabledWorkFlows", query = "SELECT DISTINCT c FROM WorkFlow c where c.enabled = true order by c.id desc"),
@NamedQuery(name = "WorkFlow.findDisabledWorkFlows", query = "SELECT DISTINCT c FROM WorkFlow c where c.enabled = false order by c.id desc"),

})

@NamedQuery(name = "WorkFlow.getWorkFlowByProjectId", query = "SELECT DISTINCT c FROM WorkFlow c where c.projectId = :projectId")
@NamedQuery(name = "WorkFlow.findAllWorkFlowsByUser", query = "SELECT DISTINCT c FROM WorkFlow c where c.creatorId = :userId order by c.id desc")
@NamedQuery(name = "WorkFlow.findEnabledWorkFlowsByUser", query = "SELECT DISTINCT c FROM WorkFlow c where c.creatorId = :userId and c.enabled = true order by c.id desc")
@NamedQuery(name = "WorkFlow.findAllWorkFlows", query = "SELECT DISTINCT c FROM WorkFlow c order by c.id desc")
@NamedQuery(name = "WorkFlow.findEnabledWorkFlows", query = "SELECT DISTINCT c FROM WorkFlow c where c.enabled = true order by c.id desc")
@NamedQuery(name = "WorkFlow.findDisabledWorkFlows", query = "SELECT DISTINCT c FROM WorkFlow c where c.enabled = false order by c.id desc")
public class WorkFlowEntity implements Serializable {

private static final long serialVersionUID = 6804751507896811367L;

@Id
@SequenceGenerator(name = "SEQ_WORK_FLOW_ID", sequenceName = "SEQ_WORK_FLOW_ID", allocationSize = 1)
@GeneratedValue(strategy = GenerationType.AUTO, generator = "SEQ_WORK_FLOW_ID")
@PortableSequence(name = "SEQ_WORK_FLOW_ID")
@Column(name = "WORK_FLOW_ID", nullable = false)
private Long id;

Expand Down
2 changes: 2 additions & 0 deletions processes-services/src/main/resources/jpa-entities.idx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
org.exoplatform.processes.entity.WorkEntity
org.exoplatform.processes.entity.WorkFlowEntity
2 changes: 1 addition & 1 deletion processes-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<packagingExcludes>**/*.less,**/less/**,**/*.vue,css/lib/*,vue-app/**,js/mock/**/*,**-dev.*</packagingExcludes>
<packagingExcludes>WEB-INF/lib/**,**/*.less,**/less/**,**/*.vue,css/lib/*,vue-app/**,js/mock/**/*,**-dev.*</packagingExcludes>
</configuration>
</plugin>
</plugins>
Expand Down
Loading