|
36 | 36 | import org.prebid.server.auction.bidderrequestpostprocessor.BidderRequestCleaner; |
37 | 37 | import org.prebid.server.auction.bidderrequestpostprocessor.BidderRequestCurrencyBlocker; |
38 | 38 | import org.prebid.server.auction.bidderrequestpostprocessor.BidderRequestMediaFilter; |
39 | | -import org.prebid.server.auction.bidderrequestpostprocessor.BidderRequestPostProcessor; |
40 | 39 | import org.prebid.server.auction.bidderrequestpostprocessor.BidderRequestPreferredMediaProcessor; |
41 | 40 | import org.prebid.server.auction.bidderrequestpostprocessor.CompositeBidderRequestPostProcessor; |
42 | 41 | import org.prebid.server.auction.categorymapping.BasicCategoryMappingService; |
|
138 | 137 | import org.springframework.context.annotation.Configuration; |
139 | 138 | import org.springframework.context.annotation.Scope; |
140 | 139 | import org.springframework.context.annotation.ScopedProxyMode; |
141 | | -import org.springframework.core.Ordered; |
142 | | -import org.springframework.core.annotation.Order; |
143 | 140 |
|
144 | 141 | import jakarta.validation.constraints.Min; |
145 | 142 | import java.io.IOException; |
|
149 | 146 | import java.util.Collection; |
150 | 147 | import java.util.HashSet; |
151 | 148 | import java.util.List; |
| 149 | +import java.util.Objects; |
152 | 150 | import java.util.Properties; |
153 | 151 | import java.util.Set; |
154 | 152 | import java.util.concurrent.TimeUnit; |
@@ -796,35 +794,40 @@ BidderCatalog bidderCatalog(List<BidderDeps> bidderDeps) { |
796 | 794 | } |
797 | 795 |
|
798 | 796 | @Bean |
799 | | - @Order(Ordered.HIGHEST_PRECEDENCE) |
800 | | - BidderRequestPostProcessor bidderRequestCurrencyBlocker(BidderCatalog bidderCatalog) { |
| 797 | + BidderRequestCurrencyBlocker bidderRequestCurrencyBlocker(BidderCatalog bidderCatalog) { |
801 | 798 | return new BidderRequestCurrencyBlocker(bidderCatalog); |
802 | 799 | } |
803 | 800 |
|
804 | 801 | @Bean |
805 | | - @Order(0) |
806 | 802 | @ConditionalOnProperty(prefix = "auction.filter-imp-media-type", name = "enabled", havingValue = "true") |
807 | | - BidderRequestPostProcessor bidderRequestMediaFilter(BidderCatalog bidderCatalog) { |
| 803 | + BidderRequestMediaFilter bidderRequestMediaFilter(BidderCatalog bidderCatalog) { |
808 | 804 | return new BidderRequestMediaFilter(bidderCatalog); |
809 | 805 | } |
810 | 806 |
|
811 | 807 | @Bean |
812 | | - @Order(0) |
813 | | - BidderRequestPostProcessor bidderRequestPreferredMediaProcessor(BidderCatalog bidderCatalog) { |
| 808 | + BidderRequestPreferredMediaProcessor bidderRequestPreferredMediaProcessor(BidderCatalog bidderCatalog) { |
814 | 809 | return new BidderRequestPreferredMediaProcessor(bidderCatalog); |
815 | 810 | } |
816 | 811 |
|
817 | 812 | @Bean |
818 | | - @Order(Ordered.LOWEST_PRECEDENCE) |
819 | | - BidderRequestPostProcessor bidderRequestCleaner() { |
| 813 | + BidderRequestCleaner bidderRequestCleaner() { |
820 | 814 | return new BidderRequestCleaner(); |
821 | 815 | } |
822 | 816 |
|
823 | 817 | @Bean |
824 | 818 | 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()); |
828 | 831 | } |
829 | 832 |
|
830 | 833 | @Bean |
|
0 commit comments