This commit is contained in:
CITE\spapacharalampous 2024-08-26 16:37:52 +03:00
parent e29912a354
commit e65ac113c6
22 changed files with 65 additions and 70 deletions

View File

@ -12,7 +12,7 @@ public class DescriptionStatusDefinitionAuthorizationEntity {
@XmlElement(name = "edit")
private DescriptionStatusDefinitionAuthorizationItemEntity edit;
public DescriptionStatusDefinitionAuthorizationItemEntity getEdit() { return edit; }
public DescriptionStatusDefinitionAuthorizationItemEntity getEdit() { return this.edit; }
public void setEdit(DescriptionStatusDefinitionAuthorizationItemEntity edit) { this.edit = edit; }
}

View File

@ -12,7 +12,7 @@ public class DescriptionStatusDefinitionEntity {
@XmlElement(name = "authorization")
private DescriptionStatusDefinitionAuthorizationEntity authorization;
public DescriptionStatusDefinitionAuthorizationEntity getAuthorization() { return authorization; }
public DescriptionStatusDefinitionAuthorizationEntity getAuthorization() { return this.authorization; }
public void setAuthorization(DescriptionStatusDefinitionAuthorizationEntity authorization) { this.authorization = authorization; }
}

View File

@ -17,11 +17,11 @@ public class DescriptionWorkflowDefinitionEntity {
private List<DescriptionWorkflowDefinitionTransitionEntity> statusTransitions;
public final static String _statusTransitions = "statusTransitions";
public UUID getStartingStatusId() { return startingStatusId; }
public UUID getStartingStatusId() { return this.startingStatusId; }
public void setStartingStatusId(UUID startingStatusId) { this.startingStatusId = startingStatusId; }
public List<DescriptionWorkflowDefinitionTransitionEntity> getStatusTransitions() { return statusTransitions; }
public List<DescriptionWorkflowDefinitionTransitionEntity> getStatusTransitions() { return this.statusTransitions; }
public void setStatusTransitions(List<DescriptionWorkflowDefinitionTransitionEntity> statusTransitions) { this.statusTransitions = statusTransitions; }
}

View File

