[4444] Allow multiple implementation of IEditingContextSaver & IEditi… #4445
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2025 Obeo. | ||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License v2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * Obeo - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.sirius.web.application.editingcontext.services; | ||
|
|
||
| import io.micrometer.core.instrument.MeterRegistry; | ||
| import io.micrometer.core.instrument.Timer; | ||
| import org.eclipse.sirius.components.core.api.IEditingContext; | ||
| import org.eclipse.sirius.components.core.api.IEditingContextSearchService; | ||
| import org.eclipse.sirius.components.emf.services.api.IEMFEditingContext; | ||
| import org.eclipse.sirius.components.events.ICause; | ||
| import org.eclipse.sirius.web.application.UUIDParser; | ||
| import org.eclipse.sirius.web.application.editingcontext.services.api.IEditingContextMigrationParticipantPredicate; | ||
| import org.eclipse.sirius.web.application.editingcontext.services.api.IEditingContextPersistenceFilter; | ||
| import org.eclipse.sirius.web.application.editingcontext.services.api.IEditingContextSaver; | ||
| import org.eclipse.sirius.web.application.editingcontext.services.api.IResourceToDocumentService; | ||
| import org.eclipse.sirius.web.domain.boundedcontexts.project.Project; | ||
| import org.eclipse.sirius.web.domain.boundedcontexts.semanticdata.Document; | ||
| import org.eclipse.sirius.web.domain.boundedcontexts.semanticdata.services.api.ISemanticDataSearchService; | ||
| import org.eclipse.sirius.web.domain.boundedcontexts.semanticdata.services.api.ISemanticDataUpdateService; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
| import org.springframework.data.jdbc.core.mapping.AggregateReference; | ||
| import org.springframework.stereotype.Service; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| import java.util.LinkedHashSet; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.Optional; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| /** | ||
| * Used to save an editing context. | ||
| * | ||
| * @author mcharfadi | ||
| */ | ||
| @Service | ||
| public class EditingContextSaver implements IEditingContextSaver { | ||
|
|
||
| private static final String TIMER_NAME = "siriusweb_editingcontext_save"; | ||
|
|
||
| private final ISemanticDataUpdateService semanticDataUpdateService; | ||
|
|
||
| private final IResourceToDocumentService resourceToDocumentService; | ||
|
|
||
| private final List<IEditingContextPersistenceFilter> persistenceFilters; | ||
|
|
||
| private final List<IEditingContextMigrationParticipantPredicate> migrationParticipantPredicates; | ||
|
|
||
| private final ISemanticDataSearchService semanticDataSearchService; | ||
|
|
||
| private final Timer timer; | ||
|
|
||
| private final Logger logger = LoggerFactory.getLogger(EditingContextSaver.class); | ||
|
|
||
| public EditingContextSaver(ISemanticDataUpdateService semanticDataUpdateService, IResourceToDocumentService resourceToDocumentService, IEditingContextSearchService editingContextSearchService, List<IEditingContextPersistenceFilter> persistenceFilters, List<IEditingContextMigrationParticipantPredicate> migrationParticipantPredicates, ISemanticDataSearchService semanticDataSearchService, MeterRegistry meterRegistry) { | ||
| this.semanticDataUpdateService = Objects.requireNonNull(semanticDataUpdateService); | ||
| this.resourceToDocumentService = Objects.requireNonNull(resourceToDocumentService); | ||
| this.persistenceFilters = Objects.requireNonNull(persistenceFilters); | ||
| this.migrationParticipantPredicates = Objects.requireNonNull(migrationParticipantPredicates); | ||
| this.semanticDataSearchService = Objects.requireNonNull(semanticDataSearchService); | ||
| this.timer = Timer.builder(TIMER_NAME).register(meterRegistry); | ||
| } | ||
|
|
||
| @Transactional | ||
| @Override | ||
| public void save(ICause cause, IEditingContext editingContext) { | ||
| long start = System.currentTimeMillis(); | ||
|
|
||
| if (editingContext instanceof IEMFEditingContext emfEditingContext) { | ||
| var applyMigrationParticipants = this.migrationParticipantPredicates.stream().anyMatch(predicate -> predicate.test(emfEditingContext.getId())); | ||
| AggregateReference<Project, String> projectId = AggregateReference.to(editingContext.getId()); | ||
|
|
||
| var documentData = emfEditingContext.getDomain().getResourceSet().getResources().stream() | ||
| .filter(resource -> IEMFEditingContext.RESOURCE_SCHEME.equals(resource.getURI().scheme())) | ||
| .filter(resource -> this.persistenceFilters.stream().allMatch(filter -> filter.shouldPersist(resource))) | ||
| .map(resource -> this.resourceToDocumentService.toDocument(resource, applyMigrationParticipants)) | ||
| .flatMap(Optional::stream) | ||
| .collect(Collectors.toSet()); | ||
|
|
||
| var documents = new LinkedHashSet<Document>(); | ||
| var domainUris = new LinkedHashSet<String>(); | ||
|
|
||
| documentData.forEach(data -> { | ||
| documents.add(data.document()); | ||
| domainUris.addAll(data.ePackageEntries().stream().map(EPackageEntry::nsURI).toList()); | ||
| }); | ||
|
|
||
| this.semanticDataSearchService.findByProject(projectId).ifPresent(semanticData -> { | ||
| this.semanticDataUpdateService.updateDocuments(cause, semanticData.getId(), documents, domainUris); | ||
| }); | ||
|
|
||
| } | ||
|
|
||
| long end = System.currentTimeMillis(); | ||
| this.timer.record(end - start, TimeUnit.MILLISECONDS); | ||
|
|
||
| this.logger.atDebug() | ||
| .setMessage("EditingContext {}: {}ms to persist the semantic data") | ||
| .addArgument(editingContext.getId()) | ||
| .addArgument(() -> String.format("%1$6s", end - start)) | ||
| .log(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean canHandle(IEditingContext editingContext) { | ||
| return editingContext instanceof IEMFEditingContext && new UUIDParser().parse(editingContext.getId()).isPresent(); | ||
|
There was a problem hiding this comment. Why parse the editing context id? Something like in the default editing context loader should work There was a problem hiding this comment. Since all projectId are currently UUID I tought it would be nice to test before questioning the database. |
||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to figure out if the editing context exists, why remove that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The editingContext does not exist at this point we just assume that it will exist if a project exists.
So since the new editingContext does not match an existing project with this implementation, I'm not sure how to test this.