Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Organize files by filter type #75

Merged
merged 33 commits into from
Nov 8, 2023
Merged

Organize files by filter type #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
d2263bc
Add expert filter feature
antoinebhs Oct 4, 2023
e8504d2
Improve Test coverage and fix code smell.
antoinebhs Oct 16, 2023
b3d7043
Improve Test coverage and fix code smell.
antoinebhs Oct 16, 2023
21c6421
Fix copyrights
antoinebhs Oct 17, 2023
ae88e31
Improve exception messages.
antoinebhs Oct 17, 2023
8e3fa9a
Add name to foreign key. Use EnumType.STRING.
antoinebhs Oct 18, 2023
1dd4108
Ignore case for string filter.
antoinebhs Oct 23, 2023
7e0b861
Organize files by filter type.
antoinebhs Nov 2, 2023
b9debcd
Merge branch 'main' into expert-filter
antoinebhs Nov 2, 2023
21a1c39
Code improvement
antoinebhs Nov 2, 2023
9bb8211
Merge remote-tracking branch 'origin/expert-filter' into expert-filter
antoinebhs Nov 2, 2023
32f312b
Code improvement
antoinebhs Nov 2, 2023
3388550
Code improvement
antoinebhs Nov 2, 2023
f543063
Merge branch 'expert-filter' of https://github.com/gridsuite/filter-s…
antoinebhs Nov 2, 2023
fab7c75
Fix code smell
antoinebhs Nov 2, 2023
4467186
Fix code smell
antoinebhs Nov 2, 2023
000ae5c
Fix code ducplication
antoinebhs Nov 2, 2023
0235f8e
Use visitor pattern suggested by Thang
antoinebhs Nov 2, 2023
6a170da
Merge branch 'expert-filter' of https://github.com/gridsuite/filter-s…
antoinebhs Nov 2, 2023
3fb9daa
Move to repositoriesproxies to repositories.proxies
antoinebhs Nov 2, 2023
ba8e65e
Merge branch 'main' into organize-by-filter
antoinebhs Nov 2, 2023
b74aa34
fix merge
antoinebhs Nov 2, 2023
7efb0aa
Refactor line and transformer filter entities
antoinebhs Nov 7, 2023
1402a2a
Refactor line and transformer filter entities
antoinebhs Nov 7, 2023
6fb2934
Merge branch 'refactor-line-transformer-entities' of https://github.c…
antoinebhs Nov 7, 2023
b8c5d46
Merge branch 'refactor-line-transformer-entities' of https://github.c…
antoinebhs Nov 7, 2023
7651ddf
Merge branch 'refactor-line-transformer-entities' of https://github.c…
antoinebhs Nov 7, 2023
5bcc1c1
Add test
antoinebhs Nov 7, 2023
e4ae602
Add test
antoinebhs Nov 7, 2023
3864019
Add test
antoinebhs Nov 7, 2023
0490fe7
Merge branch 'refactor-line-transformer-entities' of https://github.c…
antoinebhs Nov 7, 2023
aef44f8
Merge branch 'refactor-line-transformer-entities' of https://github.c…
antoinebhs Nov 7, 2023
197b7ad
Merge
antoinebhs Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/org/gridsuite/filter/server/FilterController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.gridsuite.filter.server.dto.AbstractFilter;
import org.gridsuite.filter.server.dto.FilterEquipments;
import org.gridsuite.filter.server.dto.identifierlistfilter.FilterEquipments;
import org.gridsuite.filter.server.dto.IFilterAttributes;
import org.gridsuite.filter.server.dto.IdentifiableAttributes;
import org.gridsuite.filter.server.dto.identifierlistfilter.IdentifiableAttributes;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
Expand Down
23 changes: 20 additions & 3 deletions src/main/java/org/gridsuite/filter/server/FilterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,26 @@
import com.powsybl.commons.PowsyblException;
import com.powsybl.iidm.network.*;
import com.powsybl.network.store.client.NetworkStoreService;
import org.gridsuite.filter.server.dto.*;
import org.gridsuite.filter.server.dto.AbstractFilter;
import org.gridsuite.filter.server.dto.IFilterAttributes;
import org.gridsuite.filter.server.dto.criteriafilter.*;
import org.gridsuite.filter.server.dto.expertfilter.ExpertFilter;
import org.gridsuite.filter.server.dto.identifierlistfilter.FilterEquipments;
import org.gridsuite.filter.server.dto.identifierlistfilter.IdentifiableAttributes;
import org.gridsuite.filter.server.dto.identifierlistfilter.IdentifierListFilter;
import org.gridsuite.filter.server.dto.identifierlistfilter.IdentifierListFilterEquipmentAttributes;
import org.gridsuite.filter.server.dto.scriptfilter.ScriptFilter;
import org.gridsuite.filter.server.entities.AbstractFilterEntity;
import org.gridsuite.filter.server.repositories.*;
import org.gridsuite.filter.server.repositories.FilterRepository;
import org.gridsuite.filter.server.repositories.criteriafilter.*;
import org.gridsuite.filter.server.repositories.expertfilter.ExpertFilterRepository;
import org.gridsuite.filter.server.repositories.identifierlistfilter.IdentifierListFilterRepository;
import org.gridsuite.filter.server.repositories.proxies.AbstractFilterRepositoryProxy;
import org.gridsuite.filter.server.repositories.proxies.criteriafilter.*;
import org.gridsuite.filter.server.repositories.proxies.expertfiler.ExpertFilterRepositoryProxy;
import org.gridsuite.filter.server.repositories.proxies.identifierlistfilter.IdentifierListFilterRepositoryProxy;
import org.gridsuite.filter.server.repositories.proxies.scriptfilter.ScriptFilterRepositoryProxy;
import org.gridsuite.filter.server.repositories.scriptfilter.ScriptFilterRepository;
import org.gridsuite.filter.server.utils.EquipmentType;
import org.gridsuite.filter.server.utils.FilterType;
import org.gridsuite.filter.server.utils.FiltersUtils;
Expand All @@ -26,7 +43,7 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static org.gridsuite.filter.server.AbstractFilterRepositoryProxy.WRONG_FILTER_TYPE;
import static org.gridsuite.filter.server.repositories.proxies.AbstractFilterRepositoryProxy.WRONG_FILTER_TYPE;

/**
* @author Jacques Borsenberger <jacques.borsenberger at rte-france.com>
Expand Down
23 changes: 12 additions & 11 deletions src/main/java/org/gridsuite/filter/server/FiltersToGroovyScript.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,19 @@

import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.gridsuite.filter.server.dto.AbstractEquipmentFilterForm;
import org.gridsuite.filter.server.dto.criteriafilter.AbstractEquipmentFilterForm;
import org.gridsuite.filter.server.dto.AbstractFilter;
import org.gridsuite.filter.server.dto.AbstractInjectionFilter;
import org.gridsuite.filter.server.dto.CriteriaFilter;
import org.gridsuite.filter.server.dto.GeneratorFilter;
import org.gridsuite.filter.server.dto.HvdcLineFilter;
import org.gridsuite.filter.server.dto.LineFilter;
import org.gridsuite.filter.server.dto.NumericalFilter;
import org.gridsuite.filter.server.dto.SubstationFilter;
import org.gridsuite.filter.server.dto.ThreeWindingsTransformerFilter;
import org.gridsuite.filter.server.dto.TwoWindingsTransformerFilter;
import org.gridsuite.filter.server.dto.VoltageLevelFilter;
import org.gridsuite.filter.server.dto.criteriafilter.AbstractInjectionFilter;
import org.gridsuite.filter.server.dto.criteriafilter.CriteriaFilter;
import org.gridsuite.filter.server.dto.criteriafilter.GeneratorFilter;
import org.gridsuite.filter.server.dto.criteriafilter.HvdcLineFilter;
import org.gridsuite.filter.server.dto.criteriafilter.LineFilter;
import org.gridsuite.filter.server.dto.criteriafilter.NumericalFilter;
import org.gridsuite.filter.server.dto.criteriafilter.SubstationFilter;
import org.gridsuite.filter.server.dto.criteriafilter.ThreeWindingsTransformerFilter;
import org.gridsuite.filter.server.dto.criteriafilter.TwoWindingsTransformerFilter;
import org.gridsuite.filter.server.dto.criteriafilter.VoltageLevelFilter;
import org.gridsuite.filter.server.repositories.proxies.AbstractFilterRepositoryProxy;
import org.gridsuite.filter.server.utils.RangeType;
import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
Expand Down
6 changes: 6 additions & 0 deletions src/main/java/org/gridsuite/filter/server/dto/AbstractFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import lombok.*;
import lombok.experimental.SuperBuilder;
import org.gridsuite.filter.server.dto.criteriafilter.CriteriaFilter;
import org.gridsuite.filter.server.dto.expertfilter.ExpertFilter;
import org.gridsuite.filter.server.dto.identifierlistfilter.FilterEquipments;
import org.gridsuite.filter.server.dto.identifierlistfilter.IdentifiableAttributes;
import org.gridsuite.filter.server.dto.identifierlistfilter.IdentifierListFilter;
import org.gridsuite.filter.server.dto.scriptfilter.ScriptFilter;
import org.gridsuite.filter.server.utils.EquipmentType;

import java.util.Date;
Expand Down
6 changes: 4 additions & 2 deletions ...rver/dto/AbstractEquipmentFilterForm.java → ...iafilter/AbstractEquipmentFilterForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Getter;
Expand Down
2 changes: 1 addition & 1 deletion ...r/server/dto/AbstractInjectionFilter.java → ...iteriafilter/AbstractInjectionFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.swagger.v3.oas.annotations.media.Schema;
Expand Down
2 changes: 1 addition & 1 deletion ...filter/server/dto/AbstractLineFilter.java → ...to/criteriafilter/AbstractLineFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.swagger.v3.oas.annotations.media.Schema;
Expand Down
2 changes: 1 addition & 1 deletion ...server/dto/AbstractTransformerFilter.java → ...eriafilter/AbstractTransformerFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.swagger.v3.oas.annotations.media.Schema;
Expand Down
2 changes: 1 addition & 1 deletion ...uite/filter/server/dto/BatteryFilter.java → ...ver/dto/criteriafilter/BatteryFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
Expand Down
2 changes: 1 addition & 1 deletion ...ilter/server/dto/BusBarSectionFilter.java → ...o/criteriafilter/BusBarSectionFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
Expand Down
3 changes: 2 additions & 1 deletion ...ite/filter/server/dto/CriteriaFilter.java → ...er/dto/criteriafilter/CriteriaFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
* 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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.SuperBuilder;
import org.gridsuite.filter.server.dto.AbstractFilter;
import org.gridsuite.filter.server.utils.EquipmentType;
import org.gridsuite.filter.server.utils.FilterType;

Expand Down
2 changes: 1 addition & 1 deletion ...filter/server/dto/DanglingLineFilter.java → ...to/criteriafilter/DanglingLineFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
Expand Down
2 changes: 1 addition & 1 deletion ...te/filter/server/dto/GeneratorFilter.java → ...r/dto/criteriafilter/GeneratorFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import com.powsybl.iidm.network.EnergySource;
import io.swagger.v3.oas.annotations.media.Schema;
Expand Down
2 changes: 1 addition & 1 deletion ...ite/filter/server/dto/HvdcLineFilter.java → ...er/dto/criteriafilter/HvdcLineFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
Expand Down
2 changes: 1 addition & 1 deletion ...server/dto/InjectionFilterAttributes.java → ...eriafilter/InjectionFilterAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

package org.gridsuite.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
Expand Down
2 changes: 1 addition & 1 deletion ...server/dto/LccConverterStationFilter.java → ...eriafilter/LccConverterStationFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
Expand Down
2 changes: 1 addition & 1 deletion ...idsuite/filter/server/dto/LineFilter.java → ...server/dto/criteriafilter/LineFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
Expand Down
2 changes: 1 addition & 1 deletion ...idsuite/filter/server/dto/LoadFilter.java → ...server/dto/criteriafilter/LoadFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
Expand Down
2 changes: 1 addition & 1 deletion ...te/filter/server/dto/NumericalFilter.java → ...r/dto/criteriafilter/NumericalFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import lombok.*;
import org.gridsuite.filter.server.utils.RangeType;
Expand Down
2 changes: 1 addition & 1 deletion ...er/server/dto/ShuntCompensatorFilter.java → ...riteriafilter/ShuntCompensatorFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
Expand Down
2 changes: 1 addition & 1 deletion ...erver/dto/StaticVarCompensatorFilter.java → ...riafilter/StaticVarCompensatorFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
Expand Down
2 changes: 1 addition & 1 deletion ...e/filter/server/dto/SubstationFilter.java → .../dto/criteriafilter/SubstationFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import io.swagger.v3.oas.annotations.media.Schema;
Expand Down
2 changes: 1 addition & 1 deletion ...r/dto/ThreeWindingsTransformerFilter.java → ...ilter/ThreeWindingsTransformerFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
Expand Down
2 changes: 1 addition & 1 deletion ...ver/dto/TwoWindingsTransformerFilter.java → ...afilter/TwoWindingsTransformerFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
Expand Down
2 changes: 1 addition & 1 deletion ...filter/server/dto/VoltageLevelFilter.java → ...to/criteriafilter/VoltageLevelFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import java.util.List;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion ...server/dto/VscConverterStationFilter.java → ...eriafilter/VscConverterStationFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto;
package org.gridsuite.filter.server.dto.criteriafilter;

import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
Expand Down
5 changes: 3 additions & 2 deletions ...suite/filter/server/dto/ExpertFilter.java → ...server/dto/expertfilter/ExpertFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
* 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.filter.server.dto;
package org.gridsuite.filter.server.dto.expertfilter;

import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import org.gridsuite.filter.server.dto.expertrule.AbstractExpertRule;
import org.gridsuite.filter.server.dto.AbstractFilter;
import org.gridsuite.filter.server.dto.expertfilter.expertrule.AbstractExpertRule;
import org.gridsuite.filter.server.utils.EquipmentType;
import org.gridsuite.filter.server.utils.FilterType;

Expand Down
10 changes: 5 additions & 5 deletions ...er/dto/expertrule/AbstractExpertRule.java → ...filter/expertrule/AbstractExpertRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto.expertrule;
package org.gridsuite.filter.server.dto.expertfilter.expertrule;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
Expand All @@ -16,10 +16,10 @@
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import org.gridsuite.filter.server.utils.CombinatorType;
import org.gridsuite.filter.server.utils.DataType;
import org.gridsuite.filter.server.utils.FieldType;
import org.gridsuite.filter.server.utils.OperatorType;
import org.gridsuite.filter.server.utils.expertfilter.CombinatorType;
import org.gridsuite.filter.server.utils.expertfilter.DataType;
import org.gridsuite.filter.server.utils.expertfilter.FieldType;
import org.gridsuite.filter.server.utils.expertfilter.OperatorType;

import java.util.List;

Expand Down
6 changes: 3 additions & 3 deletions ...ver/dto/expertrule/BooleanExpertRule.java → ...tfilter/expertrule/BooleanExpertRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.filter.server.dto.expertrule;
package org.gridsuite.filter.server.dto.expertfilter.expertrule;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.powsybl.commons.PowsyblException;
Expand All @@ -14,9 +14,9 @@
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import org.gridsuite.filter.server.utils.DataType;
import org.gridsuite.filter.server.utils.expertfilter.DataType;

import static org.gridsuite.filter.server.utils.ExpertFilterUtils.getFieldValue;
import static org.gridsuite.filter.server.utils.expertfilter.ExpertFilterUtils.getFieldValue;

/**
* @author Antoine Bouhours <antoine.bouhours at rte-france.com>
Expand Down
6 changes: 3 additions & 3 deletions .../dto/expertrule/CombinatorExpertRule.java → ...lter/expertrule/CombinatorExpertRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
* 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.filter.server.dto.expertrule;
package org.gridsuite.filter.server.dto.expertfilter.expertrule;

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.experimental.SuperBuilder;
import org.gridsuite.filter.server.utils.CombinatorType;
import org.gridsuite.filter.server.utils.DataType;
import org.gridsuite.filter.server.utils.expertfilter.CombinatorType;
import org.gridsuite.filter.server.utils.expertfilter.DataType;

/**
* @author Antoine Bouhours <antoine.bouhours at rte-france.com>
Expand Down
Loading
Loading