@ -12,7 +12,7 @@ public class PlanStatusDefinitionAuthorizationEntity {
private PlanStatusDefinitionAuthorizationItemEntity edit;
public PlanStatusDefinitionAuthorizationItemEntity getEdit() {
return edit;
return this.edit;
}
public void setEdit(PlanStatusDefinitionAuthorizationItemEntity edit) {

View File

@ -10,7 +10,7 @@ public class PlanStatusDefinitionEntity {
private PlanStatusDefinitionAuthorizationEntity authorization;
public PlanStatusDefinitionAuthorizationEntity getAuthorization() {
return authorization;
return this.authorization;
}
public void setAuthorization(PlanStatusDefinitionAuthorizationEntity authorization) { this.authorization = authorization; }

View File

@ -17,11 +17,11 @@ public class PlanWorkflowDefinitionEntity {
private List<PlanWorkflowDefinitionTransitionEntity> statusTransitions;
public final static String _statusTransitions = "statusTransitions";
public UUID getStartingStatusId() { return startingStatusId; }
public UUID getStartingStatusId() { return this.startingStatusId; }
public void setStartingStatusId(UUID startingStatusId) { this.startingStatusId = startingStatusId; }
public List<PlanWorkflowDefinitionTransitionEntity> getStatusTransitions() { return statusTransitions; }
public List<PlanWorkflowDefinitionTransitionEntity> getStatusTransitions() { return this.statusTransitions; }
public void setStatusTransitions(List<PlanWorkflowDefinitionTransitionEntity> statusTransitions) { this.statusTransitions = statusTransitions; }
}

View File

@ -46,31 +46,31 @@ public class DescriptionWorkflowEntity extends TenantScopedBaseEntity {
public static final String _definition = "definition";
public UUID getId() { return id; }
public UUID getId() { return this.id; }
public void setId(UUID id) { this.id = id; }
public String getName() { return name; }
public String getName() { return this.name; }
public void setName(String name) { this.name = name; }
public String getDescription() { return description; }
public String getDescription() { return this.description; }
public void setDescription(String description) { this.description = description; }
public Instant getCreatedAt() { return createdAt; }
public Instant getCreatedAt() { return this.createdAt; }
public void setCreatedAt(Instant createdAt) { this.createdAt = createdAt; }
public Instant getUpdatedAt() { return updatedAt; }
public Instant getUpdatedAt() { return this.updatedAt; }
public void setUpdatedAt(Instant updatedAt) { this.updatedAt = updatedAt; }
public IsActive getIsActive() { return isActive; }
public IsActive getIsActive() { return this.isActive; }
public void setIsActive(IsActive isActive) { this.isActive = isActive; }
public String getDefinition() { return definition; }
public String getDefinition() { return this.definition; }
public void setDefinition(String definition) { this.definition = definition; }
}

View File

@ -46,31 +46,31 @@ public class PlanWorkflowEntity extends TenantScopedBaseEntity {
public static final String _definition = "definition";
public UUID getId() { return id; }
public UUID getId() { return this.id; }
public void setId(UUID id) { this.id = id; }
public String getName() { return name; }
public String getName() { return this.name; }
public void setName(String name) { this.name = name; }
public String getDescription() { return description; }
public String getDescription() { return this.description; }
public void setDescription(String description) { this.description = description; }
public Instant getCreatedAt() { return createdAt; }
public Instant getCreatedAt() { return this.createdAt; }
public void setCreatedAt(Instant createdAt) { this.createdAt = createdAt; }
public Instant getUpdatedAt() { return updatedAt; }
public Instant getUpdatedAt() { return this.updatedAt; }
public void setUpdatedAt(Instant updatedAt) { this.updatedAt = updatedAt; }
public IsActive getIsActive() { return isActive; }
public IsActive getIsActive() { return this.isActive; }
public void setIsActive(IsActive isActive) { this.isActive = isActive; }
public String getDefinition() { return definition; }
public String getDefinition() { return this.definition; }
public void setDefinition(String definition) { this.definition = definition; }
}

View File

@ -34,31 +34,31 @@ public class DescriptionStatus {
public final static String _definition = "definition";
private DescriptionStatusDefinition definition;
public UUID getId() { return id; }
public UUID getId() { return this.id; }
public void setId(UUID id) { this.id = id; }
public String getName() { return name; }
public String getName() { return this.name; }
public void setName(String name) { this.name = name; }
public String getDescription() { return description; }
public String getDescription() { return this.description; }
public void setDescription(String description) { this.description = description; }
public Instant getCreatedAt() { return createdAt; }
public Instant getCreatedAt() { return this.createdAt; }
public void setCreatedAt(Instant createdAt) { this.createdAt = createdAt; }
public Instant getUpdateAt() { return updateAt; }
public Instant getUpdateAt() { return this.updateAt; }
public void setUpdateAt(Instant updateAt) { this.updateAt = updateAt; }
public IsActive getIsActive() { return isActive; }
public IsActive getIsActive() { return this.isActive; }
public void setIsActive(IsActive isActive) { this.isActive = isActive; }
public org.opencdmp.commons.enums.DescriptionStatus getInternalStatus() { return internalStatus; }
public org.opencdmp.commons.enums.DescriptionStatus getInternalStatus() { return this.internalStatus; }
public void setInternalStatus(org.opencdmp.commons.enums.DescriptionStatus internalStatus) { this.internalStatus = internalStatus; }
public DescriptionStatusDefinition getDefinition() { return definition; }
public DescriptionStatusDefinition getDefinition() { return this.definition; }
public void setDefinition(DescriptionStatusDefinition definition) { this.definition = definition; }
public Boolean getBelongsToCurrentTenant() { return belongsToCurrentTenant; }
public Boolean getBelongsToCurrentTenant() { return this.belongsToCurrentTenant; }
public void setBelongsToCurrentTenant(Boolean belongsToCurrentTenant) { this.belongsToCurrentTenant = belongsToCurrentTenant; }
}

View File

@ -5,7 +5,7 @@ public class DescriptionStatusDefinition {
public final static String _authorization = "authorization";
private DescriptionStatusDefinitionAuthorization authorization;
public DescriptionStatusDefinitionAuthorization getAuthorization() { return authorization; }
public DescriptionStatusDefinitionAuthorization getAuthorization() { return this.authorization; }
public void setAuthorization(DescriptionStatusDefinitionAuthorization authorization) { this.authorization = authorization; }
}

View File

@ -5,7 +5,7 @@ public class DescriptionStatusDefinitionAuthorization {
public final static String _edit = "edit";
private DescriptionStatusDefinitionAuthorizationItem edit;
public DescriptionStatusDefinitionAuthorizationItem getEdit() { return edit; }
public DescriptionStatusDefinitionAuthorizationItem getEdit() { return this.edit; }
public void setEdit(DescriptionStatusDefinitionAuthorizationItem edit) { this.edit = edit; }
}

View File

@ -18,19 +18,19 @@ public class DescriptionStatusDefinitionAuthorizationItem {
public final static String _allowAnonymous = "allowAnonymous";
private Boolean allowAnonymous;
public List<String> getRoles() { return roles; }
public List<String> getRoles() { return this.roles; }
public void setRoles(List<String> roles) { this.roles = roles; }
public List<PlanUserRole> getPlanRoles() { return planRoles; }
public List<PlanUserRole> getPlanRoles() { return this.planRoles; }
public void setPlanRoles(List<PlanUserRole> planRoles) { this.planRoles = planRoles; }
public Boolean getAllowAuthenticated() { return allowAuthenticated; }
public Boolean getAllowAuthenticated() { return this.allowAuthenticated; }
public void setAllowAuthenticated(Boolean allowAuthenticated) { this.allowAuthenticated = allowAuthenticated; }
public Boolean getAllowAnonymous() { return allowAnonymous; }
public Boolean getAllowAnonymous() { return this.allowAnonymous; }
public void setAllowAnonymous(Boolean allowAnonymous) { this.allowAnonymous = allowAnonymous; }
}

View File

@ -38,35 +38,35 @@ public class DescriptionWorkflow {
public void setId(UUID id) { this.id = id; }
public String getName() { return name; }
public String getName() { return this.name; }
public void setName(String name) { this.name = name; }
public String getDescription() { return description; }
public String getDescription() { return this.description; }
public void setDescription(String description) { this.description = description; }
public Instant getCreatedAt() { return createdAt; }
public Instant getCreatedAt() { return this.createdAt; }
public void setCreatedAt(Instant createdAt) { this.createdAt = createdAt; }
public Instant getUpdatedAt() { return updatedAt; }
public Instant getUpdatedAt() { return this.updatedAt; }
public void setUpdatedAt(Instant updatedAt) { this.updatedAt = updatedAt; }
public IsActive getIsActive() { return isActive; }
public IsActive getIsActive() { return this.isActive; }
public void setIsActive(IsActive isActive) { this.isActive = isActive; }
public DescriptionWorkflowDefinition getDefinition() { return definition; }
public DescriptionWorkflowDefinition getDefinition() { return this.definition; }
public void setDefinition(DescriptionWorkflowDefinition definition) { this.definition = definition; }
public String getHash() { return hash; }
public String getHash() { return this.hash; }
public void setHash(String hash) { this.hash = hash; }
public Boolean getBelongsToCurrentTenant() { return belongsToCurrentTenant; }
public Boolean getBelongsToCurrentTenant() { return this.belongsToCurrentTenant; }
public void setBelongsToCurrentTenant(Boolean belongsToCurrentTenant) { this.belongsToCurrentTenant = belongsToCurrentTenant; }
}

View File

@ -12,11 +12,11 @@ public class DescriptionWorkflowDefinition {
private List<DescriptionWorkflowDefinitionTransition> statusTransitions;
public DescriptionStatus getStartingStatus() { return startingStatus; }
public DescriptionStatus getStartingStatus() { return this.startingStatus; }
public void setStartingStatus(DescriptionStatus startingStatus) { this.startingStatus = startingStatus; }
public List<DescriptionWorkflowDefinitionTransition> getStatusTransitions() { return statusTransitions; }
public List<DescriptionWorkflowDefinitionTransition> getStatusTransitions() { return this.statusTransitions; }
public void setStatusTransitions(List<DescriptionWorkflowDefinitionTransition> statusTransitions) { this.statusTransitions = statusTransitions; }
}

View File

@ -10,11 +10,11 @@ public class DescriptionWorkflowDefinitionTransition {
private DescriptionStatus toStatus;
public DescriptionStatus getFromStatus() { return fromStatus; }
public DescriptionStatus getFromStatus() { return this.fromStatus; }
public void setFromStatus(DescriptionStatus fromStatus) { this.fromStatus = fromStatus; }
public DescriptionStatus getToStatus() { return toStatus; }
public DescriptionStatus getToStatus() { return this.toStatus; }
public void setToStatus(DescriptionStatus toStatus) { this.toStatus = toStatus; }

View File

@ -57,7 +57,7 @@ public class PlanStatus {
this.name = name;
}
public String getDescription() { return description; }
public String getDescription() { return this.description; }
public void setDescription(String description) { this.description = description; }
@ -118,7 +118,5 @@ public class PlanStatus {
return this.belongsToCurrentTenant;
}
public void setBelongsToCurrentTenant(Boolean belongsToCurrentTenant) {
this.belongsToCurrentTenant = belongsToCurrentTenant;
}
public void setBelongsToCurrentTenant(Boolean belongsToCurrentTenant) { this.belongsToCurrentTenant = belongsToCurrentTenant; }
}

View File

@ -6,7 +6,7 @@ public class PlanStatusDefinition {
private PlanStatusDefinitionAuthorization authorization;
public PlanStatusDefinitionAuthorization getAuthorization() { return authorization; }
public PlanStatusDefinitionAuthorization getAuthorization() { return this.authorization; }
public void setAuthorization(PlanStatusDefinitionAuthorization authorization) { this.authorization = authorization; }
}

View File

@ -6,7 +6,7 @@ public class PlanStatusDefinitionAuthorization {
private PlanStatusDefinitionAuthorizationItem edit;
public PlanStatusDefinitionAuthorizationItem getEdit() {
return edit;
return this.edit;
}
public void setEdit(PlanStatusDefinitionAuthorizationItem edit) {

View File

@ -39,35 +39,35 @@ public class PlanWorkflow {
public void setId(UUID id) { this.id = id; }
public String getName() { return name; }
public String getName() { return this.name; }
public void setName(String name) { this.name = name; }
public String getDescription() { return description; }
public String getDescription() { return this.description; }
public void setDescription(String description) { this.description = description; }
public Instant getCreatedAt() { return createdAt; }
public Instant getCreatedAt() { return this.createdAt; }
public void setCreatedAt(Instant createdAt) { this.createdAt = createdAt; }
public Instant getUpdatedAt() { return updatedAt; }
public Instant getUpdatedAt() { return this.updatedAt; }
public void setUpdatedAt(Instant updatedAt) { this.updatedAt = updatedAt; }
public IsActive getIsActive() { return isActive; }
public IsActive getIsActive() { return this.isActive; }
public void setIsActive(IsActive isActive) { this.isActive = isActive; }
public PlanWorkflowDefinition getDefinition() { return definition; }
public PlanWorkflowDefinition getDefinition() { return this.definition; }
public void setDefinition(PlanWorkflowDefinition definition) { this.definition = definition; }
public String getHash() { return hash; }
public String getHash() { return this.hash; }
public void setHash(String hash) { this.hash = hash; }
public Boolean getBelongsToCurrentTenant() { return belongsToCurrentTenant; }
public Boolean getBelongsToCurrentTenant() { return this.belongsToCurrentTenant; }
public void setBelongsToCurrentTenant(Boolean belongsToCurrentTenant) { this.belongsToCurrentTenant = belongsToCurrentTenant; }
}

View File

@ -13,11 +13,11 @@ public class PlanWorkflowDefinition {
private List<PlanWorkflowDefinitionTransition> statusTransitions;
public PlanStatus getStartingStatus() { return startingStatus; }
public PlanStatus getStartingStatus() { return this.startingStatus; }
public void setStartingStatus(PlanStatus startingStatus) { this.startingStatus = startingStatus; }
public List<PlanWorkflowDefinitionTransition> getStatusTransitions() { return statusTransitions; }
public List<PlanWorkflowDefinitionTransition> getStatusTransitions() { return this.statusTransitions; }
public void setStatusTransitions(List<PlanWorkflowDefinitionTransition> statusTransitions) { this.statusTransitions = statusTransitions; }
}

View File

@ -11,11 +11,11 @@ public class PlanWorkflowDefinitionTransition {
private PlanStatus toStatus;
public PlanStatus getFromStatus() { return fromStatus; }
public PlanStatus getFromStatus() { return this.fromStatus; }
public void setFromStatus(PlanStatus fromStatus) { this.fromStatus = fromStatus; }
public PlanStatus getToStatus() { return toStatus; }
public PlanStatus getToStatus() { return this.toStatus; }
public void setToStatus(PlanStatus toStatus) { this.toStatus = toStatus; }
}

View File

@ -9,11 +9,8 @@ import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.Predicate;
import org.opencdmp.authorization.AuthorizationFlags;
import org.opencdmp.commons.enums.IsActive;
import org.opencdmp.data.DescriptionWorkflowEntity;
import org.opencdmp.data.PlanBlueprintEntity;
import org.opencdmp.data.PlanWorkflowEntity;
import org.opencdmp.data.TenantEntityManager;
import org.opencdmp.model.planblueprint.PlanBlueprint;
import org.opencdmp.model.planworkflow.PlanWorkflow;
import org.opencdmp.query.utils.QueryUtilsService;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;