diff --git a/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/annotationentitytouch/AnnotationEntityTouchedIntegrationEventHandler.java b/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/annotationentitytouch/AnnotationEntityTouchedIntegrationEventHandler.java index 592ea1c3c..3fa6cd7aa 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/annotationentitytouch/AnnotationEntityTouchedIntegrationEventHandler.java +++ b/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/annotationentitytouch/AnnotationEntityTouchedIntegrationEventHandler.java @@ -1,10 +1,5 @@ package eu.eudat.integrationevent.outbox.annotationentitytouch; -import eu.eudat.integrationevent.outbox.dmptouched.DmpTouchedIntegrationEvent; -import eu.eudat.model.persist.DmpPersist; - -import java.util.ArrayList; -import java.util.List; import java.util.UUID; public interface AnnotationEntityTouchedIntegrationEventHandler { diff --git a/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/descriptiontouched/DescriptionTouchedIntegrationEvent.java b/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/descriptiontouched/DescriptionTouchedIntegrationEvent.java deleted file mode 100644 index 469fd7f5e..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/descriptiontouched/DescriptionTouchedIntegrationEvent.java +++ /dev/null @@ -1,102 +0,0 @@ -package eu.eudat.integrationevent.outbox.descriptiontouched; - -import eu.eudat.commons.enums.DescriptionStatus; -import eu.eudat.integrationevent.TrackedEvent; -import eu.eudat.model.persist.descriptionproperties.PropertyDefinitionPersist; - -import java.util.List; -import java.util.UUID; - -public class DescriptionTouchedIntegrationEvent extends TrackedEvent { - - private UUID id; - - private String label; - - private UUID dmpId; - - private UUID dmpDescriptionTemplateId; - - private UUID descriptionTemplateId; - - private DescriptionStatus status; - - private String description; - - private PropertyDefinitionPersist properties; - - private List tags; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public UUID getDmpId() { - return dmpId; - } - - public void setDmpId(UUID dmpId) { - this.dmpId = dmpId; - } - - public UUID getDmpDescriptionTemplateId() { - return dmpDescriptionTemplateId; - } - - public void setDmpDescriptionTemplateId(UUID dmpDescriptionTemplateId) { - this.dmpDescriptionTemplateId = dmpDescriptionTemplateId; - } - - public UUID getDescriptionTemplateId() { - return descriptionTemplateId; - } - - public void setDescriptionTemplateId(UUID descriptionTemplateId) { - this.descriptionTemplateId = descriptionTemplateId; - } - - public DescriptionStatus getStatus() { - return status; - } - - public void setStatus(DescriptionStatus status) { - this.status = status; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public PropertyDefinitionPersist getProperties() { - return properties; - } - - public void setProperties(PropertyDefinitionPersist properties) { - this.properties = properties; - } - - public List getTags() { - return tags; - } - - public void setTags(List tags) { - this.tags = tags; - } - -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/descriptiontouched/DescriptionTouchedIntegrationEventHandler.java b/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/descriptiontouched/DescriptionTouchedIntegrationEventHandler.java deleted file mode 100644 index d2fb9fcdf..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/descriptiontouched/DescriptionTouchedIntegrationEventHandler.java +++ /dev/null @@ -1,23 +0,0 @@ -package eu.eudat.integrationevent.outbox.descriptiontouched; - -import eu.eudat.model.persist.DescriptionPersist; - -public interface DescriptionTouchedIntegrationEventHandler { - - void handle(DescriptionTouchedIntegrationEvent event); - - static DescriptionTouchedIntegrationEvent buildEventFromPersistModel(DescriptionPersist persist) { - DescriptionTouchedIntegrationEvent event = new DescriptionTouchedIntegrationEvent(); - event.setId(persist.getId()); - event.setLabel(persist.getLabel()); - event.setDmpId(persist.getDmpId()); - event.setDmpDescriptionTemplateId(persist.getDmpDescriptionTemplateId()); - event.setDescriptionTemplateId(persist.getDescriptionTemplateId()); - event.setStatus(persist.getStatus()); - event.setDescription(persist.getDescription()); - event.setProperties(persist.getProperties()); - event.setTags(persist.getTags()); - return event; - } - -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/descriptiontouched/DescriptionTouchedIntegrationEventHandlerImpl.java b/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/descriptiontouched/DescriptionTouchedIntegrationEventHandlerImpl.java deleted file mode 100644 index 34e206558..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/descriptiontouched/DescriptionTouchedIntegrationEventHandlerImpl.java +++ /dev/null @@ -1,34 +0,0 @@ -package eu.eudat.integrationevent.outbox.descriptiontouched; - -import eu.eudat.integrationevent.outbox.OutboxIntegrationEvent; -import eu.eudat.integrationevent.outbox.OutboxService; -import gr.cite.tools.logging.LoggerService; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.config.ConfigurableBeanFactory; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Component; - -import java.util.UUID; - -@Component -@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE) -public class DescriptionTouchedIntegrationEventHandlerImpl implements DescriptionTouchedIntegrationEventHandler { - - private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(DescriptionTouchedIntegrationEventHandlerImpl.class)); - - private final OutboxService outboxService; - - public DescriptionTouchedIntegrationEventHandlerImpl(OutboxService outboxService) { - this.outboxService = outboxService; - } - - @Override - public void handle(DescriptionTouchedIntegrationEvent event) { - OutboxIntegrationEvent message = new OutboxIntegrationEvent(); - message.setMessageId(UUID.randomUUID()); - message.setType(OutboxIntegrationEvent.DESCRIPTION_TOUCH); - message.setEvent(event); - this.outboxService.publish(message); - } - -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/dmptouched/DmpTouchedIntegrationEvent.java b/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/dmptouched/DmpTouchedIntegrationEvent.java deleted file mode 100644 index d33c07df6..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/dmptouched/DmpTouchedIntegrationEvent.java +++ /dev/null @@ -1,116 +0,0 @@ -package eu.eudat.integrationevent.outbox.dmptouched; - -import eu.eudat.commons.enums.DmpAccessType; -import eu.eudat.commons.enums.DmpStatus; -import eu.eudat.integrationevent.TrackedEvent; -import eu.eudat.model.persist.DmpDescriptionTemplatePersist; -import eu.eudat.model.persist.dmpproperties.DmpBlueprintValuePersist; -import eu.eudat.model.persist.dmpproperties.DmpContactPersist; - -import java.util.List; -import java.util.Map; -import java.util.UUID; - -public class DmpTouchedIntegrationEvent extends TrackedEvent { - - private UUID id; - - private String label; - - private DmpStatus status; - - private List contacts; - - private Map dmpBlueprintValues; - - private String description; - - private String language; - - private UUID blueprint; - - private DmpAccessType accessType; - - private List descriptionTemplates; - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public String getLabel() { - return label; - } - - public void setLabel(String label) { - this.label = label; - } - - public DmpStatus getStatus() { - return status; - } - - public void setStatus(DmpStatus status) { - this.status = status; - } - - public List getContacts() { - return contacts; - } - - public void setContacts(List contacts) { - this.contacts = contacts; - } - - public Map getDmpBlueprintValues() { - return dmpBlueprintValues; - } - - public void setDmpBlueprintValues(Map dmpBlueprintValues) { - this.dmpBlueprintValues = dmpBlueprintValues; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getLanguage() { - return language; - } - - public void setLanguage(String language) { - this.language = language; - } - - public UUID getBlueprint() { - return blueprint; - } - - public void setBlueprint(UUID blueprint) { - this.blueprint = blueprint; - } - - public DmpAccessType getAccessType() { - return accessType; - } - - public void setAccessType(DmpAccessType accessType) { - this.accessType = accessType; - } - - public List getDescriptionTemplates() { - return descriptionTemplates; - } - - public void setDescriptionTemplates(List descriptionTemplates) { - this.descriptionTemplates = descriptionTemplates; - } - -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/dmptouched/DmpTouchedIntegrationEventHandler.java b/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/dmptouched/DmpTouchedIntegrationEventHandler.java deleted file mode 100644 index 4c70fb8f9..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/dmptouched/DmpTouchedIntegrationEventHandler.java +++ /dev/null @@ -1,24 +0,0 @@ -package eu.eudat.integrationevent.outbox.dmptouched; - -import eu.eudat.model.persist.DmpPersist; - -public interface DmpTouchedIntegrationEventHandler { - - void handle(DmpTouchedIntegrationEvent event); - - static DmpTouchedIntegrationEvent buildEventFromPersistModel(DmpPersist persist) { - DmpTouchedIntegrationEvent event = new DmpTouchedIntegrationEvent(); - event.setId(persist.getId()); - event.setLabel(persist.getLabel()); - event.setStatus(persist.getStatus()); - event.setContacts(persist.getProperties().getContacts()); - event.setDmpBlueprintValues(persist.getProperties().getDmpBlueprintValues()); - event.setDescription(persist.getDescription()); - event.setLanguage(persist.getLanguage()); - event.setBlueprint(persist.getBlueprint()); - event.setAccessType(persist.getAccessType()); - event.setDescriptionTemplates(persist.getDescriptionTemplates()); - return event; - } - -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/dmptouched/DmpTouchedIntegrationEventHandlerImpl.java b/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/dmptouched/DmpTouchedIntegrationEventHandlerImpl.java deleted file mode 100644 index 5d45a42e0..000000000 --- a/dmp-backend/core/src/main/java/eu/eudat/integrationevent/outbox/dmptouched/DmpTouchedIntegrationEventHandlerImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package eu.eudat.integrationevent.outbox.dmptouched; - -import eu.eudat.integrationevent.outbox.OutboxIntegrationEvent; -import eu.eudat.integrationevent.outbox.OutboxService; -import eu.eudat.integrationevent.outbox.tenantremoval.TenantRemovalIntegrationEventHandlerImpl; -import gr.cite.tools.logging.LoggerService; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.config.ConfigurableBeanFactory; -import org.springframework.context.annotation.Scope; -import org.springframework.stereotype.Component; - -import java.util.UUID; - -@Component -@Scope(value = ConfigurableBeanFactory.SCOPE_PROTOTYPE) -public class DmpTouchedIntegrationEventHandlerImpl implements DmpTouchedIntegrationEventHandler { - - private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(DmpTouchedIntegrationEventHandlerImpl.class)); - - private final OutboxService outboxService; - - public DmpTouchedIntegrationEventHandlerImpl(OutboxService outboxService) { - this.outboxService = outboxService; - } - - @Override - public void handle(DmpTouchedIntegrationEvent event) { - OutboxIntegrationEvent message = new OutboxIntegrationEvent(); - message.setMessageId(UUID.randomUUID()); - message.setType(OutboxIntegrationEvent.DMP_TOUCH); - message.setEvent(event); - this.outboxService.publish(message); - } - -} diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/description/DescriptionServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/description/DescriptionServiceImpl.java index a40643460..3ca3616ff 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/description/DescriptionServiceImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/description/DescriptionServiceImpl.java @@ -24,7 +24,6 @@ import eu.eudat.event.DescriptionTouchedEvent; import eu.eudat.event.EventBroker; import eu.eudat.integrationevent.outbox.annotationentityremoval.AnnotationEntityRemovalIntegrationEventHandler; import eu.eudat.integrationevent.outbox.annotationentitytouch.AnnotationEntityTouchedIntegrationEventHandler; -import eu.eudat.integrationevent.outbox.descriptiontouched.DescriptionTouchedIntegrationEventHandler; import eu.eudat.integrationevent.outbox.notification.NotifyIntegrationEvent; import eu.eudat.integrationevent.outbox.notification.NotifyIntegrationEventHandler; import eu.eudat.model.*; @@ -99,7 +98,6 @@ public class DescriptionServiceImpl implements DescriptionService { private final ValidatorFactory validatorFactory; private final StorageFileProperties storageFileConfig; private final StorageFileService storageFileService; - private final DescriptionTouchedIntegrationEventHandler descriptionTouchedIntegrationEventHandler; private final AuthorizationContentResolver authorizationContentResolver; private final AnnotationEntityTouchedIntegrationEventHandler annotationEntityTouchedIntegrationEventHandler; private final AnnotationEntityRemovalIntegrationEventHandler annotationEntityRemovalIntegrationEventHandler; @@ -117,7 +115,7 @@ public class DescriptionServiceImpl implements DescriptionService { QueryFactory queryFactory, JsonHandlingService jsonHandlingService, UserScope userScope, - XmlHandlingService xmlHandlingService, NotifyIntegrationEventHandler eventHandler, NotificationProperties notificationProperties, FileTransformerService fileTransformerService, ElasticService elasticService, ValidatorFactory validatorFactory, StorageFileProperties storageFileConfig, StorageFileService storageFileService, DescriptionTouchedIntegrationEventHandler descriptionTouchedIntegrationEventHandler, AuthorizationContentResolver authorizationContentResolver, AnnotationEntityTouchedIntegrationEventHandler annotationEntityTouchedIntegrationEventHandler, AnnotationEntityRemovalIntegrationEventHandler annotationEntityRemovalIntegrationEventHandler) { + XmlHandlingService xmlHandlingService, NotifyIntegrationEventHandler eventHandler, NotificationProperties notificationProperties, FileTransformerService fileTransformerService, ElasticService elasticService, ValidatorFactory validatorFactory, StorageFileProperties storageFileConfig, StorageFileService storageFileService, AuthorizationContentResolver authorizationContentResolver, AnnotationEntityTouchedIntegrationEventHandler annotationEntityTouchedIntegrationEventHandler, AnnotationEntityRemovalIntegrationEventHandler annotationEntityRemovalIntegrationEventHandler) { this.entityManager = entityManager; this.authorizationService = authorizationService; this.deleterFactory = deleterFactory; @@ -137,7 +135,6 @@ public class DescriptionServiceImpl implements DescriptionService { this.validatorFactory = validatorFactory; this.storageFileConfig = storageFileConfig; this.storageFileService = storageFileService; - this.descriptionTouchedIntegrationEventHandler = descriptionTouchedIntegrationEventHandler; this.authorizationContentResolver = authorizationContentResolver; this.annotationEntityTouchedIntegrationEventHandler = annotationEntityTouchedIntegrationEventHandler; this.annotationEntityRemovalIntegrationEventHandler = annotationEntityRemovalIntegrationEventHandler; @@ -234,8 +231,6 @@ public class DescriptionServiceImpl implements DescriptionService { //this.deleteOldFilesAndAddNew(datasetWizardModel, userInfo); //TODO this.eventBroker.emit(new DescriptionTouchedEvent(data.getId())); - this.descriptionTouchedIntegrationEventHandler.handle(DescriptionTouchedIntegrationEventHandler.buildEventFromPersistModel(model)); - this.annotationEntityTouchedIntegrationEventHandler.handleDescription(data.getId()); this.elasticService.persistDescription(data); diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/dmp/DmpServiceImpl.java b/dmp-backend/core/src/main/java/eu/eudat/service/dmp/DmpServiceImpl.java index 25d5fd36a..c5734e065 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/service/dmp/DmpServiceImpl.java +++ b/dmp-backend/core/src/main/java/eu/eudat/service/dmp/DmpServiceImpl.java @@ -26,7 +26,6 @@ import eu.eudat.event.DmpTouchedEvent; import eu.eudat.event.EventBroker; import eu.eudat.integrationevent.outbox.annotationentityremoval.AnnotationEntityRemovalIntegrationEventHandler; import eu.eudat.integrationevent.outbox.annotationentitytouch.AnnotationEntityTouchedIntegrationEventHandler; -import eu.eudat.integrationevent.outbox.dmptouched.DmpTouchedIntegrationEventHandler; import eu.eudat.integrationevent.outbox.notification.NotifyIntegrationEvent; import eu.eudat.integrationevent.outbox.notification.NotifyIntegrationEventHandler; import eu.eudat.model.*; @@ -122,7 +121,6 @@ public class DmpServiceImpl implements DmpService { private final ElasticService elasticService; - private final DmpTouchedIntegrationEventHandler dmpTouchedIntegrationEventHandler; private final AnnotationEntityTouchedIntegrationEventHandler annotationEntityTouchedIntegrationEventHandler; private final AnnotationEntityRemovalIntegrationEventHandler annotationEntityRemovalIntegrationEventHandler; @@ -149,7 +147,6 @@ public class DmpServiceImpl implements DmpService { FileTransformerService fileTransformerService, ValidatorFactory validatorFactory, ElasticService elasticService, - DmpTouchedIntegrationEventHandler dmpTouchedIntegrationEventHandler, AnnotationEntityTouchedIntegrationEventHandler annotationEntityTouchedIntegrationEventHandler, AnnotationEntityRemovalIntegrationEventHandler annotationEntityRemovalIntegrationEventHandler, AuthorizationContentResolver authorizationContentResolver) { this.entityManager = entityManager; this.authorizationService = authorizationService; @@ -170,7 +167,6 @@ public class DmpServiceImpl implements DmpService { this.actionConfirmationService = actionConfirmationService; this.validatorFactory = validatorFactory; this.elasticService = elasticService; - this.dmpTouchedIntegrationEventHandler = dmpTouchedIntegrationEventHandler; this.annotationEntityTouchedIntegrationEventHandler = annotationEntityTouchedIntegrationEventHandler; this.annotationEntityRemovalIntegrationEventHandler = annotationEntityRemovalIntegrationEventHandler; this.authorizationContentResolver = authorizationContentResolver; @@ -203,8 +199,6 @@ public class DmpServiceImpl implements DmpService { this.eventBroker.emit(new DmpTouchedEvent(data.getId())); - this.dmpTouchedIntegrationEventHandler.handle(DmpTouchedIntegrationEventHandler.buildEventFromPersistModel(model)); - this.sendNotification(data); this.assignUsers(data.getId(), this.inviteUserOrAssignUsers(data.getId(), model.getUsers(), false), null, false);