24
24
import org .gridsuite .filter .server .repositories .proxies .AbstractFilterRepositoryProxy ;
25
25
import org .gridsuite .filter .server .repositories .proxies .expertfiler .ExpertFilterRepositoryProxy ;
26
26
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 ;
29
27
import org .gridsuite .filter .utils .FilterServiceUtils ;
30
28
import org .gridsuite .filter .utils .FilterType ;
31
29
import org .springframework .context .annotation .ComponentScan ;
37
35
import java .util .*;
38
36
import java .util .stream .Collectors ;
39
37
40
- import static org .gridsuite .filter .server .repositories .proxies .AbstractFilterRepositoryProxy .WRONG_FILTER_TYPE ;
41
-
42
38
/**
43
39
* @author Jacques Borsenberger <jacques.borsenberger at rte-france.com>
44
40
* @author Franck Lecuyer <franck.lecuyer at rte-france.com>
@@ -57,12 +53,10 @@ public class FilterService {
57
53
58
54
private final NotificationService notificationService ;
59
55
60
- public FilterService (final ScriptFilterRepository scriptFiltersRepository ,
61
- final IdentifierListFilterRepository identifierListFilterRepository ,
56
+ public FilterService (final IdentifierListFilterRepository identifierListFilterRepository ,
62
57
final ExpertFilterRepository expertFilterRepository ,
63
58
NetworkStoreService networkStoreService ,
64
59
NotificationService notificationService ) {
65
- filterRepositories .put (FilterType .SCRIPT .name (), new ScriptFilterRepositoryProxy (scriptFiltersRepository ));
66
60
filterRepositories .put (FilterType .IDENTIFIER_LIST .name (), new IdentifierListFilterRepositoryProxy (identifierListFilterRepository ));
67
61
68
62
filterRepositories .put (FilterType .EXPERT .name (), new ExpertFilterRepositoryProxy (expertFilterRepository ));
@@ -187,13 +181,9 @@ private <F extends AbstractFilter> AbstractFilter doUpdateFilter(UUID id, F newF
187
181
if (getRepository (filterOpt .get ()) == getRepository (newFilter )) { // filter type has not changed
188
182
modifiedOrCreatedFilter = getRepository (newFilter ).modify (id , newFilter );
189
183
} 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 );
197
187
}
198
188
} else {
199
189
throw new ResponseStatusException (HttpStatus .NOT_FOUND , FILTER_LIST + id + NOT_FOUND );
@@ -241,9 +231,6 @@ private Network getNetwork(UUID networkUuid, String variantId) {
241
231
}
242
232
243
233
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
- }
247
234
Network network = getNetwork (networkUuid , variantId );
248
235
return FilterServiceUtils .getIdentifiableAttributes (filter , network , filterLoader );
249
236
}
0 commit comments