@@ -11,32 +11,36 @@ private UtilsListingFilters() {
1111 }
1212
1313 static boolean applyEventFilter (@ NonNull String eventName , @ NonNull ConfigurationProvider configProvider ) {
14- return applyListFilter (eventName , configProvider .getEventFilterSet (), configProvider .getFilterIsWhitelist ());
14+ ConfigurationProvider .FilterList <Set <String >> eventFilterList = configProvider .getEventFilterList ();
15+ return applyListFilter (eventName , eventFilterList .filterList , eventFilterList .isWhitelist );
1516 }
1617
1718 static boolean applyUserPropertyFilter (@ NonNull String propertyName , @ NonNull ConfigurationProvider configProvider ) {
18- return applyListFilter (propertyName , configProvider .getUserPropertyFilterSet (), configProvider .getFilterIsWhitelist ());
19+ ConfigurationProvider .FilterList <Set <String >> userPropertyFilterList = configProvider .getUserPropertyFilterList ();
20+ return applyListFilter (propertyName , userPropertyFilterList .filterList , userPropertyFilterList .isWhitelist );
1921 }
2022
2123 static void applySegmentationFilter (@ NonNull Map <String , Object > segmentation , @ NonNull ConfigurationProvider configProvider , @ NonNull ModuleLog L ) {
2224 if (segmentation .isEmpty ()) {
2325 return ;
2426 }
25- applyMapFilter (segmentation , configProvider .getSegmentationFilterSet (), configProvider .getFilterIsWhitelist (), L );
27+
28+ applyMapFilter (segmentation , configProvider .getSegmentationFilterList ().filterList , configProvider .getSegmentationFilterList ().isWhitelist , L );
2629 }
2730
2831 static void applyEventSegmentationFilter (@ NonNull String eventName , @ NonNull Map <String , Object > segmentation ,
2932 @ NonNull ConfigurationProvider configProvider , @ NonNull ModuleLog L ) {
30- if (segmentation .isEmpty () || configProvider .getEventSegmentationFilterMap ().isEmpty ()) {
33+ ConfigurationProvider .FilterList <Map <String , Set <String >>> eventSegmentationFilterList = configProvider .getEventSegmentationFilterList ();
34+ if (segmentation .isEmpty () || eventSegmentationFilterList .filterList .isEmpty ()) {
3135 return ;
3236 }
3337
34- Set <String > segmentationSet = configProvider . getEventSegmentationFilterMap () .get (eventName );
38+ Set <String > segmentationSet = eventSegmentationFilterList . filterList .get (eventName );
3539 if (segmentationSet == null || segmentationSet .isEmpty ()) {
3640 // No rules defined for this event so allow everything
3741 return ;
3842 }
39- applyMapFilter (segmentation , segmentationSet , configProvider . getFilterIsWhitelist () , L );
43+ applyMapFilter (segmentation , segmentationSet , eventSegmentationFilterList . isWhitelist , L );
4044 }
4145
4246 private static void applyMapFilter (@ NonNull Map <String , Object > map , @ NonNull Set <String > filterSet , boolean isWhitelist , @ NonNull ModuleLog L ) {
0 commit comments