Skip to content

Commit 673e4fd

Browse files
authored
clean script filter (#157)
* clesn script filter --------- Signed-off-by: SOUISSI Maissa (Externe) <[email protected]>
1 parent 66ffa56 commit 673e4fd

File tree

6 files changed

+13
-129
lines changed

6 files changed

+13
-129
lines changed

src/main/java/org/gridsuite/filter/server/FilterService.java

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
import org.gridsuite.filter.server.repositories.proxies.AbstractFilterRepositoryProxy;
2525
import org.gridsuite.filter.server.repositories.proxies.expertfiler.ExpertFilterRepositoryProxy;
2626
import org.gridsuite.filter.server.repositories.proxies.identifierlistfilter.IdentifierListFilterRepositoryProxy;
27-
import org.gridsuite.filter.server.repositories.proxies.scriptfilter.ScriptFilterRepositoryProxy;
28-
import org.gridsuite.filter.server.repositories.scriptfilter.ScriptFilterRepository;
2927
import org.gridsuite.filter.utils.FilterServiceUtils;
3028
import org.gridsuite.filter.utils.FilterType;
3129
import org.springframework.context.annotation.ComponentScan;
@@ -37,8 +35,6 @@
3735
import java.util.*;
3836
import java.util.stream.Collectors;
3937

40-
import static org.gridsuite.filter.server.repositories.proxies.AbstractFilterRepositoryProxy.WRONG_FILTER_TYPE;
41-
4238
/**
4339
* @author Jacques Borsenberger <jacques.borsenberger at rte-france.com>
4440
* @author Franck Lecuyer <franck.lecuyer at rte-france.com>
@@ -57,12 +53,10 @@ public class FilterService {
5753

5854
private final NotificationService notificationService;
5955

60-
public FilterService(final ScriptFilterRepository scriptFiltersRepository,
61-
final IdentifierListFilterRepository identifierListFilterRepository,
56+
public FilterService(final IdentifierListFilterRepository identifierListFilterRepository,
6257
final ExpertFilterRepository expertFilterRepository,
6358
NetworkStoreService networkStoreService,
6459
NotificationService notificationService) {
65-
filterRepositories.put(FilterType.SCRIPT.name(), new ScriptFilterRepositoryProxy(scriptFiltersRepository));
6660
filterRepositories.put(FilterType.IDENTIFIER_LIST.name(), new IdentifierListFilterRepositoryProxy(identifierListFilterRepository));
6761

6862
filterRepositories.put(FilterType.EXPERT.name(), new ExpertFilterRepositoryProxy(expertFilterRepository));
@@ -187,13 +181,9 @@ private <F extends AbstractFilter> AbstractFilter doUpdateFilter(UUID id, F newF
187181
if (getRepository(filterOpt.get()) == getRepository(newFilter)) { // filter type has not changed
188182
modifiedOrCreatedFilter = getRepository(newFilter).modify(id, newFilter);
189183
} else { // filter type has changed
190-
if (filterOpt.get().getType() == FilterType.SCRIPT || newFilter.getType() == FilterType.SCRIPT) {
191-
throw new PowsyblException(WRONG_FILTER_TYPE);
192-
} else {
193-
getRepository(filterOpt.get()).deleteById(id);
194-
newFilter.setId(id);
195-
modifiedOrCreatedFilter = doCreateFilter(newFilter);
196-
}
184+
getRepository(filterOpt.get()).deleteById(id);
185+
newFilter.setId(id);
186+
modifiedOrCreatedFilter = doCreateFilter(newFilter);
197187
}
198188
} else {
199189
throw new ResponseStatusException(HttpStatus.NOT_FOUND, FILTER_LIST + id + NOT_FOUND);
@@ -241,9 +231,6 @@ private Network getNetwork(UUID networkUuid, String variantId) {
241231
}
242232

243233
private List<IdentifiableAttributes> getIdentifiableAttributes(AbstractFilter filter, UUID networkUuid, String variantId, FilterLoader filterLoader) {
244-
if (filter.getType() == FilterType.SCRIPT) {
245-
throw new PowsyblException("Filter implementation not yet supported: " + filter.getClass().getSimpleName());
246-
}
247234
Network network = getNetwork(networkUuid, variantId);
248235
return FilterServiceUtils.getIdentifiableAttributes(filter, network, filterLoader);
249236
}

src/main/java/org/gridsuite/filter/server/entities/scriptfilter/ScriptFilterEntity.java

Lines changed: 0 additions & 33 deletions
This file was deleted.

src/main/java/org/gridsuite/filter/server/repositories/proxies/scriptfilter/ScriptFilterRepositoryProxy.java

Lines changed: 0 additions & 60 deletions
This file was deleted.

src/main/java/org/gridsuite/filter/server/repositories/scriptfilter/ScriptFilterRepository.java

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
2+
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
3+
<changeSet author="souissimai (generated)" id="1751624138252">
4+
<dropTable tableName="SCRIPT_FILTER"/>
5+
</changeSet>
6+
</databaseChangeLog>

src/main/resources/db/changelog/db.changelog-master.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,7 @@ databaseChangeLog:
5555
- include:
5656
file: changesets/changelog_20241202T163604Z.xml
5757
relativeToChangelogFile: true
58+
- include:
59+
file: changesets/changelog_20250704T101510Z.xml
60+
relativeToChangelogFile: true
5861

0 commit comments

Comments
 (0)