Skip to content

Commit a31f31d

Browse files
committed
Remove spring ordering
1 parent 5ca717c commit a31f31d

1 file changed

Lines changed: 17 additions & 14 deletions

File tree

src/main/java/org/prebid/server/spring/config/ServiceConfiguration.java

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.prebid.server.auction.bidderrequestpostprocessor.BidderRequestCleaner;
3737
import org.prebid.server.auction.bidderrequestpostprocessor.BidderRequestCurrencyBlocker;
3838
import org.prebid.server.auction.bidderrequestpostprocessor.BidderRequestMediaFilter;
39-
import org.prebid.server.auction.bidderrequestpostprocessor.BidderRequestPostProcessor;
4039
import org.prebid.server.auction.bidderrequestpostprocessor.BidderRequestPreferredMediaProcessor;
4140
import org.prebid.server.auction.bidderrequestpostprocessor.CompositeBidderRequestPostProcessor;
4241
import org.prebid.server.auction.categorymapping.BasicCategoryMappingService;
@@ -138,8 +137,6 @@
138137
import org.springframework.context.annotation.Configuration;
139138
import org.springframework.context.annotation.Scope;
140139
import org.springframework.context.annotation.ScopedProxyMode;
141-
import org.springframework.core.Ordered;
142-
import org.springframework.core.annotation.Order;
143140

144141
import jakarta.validation.constraints.Min;
145142
import java.io.IOException;
@@ -149,6 +146,7 @@
149146
import java.util.Collection;
150147
import java.util.HashSet;
151148
import java.util.List;
149+
import java.util.Objects;
152150
import java.util.Properties;
153151
import java.util.Set;
154152
import java.util.concurrent.TimeUnit;
@@ -796,35 +794,40 @@ BidderCatalog bidderCatalog(List<BidderDeps> bidderDeps) {
796794
}
797795

798796
@Bean
799-
@Order(Ordered.HIGHEST_PRECEDENCE)
800-
BidderRequestPostProcessor bidderRequestCurrencyBlocker(BidderCatalog bidderCatalog) {
797+
BidderRequestCurrencyBlocker bidderRequestCurrencyBlocker(BidderCatalog bidderCatalog) {
801798
return new BidderRequestCurrencyBlocker(bidderCatalog);
802799
}
803800

804801
@Bean
805-
@Order(0)
806802
@ConditionalOnProperty(prefix = "auction.filter-imp-media-type", name = "enabled", havingValue = "true")
807-
BidderRequestPostProcessor bidderRequestMediaFilter(BidderCatalog bidderCatalog) {
803+
BidderRequestMediaFilter bidderRequestMediaFilter(BidderCatalog bidderCatalog) {
808804
return new BidderRequestMediaFilter(bidderCatalog);
809805
}
810806

811807
@Bean
812-
@Order(0)
813-
BidderRequestPostProcessor bidderRequestPreferredMediaProcessor(BidderCatalog bidderCatalog) {
808+
BidderRequestPreferredMediaProcessor bidderRequestPreferredMediaProcessor(BidderCatalog bidderCatalog) {
814809
return new BidderRequestPreferredMediaProcessor(bidderCatalog);
815810
}
816811

817812
@Bean
818-
@Order(Ordered.LOWEST_PRECEDENCE)
819-
BidderRequestPostProcessor bidderRequestCleaner() {
813+
BidderRequestCleaner bidderRequestCleaner() {
820814
return new BidderRequestCleaner();
821815
}
822816

823817
@Bean
824818
CompositeBidderRequestPostProcessor compositeBidderRequestPostProcessor(
825-
List<BidderRequestPostProcessor> bidderRequestPostProcessors) {
826-
827-
return new CompositeBidderRequestPostProcessor(bidderRequestPostProcessors);
819+
BidderRequestCurrencyBlocker bidderRequestCurrencyBlocker,
820+
@Autowired(required = false) BidderRequestMediaFilter bidderRequestMediaFilter,
821+
BidderRequestPreferredMediaProcessor bidderRequestPreferredMediaProcessor,
822+
BidderRequestCleaner bidderRequestCleaner) {
823+
824+
return new CompositeBidderRequestPostProcessor(Stream.of(
825+
bidderRequestCurrencyBlocker,
826+
bidderRequestMediaFilter,
827+
bidderRequestPreferredMediaProcessor,
828+
bidderRequestCleaner)
829+
.filter(Objects::nonNull)
830+
.toList());
828831
}
829832

830833
@Bean

0 commit comments

Comments
 (0)