Merge branch 'development' into feature/#914-functional-css-and-java-…

…code-for-dialogs

.github/workflows/sonarcloud.yml

@@ -0,0 +1,37 @@
+name: SonarCloud Analysis
+
+# Run this workflow on commits to the development branch
+on:
+  push:
+    branches:
+      - development
+
+jobs:
+  sonarcloud:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+      - name: Load local Maven repository cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+
+      # Build the project using Maven
+      - name: Build with Maven
+        run: mvn clean install
+
+      # Run SonarCloud analysis
+      - name: SonarCloud Scan
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} # Use the token stored in GitHub secrets
+        run: mvn sonar:sonar

pom.xml

@@ -36,6 +36,9 @@
     <jakarta.persistence.version>3.2.0</jakarta.persistence.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jackson.version>2.18.1</jackson.version>
+    <sonar.projectKey>qbicsoftware_data-manager-app</sonar.projectKey>
+    <sonar.organization>qbicsoftware</sonar.organization>
+    <sonar.host.url>https://sonarcloud.io</sonar.host.url>
   </properties>
 
   <parent>
@@ -233,6 +236,11 @@
           <target>${maven.compiler.target}</target>
         </configuration>
       </plugin>
+        <plugin>
+          <groupId>org.sonarsource.scanner.maven</groupId>
+          <artifactId>sonar-maven-plugin</artifactId>
+          <version>5.0.0.4389</version>
+        </plugin>
     </plugins>
   </build>
 </project>

project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/ontology/TIBTerminologyServiceIntegration.java

