Updated all ImExporters of ccm-core to implment new interface
parent
610b050ac5
commit
ef34c2b7f8
|
|
@ -19,11 +19,10 @@
|
||||||
package org.libreccm.workflow;
|
package org.libreccm.workflow;
|
||||||
|
|
||||||
import org.libreccm.imexport.AbstractEntityImExporter;
|
import org.libreccm.imexport.AbstractEntityImExporter;
|
||||||
import org.libreccm.imexport.Exportable;
|
|
||||||
import org.libreccm.imexport.Processes;
|
import org.libreccm.imexport.Processes;
|
||||||
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
import java.util.Optional;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import javax.annotation.PostConstruct;
|
import javax.annotation.PostConstruct;
|
||||||
|
|
@ -31,7 +30,6 @@ import javax.enterprise.context.RequestScoped;
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
import javax.persistence.EntityManager;
|
import javax.persistence.EntityManager;
|
||||||
import javax.persistence.NoResultException;
|
import javax.persistence.NoResultException;
|
||||||
import javax.transaction.Transactional;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Exporter/Importer for {@link TaskAssignment}s.
|
* Exporter/Importer for {@link TaskAssignment}s.
|
||||||
|
|
@ -47,6 +45,9 @@ public class TaskAssignmentImExporter
|
||||||
@Inject
|
@Inject
|
||||||
private EntityManager entityManager;
|
private EntityManager entityManager;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
private TaskAssignmentRepository assignmentRepo;
|
||||||
|
|
||||||
@PostConstruct
|
@PostConstruct
|
||||||
@Override
|
@Override
|
||||||
protected void init() {
|
protected void init() {
|
||||||
|
|
@ -63,12 +64,24 @@ public class TaskAssignmentImExporter
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional(Transactional.TxType.REQUIRED)
|
protected Optional<TaskAssignment> findExistingEntity(final String uuid) {
|
||||||
|
return assignmentRepo.findByUuid(uuid);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
protected void saveImportedEntity(final TaskAssignment entity) {
|
protected void saveImportedEntity(final TaskAssignment entity) {
|
||||||
entityManager.persist(entity);
|
entityManager.persist(entity);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void updateExistingEntity(
|
||||||
|
final TaskAssignment exitingEntity,
|
||||||
|
final TaskAssignment importedEntity
|
||||||
|
) {
|
||||||
|
// Task Assignment are not updated
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected TaskAssignment reloadEntity(final TaskAssignment entity) {
|
protected TaskAssignment reloadEntity(final TaskAssignment entity) {
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
|
|
@ -19,17 +19,14 @@
|
||||||
package org.libreccm.workflow;
|
package org.libreccm.workflow;
|
||||||
|
|
||||||
import org.libreccm.imexport.AbstractEntityImExporter;
|
import org.libreccm.imexport.AbstractEntityImExporter;
|
||||||
import org.libreccm.imexport.Exportable;
|
|
||||||
import org.libreccm.imexport.Processes;
|
import org.libreccm.imexport.Processes;
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Set;
|
import java.util.Optional;
|
||||||
|
|
||||||
import javax.annotation.PostConstruct;
|
import javax.annotation.PostConstruct;
|
||||||
import javax.enterprise.context.RequestScoped;
|
import javax.enterprise.context.RequestScoped;
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
import javax.transaction.Transactional;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Importer/Exporter for {@link TaskComment}s.
|
* Importer/Exporter for {@link TaskComment}s.
|
||||||
|
|
@ -56,11 +53,38 @@ public class TaskCommentImExporter extends AbstractEntityImExporter<TaskComment>
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional(Transactional.TxType.REQUIRED)
|
protected Optional<TaskComment> findExistingEntity(final String uuid) {
|
||||||
|
return taskCommentRepository.findByUuid(uuid);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
protected void saveImportedEntity(TaskComment entity) {
|
protected void saveImportedEntity(TaskComment entity) {
|
||||||
taskCommentRepository.save(entity);
|
taskCommentRepository.save(entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void updateExistingEntity(
|
||||||
|
final TaskComment existingEntity,
|
||||||
|
final TaskComment importedEntity
|
||||||
|
) {
|
||||||
|
if (!Objects.equals(
|
||||||
|
existingEntity.getComment(),
|
||||||
|
importedEntity.getComment()
|
||||||
|
)) {
|
||||||
|
existingEntity.setComment(importedEntity.getComment());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!Objects.equals(
|
||||||
|
existingEntity.getAuthor(),
|
||||||
|
importedEntity.getAuthor()
|
||||||
|
)) {
|
||||||
|
existingEntity.setAuthor(importedEntity.getAuthor());
|
||||||
|
}
|
||||||
|
|
||||||
|
taskCommentRepository.save(existingEntity);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected TaskComment reloadEntity(final TaskComment entity) {
|
protected TaskComment reloadEntity(final TaskComment entity) {
|
||||||
return taskCommentRepository
|
return taskCommentRepository
|
||||||
|
|
|
||||||
|
|
@ -19,11 +19,10 @@
|
||||||
package org.libreccm.workflow;
|
package org.libreccm.workflow;
|
||||||
|
|
||||||
import org.libreccm.imexport.AbstractEntityImExporter;
|
import org.libreccm.imexport.AbstractEntityImExporter;
|
||||||
import org.libreccm.imexport.Exportable;
|
|
||||||
import org.libreccm.imexport.Processes;
|
import org.libreccm.imexport.Processes;
|
||||||
|
|
||||||
import java.util.HashSet;
|
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
import java.util.Optional;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import javax.annotation.PostConstruct;
|
import javax.annotation.PostConstruct;
|
||||||
|
|
@ -47,6 +46,9 @@ public class TaskDependencyImExporter
|
||||||
@Inject
|
@Inject
|
||||||
private EntityManager entityManager;
|
private EntityManager entityManager;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
private TaskDependencyRepository taskDependencyRepo;
|
||||||
|
|
||||||
@PostConstruct
|
@PostConstruct
|
||||||
@Override
|
@Override
|
||||||
protected void init() {
|
protected void init() {
|
||||||
|
|
@ -63,11 +65,23 @@ public class TaskDependencyImExporter
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional(Transactional.TxType.REQUIRED)
|
protected Optional<TaskDependency> findExistingEntity(final String uuid) {
|
||||||
|
return taskDependencyRepo.findByUuid(uuid);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
protected void saveImportedEntity(final TaskDependency entity) {
|
protected void saveImportedEntity(final TaskDependency entity) {
|
||||||
entityManager.merge(entity);
|
entityManager.merge(entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void updateExistingEntity(
|
||||||
|
final TaskDependency existingEntity,
|
||||||
|
final TaskDependency importedEntity
|
||||||
|
) {
|
||||||
|
// Task Dependencies are not updated.
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected TaskDependency reloadEntity(final TaskDependency entity) {
|
protected TaskDependency reloadEntity(final TaskDependency entity) {
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue