Merge branch 'refactor-line-transformer-entities' of https://github.c…

…om/gridsuite/filter-server into organize-by-filter Signed-off-by: BOUHOURS Antoine <[email protected]>
gridsuite · Nov 7, 2023 · 7651ddf · 7651ddf
1 parent b8c5d46
commit 7651ddf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.../java/org/gridsuite/filter/server/repositories/proxies/AbstractFilterRepositoryProxy.java b/.../java/org/gridsuite/filter/server/repositories/proxies/AbstractFilterRepositoryProxy.java
@@ -143,9 +143,10 @@ public void buildGenericFilter(AbstractGenericFilterEntity.AbstractGenericFilter
 
     public void buildInjectionFilter(AbstractInjectionFilterEntity.AbstractInjectionFilterEntityBuilder<?, ?> builder, CriteriaFilter dto) {
         buildGenericFilter(builder, dto);
-        if (!(dto.getEquipmentFilterForm() instanceof AbstractInjectionFilter injectionFilter)) {
+        if (!(dto.getEquipmentFilterForm() instanceof AbstractInjectionFilter)) {
             throw new PowsyblException(WRONG_FILTER_TYPE);
         }
+        AbstractInjectionFilter injectionFilter = (AbstractInjectionFilter) dto.getEquipmentFilterForm();
         builder.substationName(injectionFilter.getSubstationName())
             .countries(AbstractFilterRepositoryProxy.cloneIfNotEmptyOrNull(injectionFilter.getCountries()))
             .substationFreeProperties(convert(injectionFilter.getFreeProperties()))

diff --git a/...server/repositories/proxies/identifierlistfilter/IdentifierListFilterRepositoryProxy.java b/...server/repositories/proxies/identifierlistfilter/IdentifierListFilterRepositoryProxy.java
@@ -53,7 +53,8 @@ public AbstractFilter toDto(IdentifierListFilterEntity filterEntity) {
 
     @Override
     public IdentifierListFilterEntity fromDto(AbstractFilter dto) {
-        if (dto instanceof IdentifierListFilter filter) {
+        if (dto instanceof IdentifierListFilter) {
+            var filter = (IdentifierListFilter) dto;
             var identifierListFilterEntityBuilder = IdentifierListFilterEntity.builder()
                     .equipmentType(filter.getEquipmentType())
                     .filterEquipmentEntityList(filter.getFilterEquipmentsAttributes()

diff --git a/...ridsuite/filter/server/repositories/proxies/scriptfilter/ScriptFilterRepositoryProxy.java b/...ridsuite/filter/server/repositories/proxies/scriptfilter/ScriptFilterRepositoryProxy.java
@@ -55,7 +55,8 @@ public AbstractFilter toDto(ScriptFilterEntity entity) {
 
     @Override
     public ScriptFilterEntity fromDto(AbstractFilter dto) {
-        if (dto instanceof ScriptFilter filter) {
+        if (dto instanceof ScriptFilter) {
+            var filter = (ScriptFilter) dto;
             var scriptBuilderEntity = ScriptFilterEntity.builder()
                 .script(filter.getScript());
             buildAbstractFilter(scriptBuilderEntity, filter);