@@ -164,6 +164,7 @@ public List<OntologyClass> query(String searchTerm, int offset, int limit)
     } catch (IOException e) {
       throw wrapIO(e);
     } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
       throw wrapInterrupted(e);
     } catch (Exception e) {
       throw wrapUnknown(e);
@@ -193,6 +194,7 @@ public List<OntologyClass> search(String searchTerm, int offset, int limit)
     } catch (IOException e) {
       throw wrapIO(e);
     } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
       throw wrapInterrupted(e);
     } catch (Exception e) {
       throw wrapUnknown(e);

project-management/src/main/java/life/qbic/projectmanagement/application/DeletionService.java

@@ -29,7 +29,7 @@
 @Service
 public class DeletionService {
 
-  private ApplicationContext context;
+  private final ApplicationContext context;
 
   private final ProjectInformationService projectInformationService;
   private final ExperimentInformationService experimentInformationService;
@@ -52,6 +52,7 @@ public DeletionService(ProjectInformationService projectInformationService,
         BatchDomainService.class.getSimpleName() + " must not be null");
     this.sampleDomainService = requireNonNull(sampleDomainService,
         SampleDomainService.class.getSimpleName() + " must not be null");
+    this.context = requireNonNull(context);
   }
 
   /**

project-management/src/main/java/life/qbic/projectmanagement/application/measurement/MeasurementService.java

@@ -44,6 +44,7 @@
 import life.qbic.projectmanagement.domain.repository.MeasurementRepository;
 import life.qbic.projectmanagement.domain.service.MeasurementDomainService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.security.access.prepost.PostAuthorize;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -60,6 +61,7 @@
 public class MeasurementService {
 
   private static final Logger log = logger(MeasurementService.class);
+  private final ApplicationContext context;
   private final MeasurementDomainService measurementDomainService;
   private final MeasurementLookupService measurementLookupService;
   private final SampleInformationService sampleInformationService;
@@ -75,14 +77,16 @@ public MeasurementService(MeasurementDomainService measurementDomainService,
       OrganisationLookupService organisationLookupService,
       MeasurementLookupService measurementLookupService,
       ProjectInformationService projectInformationService,
-      MeasurementRepository measurementRepository) {
+      MeasurementRepository measurementRepository,
+      ApplicationContext context) {
     this.measurementDomainService = Objects.requireNonNull(measurementDomainService);
     this.sampleInformationService = Objects.requireNonNull(sampleInformationService);
     this.speciesLookupService = Objects.requireNonNull(speciesLookupService);
     this.organisationLookupService = Objects.requireNonNull(organisationLookupService);
     this.measurementLookupService = Objects.requireNonNull(measurementLookupService);
     this.projectInformationService = Objects.requireNonNull(projectInformationService);
     this.measurementRepository = Objects.requireNonNull(measurementRepository);
+    this.context = Objects.requireNonNull(context);
   }
 
   /**
@@ -113,7 +117,8 @@ public long countNGSMeasurements(ExperimentId experimentId) {
   @PostAuthorize(
       "hasPermission(#projectId, 'life.qbic.projectmanagement.domain.model.project.Project', 'READ') ")
   public Collection<ProteomicsMeasurement> findProteomicsMeasurements(String filter,
-      ExperimentId experimentId, int offset, int limit, List<SortOrder> sortOrder, ProjectId projectId) {
+      ExperimentId experimentId, int offset, int limit, List<SortOrder> sortOrder,
+      ProjectId projectId) {
     var result = sampleInformationService.retrieveSamplesForExperiment(experimentId);
     var samplesInExperiment = result.getValue().stream().map(Sample::sampleId).toList();
     return measurementLookupService.queryProteomicsMeasurementsBySampleIds(filter,
@@ -145,7 +150,8 @@ public Collection<NGSMeasurement> findNGSMeasurements(String filter, ExperimentI
 
   @PostAuthorize(
       "hasPermission(#projectId, 'life.qbic.projectmanagement.domain.model.project.Project', 'READ') ")
-  public Collection<NGSMeasurement> findNGSMeasurements(ExperimentId experimentId, ProjectId projectId) {
+  public Collection<NGSMeasurement> findNGSMeasurements(ExperimentId experimentId,
+      ProjectId projectId) {
     var result = sampleInformationService.retrieveSamplesForExperiment(experimentId);
     var samplesInExperiment = result.getValue().stream().map(Sample::sampleId).toList();
     return measurementLookupService.queryAllNGSMeasurement(samplesInExperiment);
@@ -192,7 +198,7 @@ public CompletableFuture<List<Result<MeasurementId, ErrorCode>>> registerAll(
       return CompletableFuture.completedFuture(List.of(Result.fromError(e.reason)));
     }
     try {
-      results = performRegistration(measurementMetadataList, projectId).stream()
+      results = context.getBean(MeasurementService.class).performRegistration(measurementMetadataList, projectId).stream()
           .map(Result::<MeasurementId, ErrorCode>fromValue).toList();
     } catch (MeasurementRegistrationException e) {
       log.error("Failed to register measurement", e);
@@ -202,7 +208,7 @@ public CompletableFuture<List<Result<MeasurementId, ErrorCode>>> registerAll(
       return CompletableFuture.completedFuture(List.of(Result.fromError(ErrorCode.FAILED)));
     }
     // if the creation worked, we forward the events, otherwise it will be rolled back
-    if(results.stream().allMatch(Result::isValue)) {
+    if (results.stream().allMatch(Result::isValue)) {
       domainEventsCache.forEach(
           domainEvent -> DomainEventDispatcher.instance().dispatch(domainEvent));
     }
@@ -529,21 +535,21 @@ public CompletableFuture<List<Result<MeasurementId, ErrorCode>>> updateAll(
 
   private void handleUpdateEvents(List<DomainEvent> domainEventsCache,
       List<Result<MeasurementId, ErrorCode>> results) {
-    if(results.stream().anyMatch(Result::isError)) {
+    if (results.stream().anyMatch(Result::isError)) {
       return;
     }
     Set<MeasurementId> dispatchedIDs = new HashSet<>();
-    for(DomainEvent event : domainEventsCache) {
-      if(event instanceof MeasurementUpdatedEvent measurementUpdatedEvent) {
+    for (DomainEvent event : domainEventsCache) {
+      if (event instanceof MeasurementUpdatedEvent measurementUpdatedEvent) {
         MeasurementId id = measurementUpdatedEvent.measurementId();
-        if(dispatchedIDs.contains(id)) {
+        if (dispatchedIDs.contains(id)) {
           continue;
         }
         DomainEventDispatcher.instance().dispatch(event);
         dispatchedIDs.add(id);
       }
     }
-   
+
   }
 
   /**
@@ -803,7 +809,7 @@ public Result<Void, MeasurementDeletionException> deletePxPMeasurements(ProjectI
       Set<ProteomicsMeasurement> selectedMeasurements) {
     try {
       measurementDomainService.deletePxP(selectedMeasurements);
-      if(!selectedMeasurements.isEmpty()) {
+      if (!selectedMeasurements.isEmpty()) {
         dispatchProjectChangedOnMeasurementDeleted(projectId);
       }
       return Result.fromValue(null);
@@ -817,7 +823,7 @@ public Result<Void, MeasurementDeletionException> deleteNGSMeasurements(ProjectI
       Set<NGSMeasurement> selectedMeasurements) {
     try {
       measurementDomainService.deleteNGS(selectedMeasurements);
-      if(!selectedMeasurements.isEmpty()) {
+      if (!selectedMeasurements.isEmpty()) {
         dispatchProjectChangedOnMeasurementDeleted(projectId);
       }
       return Result.fromValue(null);
@@ -829,7 +835,8 @@ public Result<Void, MeasurementDeletionException> deleteNGSMeasurements(ProjectI
   private void dispatchProjectChangedOnMeasurementDeleted(ProjectId projectId) {
     ProjectChanged projectChanged = ProjectChanged.create(projectId);
     DomainEventDispatcher.instance().dispatch(projectChanged);
-}
+  }
+
   public enum DeletionErrorCode {
     FAILED, DATA_ATTACHED
   }

user-interface/src/main/java/life/qbic/datamanager/RejectedExecutionHandlerImplementation.java

@@ -38,6 +38,7 @@ public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) {
           "Thread " + Thread.currentThread().getId() + " rejected, because the queue was full.");
       executor.getQueue().put(r);
     } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
       throw new RejectedExecutionException("Unexpected InterruptedException", e);
     }
   }

user-interface/src/main/java/life/qbic/datamanager/views/general/Collapsible.java

@@ -1,9 +1,9 @@
 package life.qbic.datamanager.views.general;
 
 /**
- * <b>Collapsable Element Interface</b>
+ * <b>Collapsible Element Interface</b>
  *
- * <p>Collapsable elements can be collapsed into a concise view representation of an element,
+ * <p>Collapsible elements can be collapsed into a concise view representation of an element,
  * such as e.g. a large text box with information.</p>
  *
  * @since 1.7.0

user-interface/src/main/java/life/qbic/datamanager/views/general/CollapsibleDetails.java

@@ -5,13 +5,13 @@
 import java.util.Objects;
 
 /**
- * <b>Collapsable Details</b>
+ * <b>Collapsible Details</b>
  *
  * <p>Implementation of the {@link Collapsible} interface for the Vaadin component
  * {@link Details}.</p>
  * <p>
  * For the Vaadin {@link Details} component, it would not be necessary to provide a wrapper object. However
- * the interface gives a lot of flexibility to add collapsable elements wrapping other custom
+ * the interface gives a lot of flexibility to add collapsible elements wrapping other custom
  * components while exposing a unified behaviour.
  * <p>
  * Also we favor a more declarative and readable object API, like {@link #collapse()} or {@link #expand() } over

user-interface/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/ExperimentDetailsComponent.java

@@ -603,11 +603,12 @@ private void addExperimentalVariables(
   }
 
   public void setContext(Context context) {
+    this.context = requireNonNull(context);
+    if (context.projectId().isEmpty()) {
+      throw new ApplicationException("no project id in context " + context);
+    }
     ExperimentId experimentId = context.experimentId()
         .orElseThrow(() -> new ApplicationException("no experiment id in context " + context));
-    context.projectId()
-        .orElseThrow(() -> new ApplicationException("no project id in context " + context));
-    this.context = context;
     reloadExperimentInfo(experimentId);
   }
 

user-interface/src/main/java/life/qbic/datamanager/views/projects/project/info/ProjectSummaryComponent.java

@@ -489,16 +489,16 @@ private void buildDesignSection(ProjectOverview projectInformation, Project proj
     var objective = new SimpleParagraph(project.getProjectIntent().objective().objective());
     details.setSummary(objectiveTitle);
     details.add(objective);
-    var collapsableDetails = new CollapsibleDetails(details);
-    collapsableDetails.collapse();
-    collapsableDetails.addClassNames("background-color-grey", "padding-left-01", "padding-right-01",
+    var collapsibleDetails = new CollapsibleDetails(details);
+    collapsibleDetails.collapse();
+    collapsibleDetails.addClassNames("background-color-grey", "padding-left-01", "padding-right-01",
         "line-height-01", "max-width-55rem", "text-justify", "box-corner-radius-small");
 
     content.add(
         Heading.withIconAndText(VaadinIcon.NOTEBOOK.create(), "Project ID and Title"));
     content.add(new SimpleParagraph("%s - %s".formatted(projectInformation.projectCode(),
         projectInformation.projectTitle())));
-    content.add(collapsableDetails);
+    content.add(collapsibleDetails);
     projectDesignSection.setContent(content);
   }