[WIP] Test generic design

monitor-commons/src/main/java/org/gridsuite/monitor/commons/types/processconfig/ProcessConfig.java

@@ -27,4 +27,6 @@ public interface ProcessConfig {
     ProcessType processType();
 
     List<UUID> modificationUuids();
+
+    List<ProcessConfigFieldComparison> compareWith(ProcessConfig other);
 }

monitor-server/src/main/java/org/gridsuite/monitor/server/dto/processconfig/ProcessConfigFieldComparison.java → monitor-commons/src/main/java/org/gridsuite/monitor/commons/types/processconfig/ProcessConfigFieldComparison.java

@@ -4,14 +4,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.gridsuite.monitor.server.dto.processconfig;
-
-import io.swagger.v3.oas.annotations.media.Schema;
+package org.gridsuite.monitor.commons.types.processconfig;
 
 /**
  * @author Franck Lecuyer <franck.lecuyer at rte-france.com>
  */
-@Schema(description = "Field comparison result")
 public record ProcessConfigFieldComparison(
     String field,
     boolean identical,

monitor-commons/src/main/java/org/gridsuite/monitor/commons/types/processconfig/SecurityAnalysisConfig.java

@@ -9,6 +9,7 @@
 import org.gridsuite.monitor.commons.types.processexecution.ProcessType;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 
 /**
@@ -23,4 +24,20 @@ public record SecurityAnalysisConfig(
     public ProcessType processType() {
         return ProcessType.SECURITY_ANALYSIS;
     }
+
+    @Override
+    public List<ProcessConfigFieldComparison> compareWith(ProcessConfig other) {
+        SecurityAnalysisConfig o = (SecurityAnalysisConfig) other;
+        return List.of(
+            new ProcessConfigFieldComparison("modifications",
+                Objects.equals(modificationUuids, o.modificationUuids),
+                modificationUuids, o.modificationUuids),
+            new ProcessConfigFieldComparison("securityAnalysisParameters",
+                Objects.equals(securityAnalysisParametersUuid, o.securityAnalysisParametersUuid),
+                securityAnalysisParametersUuid, o.securityAnalysisParametersUuid),
+            new ProcessConfigFieldComparison("loadflowParameters",
+                Objects.equals(loadflowParametersUuid, o.loadflowParametersUuid),
+                loadflowParametersUuid, o.loadflowParametersUuid)
+        );
+    }
 }

monitor-server/src/main/java/org/gridsuite/monitor/server/dto/processconfig/ProcessConfigComparison.java

@@ -7,6 +7,7 @@
 package org.gridsuite.monitor.server.dto.processconfig;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import org.gridsuite.monitor.commons.types.processconfig.ProcessConfigFieldComparison;
 
 import java.util.List;
 import java.util.UUID;

monitor-server/src/main/java/org/gridsuite/monitor/server/entities/processconfig/ProcessConfigEntity.java → monitor-server/src/main/java/org/gridsuite/monitor/server/entities/processconfig/AbstractProcessConfigEntity.java

@@ -8,11 +8,8 @@
 
 import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;
-import jakarta.persistence.DiscriminatorColumn;
 import jakarta.persistence.ElementCollection;
 import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
@@ -32,20 +29,17 @@
 import java.util.List;
 import java.util.UUID;
 
-import static jakarta.persistence.DiscriminatorType.STRING;
-
 /**
  * @author Franck Lecuyer <franck.lecuyer at rte-france.com>
  */
 @Entity
 @Table(name = "process_config")
 @Inheritance(strategy = InheritanceType.JOINED)
-@DiscriminatorColumn(name = "process_type", discriminatorType = STRING)
 @NoArgsConstructor
 @AllArgsConstructor
 @Getter
 @Setter
-public class ProcessConfigEntity {
+public abstract class AbstractProcessConfigEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "id")
@@ -59,9 +53,7 @@ public class ProcessConfigEntity {
     @OrderColumn(name = "pos_modifications")
     private List<UUID> modificationUuids;
 
-    @Enumerated(EnumType.STRING)
-    @Column(name = "process_type", insertable = false, updatable = false)
-    private ProcessType processType;
+    public abstract ProcessType getProcessType();
 }
 
 

monitor-server/src/main/java/org/gridsuite/monitor/server/entities/processconfig/SecurityAnalysisConfigEntity.java

@@ -7,7 +7,6 @@
 package org.gridsuite.monitor.server.entities.processconfig;
 
 import jakarta.persistence.Column;
-import jakarta.persistence.DiscriminatorValue;
 import jakarta.persistence.Entity;
 import jakarta.persistence.ForeignKey;
 import jakarta.persistence.PrimaryKeyJoinColumn;
@@ -16,6 +15,7 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.gridsuite.monitor.commons.types.processexecution.ProcessType;
 
 import java.util.UUID;
 
@@ -24,16 +24,20 @@
  */
 @Entity
 @Table(name = "security_analysis_config")
-@DiscriminatorValue("SECURITY_ANALYSIS")
 @PrimaryKeyJoinColumn(foreignKey = @ForeignKey(name = "securityAnalysisConfig_id_fk_constraint"))
 @NoArgsConstructor
 @AllArgsConstructor
 @Getter
 @Setter
-public class SecurityAnalysisConfigEntity extends ProcessConfigEntity {
+public class SecurityAnalysisConfigEntity extends AbstractProcessConfigEntity {
     @Column(name = "security_analysis_parameters_uuid")
     private UUID securityAnalysisParametersUuid;
 
     @Column(name = "loadflow_parameters_uuid")
     private UUID loadflowParametersUuid;
+
+    @Override
+    public ProcessType getProcessType() {
+        return ProcessType.SECURITY_ANALYSIS;
+    }
 }

monitor-server/src/main/java/org/gridsuite/monitor/server/mappers/processconfig/SecurityAnalysisConfigMapper.java

@@ -17,10 +17,11 @@
  */
 @Mapper(componentModel = "spring")
 public interface SecurityAnalysisConfigMapper {
-    @Mapping(target = "processType", expression = "java(dto.processType())")
+    @Mapping(target = "id", ignore = true)
     SecurityAnalysisConfigEntity toEntity(SecurityAnalysisConfig dto);
 
     SecurityAnalysisConfig toDto(SecurityAnalysisConfigEntity dto);
 
+    @Mapping(target = "id", ignore = true)
     void updateEntityFromDto(SecurityAnalysisConfig dto, @MappingTarget SecurityAnalysisConfigEntity entity);
 }

monitor-server/src/main/java/org/gridsuite/monitor/server/repositories/ProcessConfigRepository.java → monitor-server/src/main/java/org/gridsuite/monitor/server/repositories/processconfig/ProcessConfigRepository.java

@@ -4,20 +4,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.gridsuite.monitor.server.repositories;
+package org.gridsuite.monitor.server.repositories.processconfig;
 
-import org.gridsuite.monitor.commons.types.processexecution.ProcessType;
-import org.gridsuite.monitor.server.entities.processconfig.ProcessConfigEntity;
+import org.gridsuite.monitor.server.entities.processconfig.AbstractProcessConfigEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import java.util.List;
 import java.util.UUID;
 
 /**
  * @author Franck Lecuyer <franck.lecuyer at rte-france.com>
  */
 @Repository
-public interface ProcessConfigRepository extends JpaRepository<ProcessConfigEntity, UUID> {
-    List<ProcessConfigEntity> findAllByProcessType(ProcessType processType);
+public interface ProcessConfigRepository extends JpaRepository<AbstractProcessConfigEntity, UUID> {
 }

monitor-server/src/main/java/org/gridsuite/monitor/server/repositories/processconfig/SecurityAnalysisProcessConfigRepository.java

@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2026, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.gridsuite.monitor.server.repositories.processconfig;
+
+import org.gridsuite.monitor.server.entities.processconfig.SecurityAnalysisConfigEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.UUID;
+
+/**
+ * @author Antoine Bouhours <antoine.bouhours at rte-france.com>
+ */
+@Repository
+public interface SecurityAnalysisProcessConfigRepository extends JpaRepository<SecurityAnalysisConfigEntity, UUID> {
+}

monitor-server/src/main/java/org/gridsuite/monitor/server/repositories/ProcessExecutionRepository.java → monitor-server/src/main/java/org/gridsuite/monitor/server/repositories/processexecution/ProcessExecutionRepository.java

@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.gridsuite.monitor.server.repositories;
+package org.gridsuite.monitor.server.repositories.processexecution;
 
 import org.gridsuite.monitor.server.entities.processexecution.ProcessExecutionEntity;
 import org.springframework.data.jpa.repository.JpaRepository;

monitor-server/src/main/java/org/gridsuite/monitor/server/services/processconfig/ProcessConfigHandler.java

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2026, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.gridsuite.monitor.server.services.processconfig;
+
+import org.gridsuite.monitor.commons.types.processconfig.ProcessConfig;
+import org.gridsuite.monitor.commons.types.processexecution.ProcessType;
+import org.gridsuite.monitor.server.entities.processconfig.AbstractProcessConfigEntity;
+
+import java.util.List;
+
+/**
+ * @author Antoine Bouhours <antoine.bouhours at rte-france.com>
+ */
+public interface ProcessConfigHandler<C extends ProcessConfig, E extends AbstractProcessConfigEntity> {
+
+    ProcessType getProcessType();
+
+    E toEntity(C config);
+
+    C toDto(E entity);
+
+    void updateEntity(C config, E entity);
+
+    List<E> findAll();
+}