adds substationOrVoltageLevelFilters #102
Conversation
Signed-off-by: Mathieu DEHARBE <[email protected]>
Signed-off-by: Mathieu DEHARBE <[email protected]>
Signed-off-by: Mathieu DEHARBE <[email protected]>
Signed-off-by: Mathieu DEHARBE <[email protected]>
Signed-off-by: Mathieu DEHARBE <[email protected]>
Signed-off-by: Mathieu DEHARBE <[email protected]>
| Map<EquipmentType, List<String>> result = new EnumMap<>(EquipmentType.class); | ||
|
|
||
| List<AbstractFilter> genericFilters = null; | ||
| List<AbstractFilter> genericFilters = List.of(); |
There was a problem hiding this comment.
| List<AbstractFilter> genericFilters = List.of(); | |
| List<AbstractFilter> genericFilters = new ArrayList<>(); |
is it better ?
| genericFilters = filterLoader.getFilters(globalFilter.getGenericFilter()); | ||
| } | ||
|
|
||
| List<AbstractFilter> substationOrVoltageLevelFilters = List.of(); |
| */ | ||
| public static boolean shouldProcessEquipmentType(@Nonnull final EquipmentType equipmentType, | ||
| @Nonnull final List<AbstractFilter>genericFilters) { | ||
| @Nonnull final List<AbstractFilter> genericFilters) { |
There was a problem hiding this comment.
strange sonar did not see that
| final List<String> filteredIds = applyGlobalFilterOnNetwork( | ||
| network, | ||
| globalFilter, | ||
| equipmentType, | ||
| genericFilters, | ||
| substationOrVoltageLevelFilters, | ||
| filterLoader | ||
| ); |
There was a problem hiding this comment.
Small refactoring suggestion : dont send globalFilter but only what we need, because we have genericFilters and substationOrVoltageLevelFilters accessibles from two different ways after
There was a problem hiding this comment.
I agree this is not a good thing to have data accessibles from two different ways. This was discussed last month and the genericFilters "cache" was kept.
Your idea sounds good but globalFilter contains a lot of things and most are used later in :
public static ExpertFilter buildExpertFilter(@Nonnull final GlobalFilter globalFilter,
@Nonnull final EquipmentType equipmentType,
@Nonnull final List<AbstractFilter> genericFilters,
@Nonnull final List<AbstractFilter> substationOrVoltageLevelFilters) {
So we would end with a lot of function parameters which is not much better in my opinion.
There was a problem hiding this comment.
I think only the other filters are used later. You add 3 params, remove 1. So 2 more params. Definetely worth it IMO, comparing to the fact of having the variable name duplicated and containing two different things.
There was a problem hiding this comment.
But well if you already discussed about it, then I guess it's already chosen
Signed-off-by: Mathieu DEHARBE <[email protected]>
Signed-off-by: Mathieu DEHARBE <[email protected]>
Signed-off-by: Mathieu DEHARBE <[email protected]>
|
In the global filters :
Separates voltage level and substation generic filters from the others. (they are now a category in itself)