Skip to content

Commit 54d9d52

Browse files
Move GlobalFilter related utility functions to filter-lib
1 parent bf89274 commit 54d9d52

File tree

4 files changed

+24
-331
lines changed

4 files changed

+24
-331
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<powsybl-ws-dependencies.version>2.23.0</powsybl-ws-dependencies.version>
4646
<powsybl-ws-commons.version>1.28.1</powsybl-ws-commons.version>
4747

48-
<gridsuite-filter.version>1.6.0</gridsuite-filter.version>
48+
<gridsuite-filter.version>1.8.0-SNAPSHOT</gridsuite-filter.version>
4949

5050
<org-apache-commons.version>4.4</org-apache-commons.version>
5151
<org.hamcrest.version>2.2</org.hamcrest.version>

src/main/java/org/gridsuite/computation/dto/GlobalFilter.java

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,22 @@
66
*/
77
package org.gridsuite.computation.dto;
88

9-
import com.powsybl.iidm.network.Country;
109
import com.powsybl.security.LimitViolationType;
1110
import lombok.AllArgsConstructor;
12-
import lombok.Builder;
1311
import lombok.Getter;
1412
import lombok.NoArgsConstructor;
15-
import lombok.experimental.FieldNameConstants;
13+
import lombok.experimental.SuperBuilder;
1614

1715
import java.util.List;
18-
import java.util.Map;
19-
import java.util.UUID;
2016

2117
/**
2218
* @author maissa Souissi <maissa.souissi at rte-france.com>
2319
*/
2420
@Getter
25-
@Builder
21+
@SuperBuilder
2622
@AllArgsConstructor
2723
@NoArgsConstructor
28-
@FieldNameConstants
29-
public class GlobalFilter {
30-
List<String> nominalV;
31-
32-
List<Country> countryCode;
33-
34-
List<UUID> genericFilter;
35-
36-
List<LimitViolationType> limitViolationsTypes;
37-
38-
Map<String, List<String>> substationProperty;
24+
public class GlobalFilter extends org.gridsuite.filter.globalfilter.GlobalFilter {
25+
// TODO move it to filterparameters in loadflow-server or manage it in server endpoint
26+
private List<LimitViolationType> limitViolationsTypes;
3927
}

0 commit comments

Comments
 (0)