Fix comments

src/main/java/org/prebid/server/privacy/gdpr/TcfDefinerService.java

@@ -48,7 +48,7 @@ public class TcfDefinerService {
  private static final ConditionalLogger SITE_CORRUPT_CONSENT_LOGGER =
  new ConditionalLogger("site_corrupt_consent", logger);
  private static final ConditionalLogger DOOH_CORRUPT_CONSENT_LOGGER =
- new ConditionalLogger("site_corrupt_consent", logger);
+ new ConditionalLogger("dooh_corrupt_consent", logger);
  private static final ConditionalLogger UNDEFINED_CORRUPT_CONSENT_LOGGER =
  new ConditionalLogger("undefined_corrupt_consent", logger);
 

src/main/java/org/prebid/server/spring/config/bidder/util/BidderDepsAssembler.java

@@ -28,6 +28,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -162,13 +163,15 @@ private void validateCapabilities(String alias, CFG aliasConfiguration, String c
  final Set<MediaType> coreAppMediaTypes = new HashSet<>(coreMetaInfo.getAppMediaTypes());
  final Set<MediaType> coreSiteMediaTypes = new HashSet<>(coreMetaInfo.getSiteMediaTypes());
  //it's a workaround in order not to update all the bidder config files at once
- final Set<MediaType> coreDoohMediaTypes = new HashSet<>(
- Optional.ofNullable(coreMetaInfo.getDoohMediaTypes()).orElse(List.of()));
+ final Set<MediaType> coreDoohMediaTypes = Optional.ofNullable(coreMetaInfo.getDoohMediaTypes())
+ .<Set<MediaType>>map(HashSet::new)
+ .orElseGet(Collections::emptySet);
 
  final Set<MediaType> aliasAppMediaTypes = new HashSet<>(aliasMetaInfo.getAppMediaTypes());
  final Set<MediaType> aliasSiteMediaTypes = new HashSet<>(aliasMetaInfo.getSiteMediaTypes());
- final Set<MediaType> aliasDoohMediaTypes = new HashSet<>(
- Optional.ofNullable(aliasMetaInfo.getDoohMediaTypes()).orElse(List.of()));
+ final Set<MediaType> aliasDoohMediaTypes = Optional.ofNullable(aliasMetaInfo.getDoohMediaTypes())
+ .<Set<MediaType>>map(HashSet::new)
+ .orElseGet(Collections::emptySet);
 
  if (!coreAppMediaTypes.containsAll(aliasAppMediaTypes)
  || !coreSiteMediaTypes.containsAll(aliasSiteMediaTypes)

src/test/java/org/prebid/server/auction/ExchangeServiceTest.java

@@ -172,6 +172,7 @@
 import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Function;
+import java.util.function.UnaryOperator;
 
 import static java.math.BigDecimal.ONE;
 import static java.math.BigDecimal.TEN;
@@ -180,7 +181,7 @@
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonList;
 import static java.util.Collections.singletonMap;
-import static java.util.function.Function.identity;
+import static java.util.function.UnaryOperator.identity;
 import static org.apache.commons.lang3.exception.ExceptionUtils.rethrow;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -2519,15 +2520,12 @@ public void shouldPassDoohContentDataAndExtDataOnlyForAllowedBidder() {
  "keyword",
  List.of("venuetype"),
  ExtDooh.of(dataNode),
- content
- ),
+ content),
  tuple(
  "keyword",
  List.of("venuetype"),
  null,
- Content.builder().album("album").build()
- )
- );
+ Content.builder().album("album").build()));
  }
 
  @Test
@@ -2573,15 +2571,12 @@ public void shouldPassAppContentDataAndExtDataOnlyForAllowedBidder() {
  "keyword",
  "storeurl",
  ExtApp.of(ExtAppPrebid.of("source", "version"), dataNode),
- content
- ),
+ content),
  tuple(
  "keyword",
  "storeurl",
  ExtApp.of(ExtAppPrebid.of("source", "version"), null),
- Content.builder().album("album").build()
- )
- );
+ Content.builder().album("album").build()));
  }
 
  @Test
@@ -2655,8 +2650,7 @@ public void shouldNoMaskPassDoohExtAndKeywordsWhenDataBiddersListIsNull() {
  .extracting(Dooh::getExt, Dooh::getKeywords)
  .containsOnly(
  tuple(ExtDooh.of(dataNode), "keyword"),
- tuple(ExtDooh.of(dataNode), "keyword")
- );
+ tuple(ExtDooh.of(dataNode), "keyword"));
  }
 
  @Test
