Merge branch 'main' into add-version-in-logs

Author: EtienneLt

pom.xml

@@ -19,7 +19,7 @@
 
     <groupId>org.gridsuite</groupId>
     <artifactId>gridsuite-filter</artifactId>
-    <version>1.11.0-SNAPSHOT</version>
+    <version>1.13.0-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>Filter library</name>
@@ -149,6 +149,11 @@
             <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-iidm-test</artifactId>

src/main/java/org/gridsuite/filter/AbstractFilter.java

@@ -8,7 +8,9 @@
 
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import org.gridsuite.filter.expertfilter.ExpertFilter;
 import org.gridsuite.filter.identifierlistfilter.FilterEquipments;
@@ -43,7 +45,7 @@ public abstract class AbstractFilter implements IFilterAttributes {
 
     private UUID id;
 
-    private Date modificationDate;
+    private Date modificationDate; // TODO use Instant like in servers (client not on same timezone than server)
 
     private EquipmentType equipmentType;
 

src/main/java/org/gridsuite/filter/IFilterAttributes.java

@@ -10,13 +10,16 @@
 import org.gridsuite.filter.utils.EquipmentType;
 import org.gridsuite.filter.utils.FilterType;
 
+import java.util.Date;
+import java.util.UUID;
+
 /**
  * @author Jacques Borsenberger <jacques.borsenberger at rte-france.com>
  */
 public interface IFilterAttributes {
-    java.util.UUID getId();
+    UUID getId();
 
-    java.util.Date getModificationDate();
+    Date getModificationDate(); // TODO use Instant like in servers (client not on same timezone than server)
 
     FilterType getType();
 

src/main/java/org/gridsuite/filter/exception/InvalidEquipmentType.java

@@ -0,0 +1,7 @@
+package org.gridsuite.filter.exception;
+
+import lombok.experimental.StandardException;
+
+@StandardException
+public class InvalidEquipmentType extends RuntimeException {
+}

src/main/java/org/gridsuite/filter/exception/UnknownFilterType.java

@@ -0,0 +1,7 @@
+package org.gridsuite.filter.exception;
+
+import lombok.experimental.StandardException;
+
+@StandardException
+public class UnknownFilterType extends RuntimeException {
+}

src/main/java/org/gridsuite/filter/expertfilter/ExpertFilter.java

@@ -8,10 +8,7 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.powsybl.iidm.network.TopologyKind;
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.SuperBuilder;
 import org.gridsuite.filter.AbstractFilter;
 import org.gridsuite.filter.expertfilter.expertrule.AbstractExpertRule;
@@ -24,11 +21,11 @@
 /**
  * @author Antoine Bouhours <antoine.bouhours at rte-france.com>
  */
-@Getter
-@Setter
 @SuperBuilder
 @NoArgsConstructor
+@Data
 @EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class ExpertFilter extends AbstractFilter {
 
     private AbstractExpertRule rules;

src/main/java/org/gridsuite/filter/expertfilter/expertrule/AbstractExpertRule.java

@@ -12,9 +12,8 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.powsybl.iidm.network.Identifiable;
 import lombok.AllArgsConstructor;
-import lombok.Getter;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 import org.gridsuite.filter.FilterLoader;
 import org.gridsuite.filter.identifierlistfilter.FilterEquipments;
@@ -46,8 +45,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @NoArgsConstructor
 @AllArgsConstructor
-@Getter
-@Setter
+@Data
 @SuperBuilder
 public abstract class AbstractExpertRule {
 

src/main/java/org/gridsuite/filter/expertfilter/expertrule/BooleanExpertRule.java

@@ -9,10 +9,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.powsybl.commons.PowsyblException;
 import com.powsybl.iidm.network.Identifiable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.SuperBuilder;
 import org.gridsuite.filter.FilterLoader;
 import org.gridsuite.filter.identifierlistfilter.FilterEquipments;
@@ -30,8 +27,9 @@
  */
 @AllArgsConstructor
 @NoArgsConstructor
-@Getter
-@Setter
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 @SuperBuilder
 public class BooleanExpertRule extends AbstractExpertRule {
     private Boolean value;

src/main/java/org/gridsuite/filter/expertfilter/expertrule/CombinatorExpertRule.java

@@ -9,7 +9,10 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.powsybl.commons.PowsyblException;
 import com.powsybl.iidm.network.Identifiable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 import org.gridsuite.filter.FilterLoader;
 import org.gridsuite.filter.identifierlistfilter.FilterEquipments;
@@ -23,6 +26,9 @@
  * @author Antoine Bouhours <antoine.bouhours at rte-france.com>
  */
 @NoArgsConstructor
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 @SuperBuilder
 public class CombinatorExpertRule extends AbstractExpertRule {
     @Override

src/main/java/org/gridsuite/filter/expertfilter/expertrule/EnumExpertRule.java

@@ -9,7 +9,10 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.powsybl.commons.PowsyblException;
 import com.powsybl.iidm.network.Identifiable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 import org.gridsuite.filter.FilterLoader;
 import org.gridsuite.filter.identifierlistfilter.FilterEquipments;
@@ -24,6 +27,9 @@
  * @author Antoine Bouhours <antoine.bouhours at rte-france.com>
  */
 @NoArgsConstructor
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 @SuperBuilder
 public class EnumExpertRule extends StringExpertRule {
     @Override