@@ -2722,8 +2716,7 @@ public void shouldUseConcreteOverGeneralDoohWithExtPrebidBidderConfig() {
  null, ExtBidderConfigOrtb.of(null, null, doohWithDomain, null));
  final ExtRequestPrebidBidderConfig allFpdConfig = ExtRequestPrebidBidderConfig.of(
  singletonList("*"),
- allExtBidderConfig
- );
+ allExtBidderConfig);
 
  final Dooh requestDooh = Dooh.builder().id("doohId").venuetype(List.of("erased")).keywords("keyword").build();
  final ExtRequestPrebid extRequestPrebid = ExtRequestPrebid.builder()
@@ -4649,9 +4642,8 @@ private List<AuctionParticipation> captureAuctionParticipations() {
  return contextArgumentCaptor.getValue().getAuctionParticipations();
  }
 
- private static BidRequest givenBidRequest(
- List<Imp> imp,
- Function<BidRequestBuilder, BidRequestBuilder> bidRequestBuilderCustomizer) {
+ private static BidRequest givenBidRequest(List<Imp> imp,
+ UnaryOperator<BidRequestBuilder> bidRequestBuilderCustomizer) {
 
  return bidRequestBuilderCustomizer
  .apply(BidRequest.builder().cur(singletonList("USD")).imp(imp).tmax(500L))

src/test/java/org/prebid/server/auction/FpdResolverTest.java

@@ -163,8 +163,7 @@ public void resolveDoohShouldAddExtDataAttributesIfOriginDoesNotHaveExtData() {
 
  // then
  assertThat(resultDooh).isEqualTo(
- Dooh.builder().ext(ExtDooh.of(mapper.createObjectNode().put("id", "id"))).build()
- );
+ Dooh.builder().ext(ExtDooh.of(mapper.createObjectNode().put("id", "id"))).build());
  }
 
  @Test
@@ -450,8 +449,7 @@ public void resolveDoohShouldOverrideFpdFieldsFromFpdDooh() {
  .put("id", "fpdId")
  .setAll(Map.of(
  "publisher", mapper.createObjectNode().put("id", "fpdId"),
- "content", mapper.createObjectNode().put("language", "fpdLan")
- ));
+ "content", mapper.createObjectNode().put("language", "fpdLan")));
  assertThat(resultDooh).isEqualTo(
  Dooh.builder()
  .name("fpdName")

src/test/java/org/prebid/server/auction/mediatypeprocessor/BidderMediaTypeProcessorTest.java

@@ -169,8 +169,7 @@ private static BidderInfo givenBidderInfo(List<MediaType> appMediaTypes,
  0,
  false,
  false,
- CompressionType.NONE
- );
+ CompressionType.NONE);
  }
 
  private static BidRequest givenBidRequest(UnaryOperator<BidRequest.BidRequestBuilder> bidRequestCustomizer,

src/test/java/org/prebid/server/auction/requestfactory/Ortb2ImplicitParametersResolverTest.java

@@ -2328,8 +2328,8 @@ public void resolveShouldSetAppRequestPrebidChannelWhenEndpointIsNotAmpAndAppDoo
  private static BidRequest givenBidRequest(UnaryOperator<BidRequest.BidRequestBuilder> bidRequestCustomizer) {
  return bidRequestCustomizer.apply(BidRequest.builder()
  .imp(singletonList(Imp.builder().ext(mapper.createObjectNode()).build()))
- .ext(ExtRequest.of(ExtRequestPrebid.builder().build()))
- ).build();
+ .ext(ExtRequest.of(ExtRequestPrebid.builder().build())))
+  .build();
  }
 
  @Test

src/test/java/org/prebid/server/json/JsonMergerTest.java

@@ -55,8 +55,7 @@ public void mergeShouldReturnMergedObject() {
  final Publisher mergedPublisher = Publisher.builder().id("testId").domain("domain").build();
  final ObjectNode mergedApp = mapper.valueToTree(App.builder().publisher(mergedPublisher).build());
  final ObjectNode mergedDooh = mapper.valueToTree(
- Dooh.builder().venuetype(List.of("venuetype")).venuetypetax(3).build()
- );
+ Dooh.builder().venuetype(List.of("venuetype")).venuetypetax(3).build());
  final ExtBidderConfigOrtb mergedConfigFpd = ExtBidderConfigOrtb.of(mergedSite, mergedApp, mergedDooh, null);
 
  assertThat(result).isEqualTo(mergedConfigFpd);