diff --git a/src/main/java/org/prebid/server/auction/model/SetuidContext.java b/src/main/java/org/prebid/server/auction/model/SetuidContext.java index 05c451bf863..7b11bbe8a7e 100644 --- a/src/main/java/org/prebid/server/auction/model/SetuidContext.java +++ b/src/main/java/org/prebid/server/auction/model/SetuidContext.java @@ -6,7 +6,7 @@ import lombok.Value; import org.prebid.server.activity.infrastructure.ActivityInfrastructure; import org.prebid.server.auction.gpp.model.GppContext; -import org.prebid.server.bidder.UsersyncMethodType; +import org.prebid.server.bidder.Usersyncer; import org.prebid.server.cookie.UidsCookie; import org.prebid.server.execution.timeout.Timeout; import org.prebid.server.privacy.model.PrivacyContext; @@ -27,10 +27,10 @@ public class SetuidContext { Account account; - String cookieName; + String bidder; @JsonIgnore - UsersyncMethodType syncType; + Usersyncer usersyncer; PrivacyContext privacyContext; diff --git a/src/main/java/org/prebid/server/bidder/UsersyncInfoBuilder.java b/src/main/java/org/prebid/server/bidder/UsersyncInfoBuilder.java deleted file mode 100644 index b1ddd6c9dc9..00000000000 --- a/src/main/java/org/prebid/server/bidder/UsersyncInfoBuilder.java +++ /dev/null @@ -1,100 +0,0 @@ -package org.prebid.server.bidder; - -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.prebid.server.privacy.model.Privacy; -import org.prebid.server.proto.response.UsersyncInfo; -import org.prebid.server.util.HttpUtil; - -import java.util.List; -import java.util.stream.Collectors; - -public class UsersyncInfoBuilder { - - private String usersyncUrl; - private String redirectUrl; - private UsersyncMethodType type; - private Boolean supportCORS; - - public static UsersyncInfoBuilder from(UsersyncMethod usersyncMethod) { - final UsersyncInfoBuilder usersyncInfoBuilder = new UsersyncInfoBuilder(); - usersyncInfoBuilder.usersyncUrl = StringUtils.defaultString(usersyncMethod.getUsersyncUrl()); - usersyncInfoBuilder.redirectUrl = UsersyncUtil.enrichUrlWithFormat( - StringUtils.stripToEmpty(usersyncMethod.getRedirectUrl()), - UsersyncUtil.resolveFormat(usersyncMethod)); - usersyncInfoBuilder.type = usersyncMethod.getType(); - usersyncInfoBuilder.supportCORS = usersyncMethod.isSupportCORS(); - - return usersyncInfoBuilder; - } - - public UsersyncInfoBuilder usersyncUrl(String usersyncUrl) { - this.usersyncUrl = StringUtils.defaultString(usersyncUrl); - return this; - } - - public UsersyncInfoBuilder redirectUrl(String redirectUrl) { - this.redirectUrl = StringUtils.defaultString(redirectUrl); - return this; - } - - public UsersyncInfoBuilder privacy(Privacy privacy) { - final String gdpr = StringUtils.defaultString(privacy.getGdpr()); - final String consent = StringUtils.defaultString(privacy.getConsentString()); - final String ccpa = StringUtils.defaultString(privacy.getCcpa().getUsPrivacy()); - final String gpp = StringUtils.defaultString(privacy.getGpp()); - final String gppSid = toString(privacy.getGppSid()); - - redirectUrl = updateUrlWithPrivacy(redirectUrl, gdpr, consent, ccpa, gpp, gppSid); - - final String encodedGdpr = HttpUtil.encodeUrl(gdpr); - final String encodedConsent = HttpUtil.encodeUrl(consent); - final String encodedUsPrivacy = HttpUtil.encodeUrl(ccpa); - final String encodedGpp = HttpUtil.encodeUrl(gpp); - final String endodedGppSid = HttpUtil.encodeUrl(gppSid); - - usersyncUrl = updateUrlWithPrivacy( - usersyncUrl, encodedGdpr, encodedConsent, encodedUsPrivacy, encodedGpp, endodedGppSid); - - return this; - } - - private static String toString(List gppSid) { - return CollectionUtils.emptyIfNull(gppSid).stream() - .map(String::valueOf) - .collect(Collectors.joining(",")); - } - - private static String updateUrlWithPrivacy(String url, - String gdpr, - String gdprConsent, - String usPrivacy, - String gpp, - String gppSid) { - - return url - .replace(UsersyncInfo.GDPR_PLACEHOLDER, gdpr) - .replace(UsersyncInfo.GDPR_CONSENT_PLACEHOLDER, gdprConsent) - .replace(UsersyncInfo.US_PRIVACY_PLACEHOLDER, usPrivacy) - .replace(UsersyncInfo.GPP_PLACEHOLDER, gpp) - .replace(UsersyncInfo.GPP_SID_PLACEHOLDER, gppSid); - } - - public UsersyncInfo build() { - final String resolvedRedirectUrl = StringUtils.countMatches(redirectUrl, '?') > 1 - ? resolveQueryParams(redirectUrl) - : HttpUtil.encodeUrl(redirectUrl); - - final String resolvedUsersyncUrl = usersyncUrl.replace( - UsersyncInfo.REDIRECT_URL_PLACEHOLDER, resolvedRedirectUrl); - - return UsersyncInfo.of(resolvedUsersyncUrl, type, supportCORS); - } - - private static String resolveQueryParams(String redirectUrl) { - final int queryParamsIndex = redirectUrl.lastIndexOf('?'); - final String queryParams = redirectUrl.substring(queryParamsIndex); - - return HttpUtil.encodeUrl(redirectUrl.substring(0, queryParamsIndex)) + queryParams; - } -} diff --git a/src/main/java/org/prebid/server/bidder/UsersyncInfoFactory.java b/src/main/java/org/prebid/server/bidder/UsersyncInfoFactory.java new file mode 100644 index 00000000000..7c2d403f7f0 --- /dev/null +++ b/src/main/java/org/prebid/server/bidder/UsersyncInfoFactory.java @@ -0,0 +1,124 @@ +package org.prebid.server.bidder; + +import lombok.Value; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.prebid.server.privacy.model.Privacy; +import org.prebid.server.proto.response.UsersyncInfo; +import org.prebid.server.util.HttpUtil; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +public class UsersyncInfoFactory { + + private static final String CALLBACK_URL_TEMPLATE = """ + %s/setuid?\ + bidder=%s\ + &gdpr={{gdpr}}\ + &gdpr_consent={{gdpr_consent}}\ + &us_privacy={{us_privacy}}\ + &gpp={{gpp}}\ + &gpp_sid={{gpp_sid}}\ + &f={{format}}\ + &uid=%s"""; + + private static final String GDPR_PLACEHOLDER = "{{gdpr}}"; + private static final String GDPR_CONSENT_PLACEHOLDER = "{{gdpr_consent}}"; + private static final String US_PRIVACY_PLACEHOLDER = "{{us_privacy}}"; + private static final String GPP_PLACEHOLDER = "{{gpp}}"; + private static final String GPP_SID_PLACEHOLDER = "{{gpp_sid}}"; + private static final String REDIRECT_URL_PLACEHOLDER = "{{redirect_url}}"; + private static final String FORMAT_PLACEHOLDER = "{{format}}"; + + private final String externalUrl; + + public UsersyncInfoFactory(String externalUrl) { + this.externalUrl = HttpUtil.validateUrl(Objects.requireNonNull(externalUrl)); + } + + public UsersyncInfo build(String bidder, + String hostCookieUid, + UsersyncMethod usersyncMethod, + Privacy privacy) { + + final UsersyncUrls usersyncUrls = buildUsersyncUrls(bidder, hostCookieUid, usersyncMethod); + final UsersyncUrls usersyncUrlsWithPrivacy = applyPrivacy(usersyncUrls, privacy); + final String resolvedUsersyncUrl = usersyncUrlsWithPrivacy.usersyncUrl.replace( + REDIRECT_URL_PLACEHOLDER, HttpUtil.encodeUrl(usersyncUrlsWithPrivacy.redirectUrl)); + + return UsersyncInfo.of(resolvedUsersyncUrl, usersyncMethod.getType(), usersyncMethod.isSupportCORS()); + } + + private UsersyncUrls buildUsersyncUrls(String bidder, String hostCookieUid, UsersyncMethod usersyncMethod) { + final String usersyncUrl = hostCookieUid == null + ? StringUtils.defaultString(usersyncMethod.getUsersyncUrl()) + : buildRedirectUrl(bidder, hostCookieUid, usersyncMethod); + + final String redirectUrl = hostCookieUid == null + ? buildRedirectUrl(bidder, usersyncMethod.getUidMacro(), usersyncMethod) + : StringUtils.EMPTY; + + return UsersyncUrls.of(usersyncUrl, redirectUrl); + } + + private String buildRedirectUrl(String bidder, String uid, UsersyncMethod method) { + final String url = CALLBACK_URL_TEMPLATE.formatted( + externalUrl, HttpUtil.encodeUrl(bidder), StringUtils.defaultString(uid)); + return url.replace(FORMAT_PLACEHOLDER, resolveFormat(method).name); + } + + private static UsersyncFormat resolveFormat(UsersyncMethod method) { + return ObjectUtils.firstNonNull(method.getFormatOverride(), method.getType().format); + } + + private static UsersyncUrls applyPrivacy(UsersyncUrls usersyncUrls, Privacy privacy) { + final String gdpr = StringUtils.defaultString(privacy.getGdpr()); + final String consent = StringUtils.defaultString(privacy.getConsentString()); + final String ccpa = StringUtils.defaultString(privacy.getCcpa().getUsPrivacy()); + final String gpp = StringUtils.defaultString(privacy.getGpp()); + final String gppSid = listToString(privacy.getGppSid()); + + final String redirectUrl = updateUrlWithPrivacy(usersyncUrls.redirectUrl, gdpr, consent, ccpa, gpp, gppSid); + + final String encodedGdpr = HttpUtil.encodeUrl(gdpr); + final String encodedConsent = HttpUtil.encodeUrl(consent); + final String encodedUsPrivacy = HttpUtil.encodeUrl(ccpa); + final String encodedGpp = HttpUtil.encodeUrl(gpp); + final String endodedGppSid = HttpUtil.encodeUrl(gppSid); + + final String usersyncUrl = updateUrlWithPrivacy( + usersyncUrls.usersyncUrl, encodedGdpr, encodedConsent, encodedUsPrivacy, encodedGpp, endodedGppSid); + + return UsersyncUrls.of(usersyncUrl, redirectUrl); + } + + private static String listToString(List gppSid) { + return CollectionUtils.emptyIfNull(gppSid).stream() + .map(String::valueOf) + .collect(Collectors.joining(",")); + } + + private static String updateUrlWithPrivacy(String url, + String gdpr, + String gdprConsent, + String usPrivacy, + String gpp, + String gppSid) { + + return url + .replace(GDPR_PLACEHOLDER, gdpr) + .replace(GDPR_CONSENT_PLACEHOLDER, gdprConsent) + .replace(US_PRIVACY_PLACEHOLDER, usPrivacy) + .replace(GPP_PLACEHOLDER, gpp) + .replace(GPP_SID_PLACEHOLDER, gppSid); + } + + @Value(staticConstructor = "of") + private static class UsersyncUrls { + String usersyncUrl; + String redirectUrl; + } +} diff --git a/src/main/java/org/prebid/server/bidder/UsersyncMethod.java b/src/main/java/org/prebid/server/bidder/UsersyncMethod.java index 843c2893151..238523d4a07 100644 --- a/src/main/java/org/prebid/server/bidder/UsersyncMethod.java +++ b/src/main/java/org/prebid/server/bidder/UsersyncMethod.java @@ -11,7 +11,7 @@ public class UsersyncMethod { String usersyncUrl; - String redirectUrl; + String uidMacro; boolean supportCORS; diff --git a/src/main/java/org/prebid/server/bidder/UsersyncUtil.java b/src/main/java/org/prebid/server/bidder/UsersyncUtil.java deleted file mode 100644 index e8e7be1347a..00000000000 --- a/src/main/java/org/prebid/server/bidder/UsersyncUtil.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.prebid.server.bidder; - -import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; - -public class UsersyncUtil { - - public static final String CALLBACK_URL_TEMPLATE = """ - %s/setuid?\ - bidder=%s\ - &gdpr={{gdpr}}\ - &gdpr_consent={{gdpr_consent}}\ - &us_privacy={{us_privacy}}\ - &gpp={{gpp}}\ - &gpp_sid={{gpp_sid}}\ - &uid=%s"""; - - public static final String FORMAT_PARAMETER = "f"; - - private UsersyncUtil() { - } - - public static UsersyncFormat resolveFormat(UsersyncMethod method) { - return ObjectUtils.firstNonNull(method.getFormatOverride(), method.getType().format); - } - - public static String enrichUrlWithFormat(String url, UsersyncFormat format) { - final String filteredUrl = StringUtils.stripToEmpty(url); - if (StringUtils.isEmpty(filteredUrl)) { - return url; - } - - return hasTwoOrMoreParameters(url) - ? insertFormatParameter(url, format.name) - : appendFormatParameter(url, format.name); - } - - private static boolean hasTwoOrMoreParameters(String url) { - return url.indexOf('&') != -1; - } - - private static String insertFormatParameter(String url, String formatValue) { - final int lastParamIndex = url.lastIndexOf('&'); - - return url.substring(0, lastParamIndex) - + "&" + FORMAT_PARAMETER + "=" + formatValue - + url.substring(lastParamIndex); - } - - private static String appendFormatParameter(String url, String formatValue) { - final String separator = url.indexOf('?') != -1 ? "&" : "?"; - return url + separator + FORMAT_PARAMETER + "=" + formatValue; - } -} diff --git a/src/main/java/org/prebid/server/bidder/Usersyncer.java b/src/main/java/org/prebid/server/bidder/Usersyncer.java index ebe776d2e3e..f3d0fe7fdb4 100644 --- a/src/main/java/org/prebid/server/bidder/Usersyncer.java +++ b/src/main/java/org/prebid/server/bidder/Usersyncer.java @@ -1,7 +1,6 @@ package org.prebid.server.bidder; import lombok.Value; -import org.prebid.server.spring.config.bidder.model.usersync.CookieFamilySource; import java.util.List; @@ -12,8 +11,6 @@ public class Usersyncer { String cookieFamilyName; - CookieFamilySource cookieFamilySource; - UsersyncMethod iframe; UsersyncMethod redirect; @@ -31,7 +28,6 @@ public static Usersyncer of(String cookieFamilyName, return of( true, cookieFamilyName, - CookieFamilySource.ROOT, iframe, redirect, skipWhenInGdprScope, diff --git a/src/main/java/org/prebid/server/cookie/CookieSyncService.java b/src/main/java/org/prebid/server/cookie/CookieSyncService.java index 4ebd38c45ed..59e31b336d3 100644 --- a/src/main/java/org/prebid/server/cookie/CookieSyncService.java +++ b/src/main/java/org/prebid/server/cookie/CookieSyncService.java @@ -3,6 +3,7 @@ import io.vertx.core.Future; import io.vertx.ext.web.RoutingContext; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.IteratorUtils; import org.apache.commons.collections4.ListUtils; import org.apache.commons.collections4.SetUtils; import org.apache.commons.lang3.ObjectUtils; @@ -14,9 +15,8 @@ import org.prebid.server.auction.privacy.enforcement.CcpaEnforcement; import org.prebid.server.bidder.BidderCatalog; import org.prebid.server.bidder.BidderInfo; -import org.prebid.server.bidder.UsersyncInfoBuilder; +import org.prebid.server.bidder.UsersyncInfoFactory; import org.prebid.server.bidder.UsersyncMethod; -import org.prebid.server.bidder.UsersyncUtil; import org.prebid.server.bidder.Usersyncer; import org.prebid.server.cookie.exception.CookieSyncException; import org.prebid.server.cookie.exception.InvalidCookieSyncRequestException; @@ -40,10 +40,7 @@ import org.prebid.server.settings.model.AccountCookieSyncConfig; import org.prebid.server.settings.model.AccountGdprConfig; import org.prebid.server.settings.model.AccountPrivacyConfig; -import org.prebid.server.spring.config.bidder.model.usersync.CookieFamilySource; -import org.prebid.server.util.HttpUtil; import org.prebid.server.util.ObjectUtil; -import org.prebid.server.util.StreamUtil; import java.util.ArrayList; import java.util.Collection; @@ -60,28 +57,27 @@ public class CookieSyncService { - private final String externalUrl; private final int defaultLimit; private final int maxLimit; private final BidderCatalog bidderCatalog; private final HostVendorTcfDefinerService tcfDefinerService; private final CcpaEnforcement ccpaEnforcement; + private final UsersyncInfoFactory usersyncInfoFactory; private final UidsCookieService uidsCookieService; private final CoopSyncProvider coopSyncProvider; private final Metrics metrics; - public CookieSyncService(String externalUrl, - int defaultLimit, + public CookieSyncService(int defaultLimit, int maxLimit, BidderCatalog bidderCatalog, HostVendorTcfDefinerService tcfDefinerService, CcpaEnforcement ccpaEnforcement, + UsersyncInfoFactory usersyncInfoFactory, UidsCookieService uidsCookieService, CoopSyncProvider coopSyncProvider, Metrics metrics) { - this.externalUrl = HttpUtil.validateUrl(Objects.requireNonNull(externalUrl)); validateLimits(defaultLimit, maxLimit); this.defaultLimit = defaultLimit; this.maxLimit = maxLimit; @@ -89,6 +85,7 @@ public CookieSyncService(String externalUrl, this.bidderCatalog = Objects.requireNonNull(bidderCatalog); this.tcfDefinerService = Objects.requireNonNull(tcfDefinerService); this.ccpaEnforcement = Objects.requireNonNull(ccpaEnforcement); + this.usersyncInfoFactory = Objects.requireNonNull(usersyncInfoFactory); this.uidsCookieService = Objects.requireNonNull(uidsCookieService); this.coopSyncProvider = Objects.requireNonNull(coopSyncProvider); this.metrics = Objects.requireNonNull(metrics); @@ -115,7 +112,8 @@ public Future processContext(CookieSyncContext cookieSyncCont .map(this::filterBiddersByGppSid) .map(this::applyRequestFilterSettings) .compose(this::applyPrivacyFilteringRules) - .map(this::filterInSyncBidders); + .map(this::filterInSyncBidders) + .map(this::applyLimitAndDeduplicate); } private CookieSyncContext validateCookieSyncContext(CookieSyncContext cookieSyncContext) { @@ -161,8 +159,6 @@ private CookieSyncContext resolveLimit(CookieSyncContext cookieSyncContext) { } private CookieSyncContext resolveBiddersToSync(CookieSyncContext cookieSyncContext) { - // TODO: Add multisync bidders from 1.a) - // TODO: filter that are done with multisync final List requestedBiddersAsList = new ArrayList<>( SetUtils.emptyIfNull(cookieSyncContext.getCookieSyncRequest().getBidders())); Collections.shuffle(requestedBiddersAsList); @@ -170,7 +166,6 @@ private CookieSyncContext resolveBiddersToSync(CookieSyncContext cookieSyncConte final BiddersContext updatedContext = cookieSyncContext.getBiddersContext().toBuilder() .requestedBidders(new LinkedHashSet<>(requestedBiddersAsList)) .coopSyncBidders(coopSyncProvider.coopSyncBidders(cookieSyncContext)) - .multiSyncBidders(Set.of()) .build(); return cookieSyncContext.with(updatedContext); @@ -285,6 +280,30 @@ private Future applyPrivacyFilteringRules(CookieSyncContext c .map(context -> filterDisallowedActivities(context, tcfContext)); } + private CookieSyncContext applyLimitAndDeduplicate(CookieSyncContext cookieSyncContext) { + final Set allowedBiddersByPriority = cookieSyncContext.getBiddersContext().allowedBiddersByPriority(); + + final Set cookieFamiliesSeen = new HashSet<>(); + final Set biddersWithDuplicateCookieFamilyName = new HashSet<>(); + final Iterator biddersIterator = allowedBiddersByPriority.iterator(); + + while (cookieFamiliesSeen.size() < cookieSyncContext.getLimit() && biddersIterator.hasNext()) { + final String bidder = biddersIterator.next(); + final String cookieFamilyName = bidderCatalog.cookieFamilyName(bidder).orElseThrow(); + + if (!cookieFamiliesSeen.add(cookieFamilyName)) { + biddersWithDuplicateCookieFamilyName.add(bidder); + } + } + final Set biddersOverLimit = new HashSet<>(IteratorUtils.toList(biddersIterator)); + + final BiddersContext updatedBiddersContext = cookieSyncContext.getBiddersContext() + .withRejectedBidders(biddersOverLimit, RejectionReason.OVER_LIMIT) + .withRejectedBidders(biddersWithDuplicateCookieFamilyName, + RejectionReason.DUPLICATE_COOKIE_FAMILY_NAME); + return cookieSyncContext.with(updatedBiddersContext); + } + private Future filterWithTcfResponse(HostVendorTcfResponse hostVendorTcfResponse, CookieSyncContext cookieSyncContext) { @@ -363,11 +382,9 @@ public CookieSyncResponse prepareResponse(CookieSyncContext cookieSyncContext) { ? CookieSyncStatus.OK : CookieSyncStatus.NO_COOKIE; - final Set biddersToSync = biddersToSync(cookieSyncContext); - final List statuses = ListUtils.union( - validStatuses(biddersToSync, cookieSyncContext), - debugStatuses(biddersToSync, cookieSyncContext)); + validStatuses(cookieSyncContext), + cookieSyncContext.isDebug() ? rejectionStatuses(cookieSyncContext) : Collections.emptyList()); final List warnings = cookieSyncContext.getWarnings(); final List resolvedWarnings = CollectionUtils.isNotEmpty(warnings) @@ -377,37 +394,8 @@ public CookieSyncResponse prepareResponse(CookieSyncContext cookieSyncContext) { return CookieSyncResponse.of(cookieSyncStatus, Collections.unmodifiableList(statuses), resolvedWarnings); } - private Set biddersToSync(CookieSyncContext cookieSyncContext) { - final Set allowedBiddersByPriority = allowedBiddersByPriority(cookieSyncContext); - - final Set cookieFamiliesToSync = new HashSet<>(); // multiple bidders may have same cookie families - final Set biddersToSync = new LinkedHashSet<>(); - final Iterator biddersIterator = allowedBiddersByPriority.iterator(); - - while (cookieFamiliesToSync.size() < cookieSyncContext.getLimit() && biddersIterator.hasNext()) { - final String bidder = biddersIterator.next(); - final String cookieFamilyName = bidderCatalog.cookieFamilyName(bidder).orElseThrow(); - - cookieFamiliesToSync.add(cookieFamilyName); - biddersToSync.add(bidder); - } - - return biddersToSync; - } - - private static Set allowedBiddersByPriority(CookieSyncContext cookieSyncContext) { - final BiddersContext biddersContext = cookieSyncContext.getBiddersContext(); - - final Set allowedBiddersByPriority = new LinkedHashSet<>(); - allowedBiddersByPriority.addAll(biddersContext.allowedRequestedBidders()); - allowedBiddersByPriority.addAll(biddersContext.allowedCoopSyncBidders()); - - return allowedBiddersByPriority; - } - - private List validStatuses(Set biddersToSync, CookieSyncContext cookieSyncContext) { - return biddersToSync.stream() - .filter(StreamUtil.distinctBy(bidder -> bidderCatalog.cookieFamilyName(bidder).orElseThrow())) + private List validStatuses(CookieSyncContext cookieSyncContext) { + return cookieSyncContext.getBiddersContext().allowedBidders().stream() .map(bidder -> validStatus(bidder, cookieSyncContext)) .toList(); } @@ -421,49 +409,15 @@ private BidderUsersyncStatus validStatus(String bidder, CookieSyncContext cookie final Privacy privacy = cookieSyncContext.getPrivacyContext().getPrivacy(); final String hostCookieUid = uidsCookieService.hostCookieUidToSync(routingContext, cookieFamilyName); - final UsersyncInfo usersyncInfo = toUsersyncInfo(usersyncMethod, cookieFamilyName, hostCookieUid, privacy); + final UsersyncInfo usersyncInfo = usersyncInfoFactory.build(bidder, hostCookieUid, usersyncMethod, privacy); return BidderUsersyncStatus.builder() - .bidder(cookieFamilyName) // we are syncing cookie-family-names instead of bidder codes + .bidder(bidder) .noCookie(true) .usersync(usersyncInfo) .build(); } - private UsersyncInfo toUsersyncInfo(UsersyncMethod usersyncMethod, - String cookieFamilyName, - String hostCookieUid, - Privacy privacy) { - - final UsersyncInfoBuilder usersyncInfoBuilder = UsersyncInfoBuilder.from(usersyncMethod); - - if (hostCookieUid != null) { - final String url = UsersyncUtil.CALLBACK_URL_TEMPLATE.formatted( - externalUrl, HttpUtil.encodeUrl(cookieFamilyName), HttpUtil.encodeUrl(hostCookieUid)); - - usersyncInfoBuilder - .usersyncUrl(UsersyncUtil.enrichUrlWithFormat(url, UsersyncUtil.resolveFormat(usersyncMethod))) - .redirectUrl(null); - } - - return usersyncInfoBuilder - .privacy(privacy) - .build(); - } - - private List debugStatuses(Set biddersToSync, CookieSyncContext cookieSyncContext) { - if (!cookieSyncContext.isDebug()) { - return Collections.emptyList(); - } - - final List debugStatuses = new ArrayList<>(); - debugStatuses.addAll(rejectionStatuses(cookieSyncContext)); - debugStatuses.addAll(limitStatuses(biddersToSync, cookieSyncContext)); - debugStatuses.addAll(aliasSyncedAsRootStatuses(biddersToSync, cookieSyncContext)); - - return debugStatuses; - } - private List rejectionStatuses(CookieSyncContext cookieSyncContext) { final BiddersContext biddersContext = cookieSyncContext.getBiddersContext(); return biddersContext.rejectedBidders().entrySet().stream() @@ -474,9 +428,7 @@ private List rejectionStatuses(CookieSyncContext cookieSyn } private BidderUsersyncStatus rejectionStatus(String bidder, RejectionReason reason, BiddersContext biddersContext) { - final String cookieFamilyName = bidderCatalog.cookieFamilyName(bidder).orElse(bidder); - BidderUsersyncStatus.BidderUsersyncStatusBuilder builder = BidderUsersyncStatus.builder() - .bidder(cookieFamilyName); + BidderUsersyncStatus.BidderUsersyncStatusBuilder builder = BidderUsersyncStatus.builder().bidder(bidder); final boolean requested = biddersContext.isRequested(bidder); final boolean coopSync = biddersContext.isCoopSync(bidder); @@ -493,51 +445,14 @@ private BidderUsersyncStatus rejectionStatus(String bidder, RejectionReason reas case ALREADY_IN_SYNC -> builder.conditionalError(requested, "Already in sync"); case REJECTED_BY_REGULATION_SCOPE -> builder.conditionalError( requested || coopSync, "Rejected by regulation scope"); + case OVER_LIMIT -> builder.conditionalError(requested, "Limit reached"); + case DUPLICATE_COOKIE_FAMILY_NAME -> builder.conditionalError( + requested, "Duplicate bidder synced as " + bidderCatalog.cookieFamilyName(bidder).orElseThrow()); }; return builder.build(); } - private List limitStatuses(Set biddersToSync, CookieSyncContext cookieSyncContext) { - final Set droppedDueToLimitBidders = SetUtils.difference( - cookieSyncContext.getBiddersContext().allowedRequestedBidders(), biddersToSync); - - return droppedDueToLimitBidders.stream() - .map(bidder -> BidderUsersyncStatus.builder() - .bidder(bidderCatalog.cookieFamilyName(bidder).orElseThrow()) - .error("limit reached") - .build()) - .toList(); - } - - private List aliasSyncedAsRootStatuses(Set biddersToSync, - CookieSyncContext cookieSyncContext) { - - final Set allowedRequestedBidders = cookieSyncContext.getBiddersContext().allowedRequestedBidders(); - - return biddersToSync.stream() - .filter(allowedRequestedBidders::contains) - .filter(this::isAliasSyncedAsRootFamily) - .map(this::warningForAliasSyncedAsRootFamily) - .toList(); - } - - private boolean isAliasSyncedAsRootFamily(String bidder) { - return bidderCatalog.isAlias(bidder) - && bidderCatalog.usersyncerByName(bidder) - .map(Usersyncer::getCookieFamilySource) - .filter(source -> source == CookieFamilySource.ROOT) - .isPresent(); - } - - private BidderUsersyncStatus warningForAliasSyncedAsRootFamily(String bidder) { - final String cookieFamilyName = bidderCatalog.cookieFamilyName(bidder).orElseThrow(); - return BidderUsersyncStatus.builder() - .bidder(bidder) - .error("synced as " + cookieFamilyName) - .build(); - } - private void updateCookieSyncTcfMetrics(BiddersContext biddersContext) { biddersContext.rejectedBidders().entrySet().stream() .filter(entry -> entry.getValue() == RejectionReason.REJECTED_BY_TCF) diff --git a/src/main/java/org/prebid/server/cookie/model/BiddersContext.java b/src/main/java/org/prebid/server/cookie/model/BiddersContext.java index 98a90604adc..45d0f784de1 100644 --- a/src/main/java/org/prebid/server/cookie/model/BiddersContext.java +++ b/src/main/java/org/prebid/server/cookie/model/BiddersContext.java @@ -10,6 +10,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; @@ -24,9 +25,6 @@ public class BiddersContext { @Builder.Default Set coopSyncBidders = new HashSet<>(); - @Builder.Default - Set multiSyncBidders = new HashSet<>(); - @Builder.Default Map rejectedBidders = new HashMap<>(); @@ -42,25 +40,21 @@ public boolean isCoopSync(String bidder) { } private Set involvedBidders() { - return SetUtils.union( - multiSyncBidders, - SetUtils.union(requestedBidders, coopSyncBidders)); + return SetUtils.union(requestedBidders, coopSyncBidders); } public Set allowedBidders() { return SetUtils.difference(involvedBidders(), rejectedBidders.keySet()); } - public Set allowedRequestedBidders() { - return SetUtils.difference(requestedBidders, rejectedBidders.keySet()); - } + public Set allowedBiddersByPriority() { + final Set allowedBiddersByPriority = new LinkedHashSet<>(); - public Set allowedCoopSyncBidders() { - return SetUtils.difference(coopSyncBidders, rejectedBidders.keySet()); - } + allowedBiddersByPriority.addAll(requestedBidders); + allowedBiddersByPriority.addAll(coopSyncBidders); + allowedBiddersByPriority.removeAll(rejectedBidders.keySet()); - public Set allowedMultisyncBidders() { - return SetUtils.difference(multiSyncBidders, rejectedBidders.keySet()); + return allowedBiddersByPriority; } public BiddersContext withRejectedBidder(String bidder, RejectionReason reason) { diff --git a/src/main/java/org/prebid/server/cookie/model/RejectionReason.java b/src/main/java/org/prebid/server/cookie/model/RejectionReason.java index 5130a3abb93..fbfd7a0aad3 100644 --- a/src/main/java/org/prebid/server/cookie/model/RejectionReason.java +++ b/src/main/java/org/prebid/server/cookie/model/RejectionReason.java @@ -11,5 +11,7 @@ public enum RejectionReason { DISABLED_USERSYNC, REJECTED_BY_FILTER, ALREADY_IN_SYNC, - REJECTED_BY_REGULATION_SCOPE + REJECTED_BY_REGULATION_SCOPE, + OVER_LIMIT, + DUPLICATE_COOKIE_FAMILY_NAME } diff --git a/src/main/java/org/prebid/server/handler/SetuidHandler.java b/src/main/java/org/prebid/server/handler/SetuidHandler.java index bce568db2d7..09e433010ed 100644 --- a/src/main/java/org/prebid/server/handler/SetuidHandler.java +++ b/src/main/java/org/prebid/server/handler/SetuidHandler.java @@ -13,7 +13,6 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.Pair; import org.prebid.server.activity.Activity; import org.prebid.server.activity.ComponentType; import org.prebid.server.activity.infrastructure.ActivityInfrastructure; @@ -29,7 +28,6 @@ import org.prebid.server.bidder.BidderCatalog; import org.prebid.server.bidder.UsersyncFormat; import org.prebid.server.bidder.UsersyncMethodType; -import org.prebid.server.bidder.UsersyncUtil; import org.prebid.server.bidder.Usersyncer; import org.prebid.server.cookie.UidsCookie; import org.prebid.server.cookie.UidsCookieService; @@ -59,7 +57,6 @@ import org.prebid.server.vertx.verticles.server.application.ApplicationResource; import java.util.Collections; -import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.Objects; @@ -77,6 +74,7 @@ public class SetuidHandler implements ApplicationResource { private static final String UID_PARAM = "uid"; private static final String PIXEL_FILE_PATH = "static/tracking-pixel.png"; private static final String ACCOUNT_PARAM = "account"; + private static final String FORMAT_PARAM = "f"; private static final int UNAVAILABLE_FOR_LEGAL_REASONS = 451; private final long defaultTimeout; @@ -89,7 +87,7 @@ public class SetuidHandler implements ApplicationResource { private final AnalyticsReporterDelegator analyticsDelegator; private final Metrics metrics; private final TimeoutFactory timeoutFactory; - private final Map> cookieNameToBidderAndSyncType; + private final Map bidderToUsersyncer; public SetuidHandler(long defaultTimeout, UidsCookieService uidsCookieService, @@ -113,21 +111,14 @@ public SetuidHandler(long defaultTimeout, this.analyticsDelegator = Objects.requireNonNull(analyticsDelegator); this.metrics = Objects.requireNonNull(metrics); this.timeoutFactory = Objects.requireNonNull(timeoutFactory); - this.cookieNameToBidderAndSyncType = collectUsersyncers(bidderCatalog); + this.bidderToUsersyncer = collectUsersyncers(bidderCatalog); } - private static Map> collectUsersyncers(BidderCatalog bidderCatalog) { + private static Map collectUsersyncers(BidderCatalog bidderCatalog) { validateUsersyncersDuplicates(bidderCatalog); - return bidderCatalog.usersyncReadyBidders().stream() - .sorted(Comparator.comparing(bidderName -> BooleanUtils.toInteger(bidderCatalog.isAlias(bidderName)))) - .filter(StreamUtil.distinctBy(bidderCatalog::cookieFamilyName)) - .map(bidderName -> bidderCatalog.usersyncerByName(bidderName) - .map(usersyncer -> Pair.of(bidderName, usersyncer))) - .flatMap(Optional::stream) - .collect(Collectors.toMap( - pair -> pair.getRight().getCookieFamilyName(), - pair -> Pair.of(pair.getLeft(), preferredUserSyncType(pair.getRight())))); + .collect(Collectors.toMap(Function.identity(), + bidder -> bidderCatalog.usersyncerByName(bidder).orElseThrow())); } private static void validateUsersyncersDuplicates(BidderCatalog bidderCatalog) { @@ -158,10 +149,6 @@ private static boolean isAliasWithRootCookieFamilyName(BidderCatalog bidderCatal && parentCookieFamilyName.equals(bidderCookieFamilyName); } - private static UsersyncMethodType preferredUserSyncType(Usersyncer usersyncer) { - return ObjectUtils.firstNonNull(usersyncer.getIframe(), usersyncer.getRedirect()).getType(); - } - @Override public List endpoints() { return Collections.singletonList(HttpEndpoint.of(HttpMethod.GET, Endpoint.setuid.value())); @@ -170,20 +157,17 @@ public List endpoints() { @Override public void handle(RoutingContext routingContext) { toSetuidContext(routingContext) - .onComplete(setuidContextResult -> handleSetuidContextResult(setuidContextResult, routingContext)); + .onFailure(error -> handleErrors(error, routingContext, null)) + .onSuccess(setuidContext -> processSetuidContext(setuidContext, routingContext)); } private Future toSetuidContext(RoutingContext routingContext) { final UidsCookie uidsCookie = uidsCookieService.parseFromRequest(routingContext); final HttpServerRequest httpRequest = routingContext.request(); - final String cookieName = httpRequest.getParam(BIDDER_PARAM); + final String bidder = httpRequest.getParam(BIDDER_PARAM); final String requestAccount = httpRequest.getParam(ACCOUNT_PARAM); final Timeout timeout = timeoutFactory.create(defaultTimeout); - - final UsersyncMethodType syncType = Optional.ofNullable(cookieName) - .map(cookieNameToBidderAndSyncType::get) - .map(Pair::getRight) - .orElse(null); + final Usersyncer usersyncer = bidderToUsersyncer.get(bidder); return accountById(requestAccount, timeout) .compose(account -> setuidPrivacyContextFactory.contextFrom(httpRequest, account, timeout) @@ -192,8 +176,8 @@ private Future toSetuidContext(RoutingContext routingContext) { .uidsCookie(uidsCookie) .timeout(timeout) .account(account) - .cookieName(cookieName) - .syncType(syncType) + .bidder(bidder) + .usersyncer(usersyncer) .privacyContext(privacyContext) .build())) @@ -218,51 +202,39 @@ private SetuidContext fillWithActivityInfrastructure(SetuidContext setuidContext .build(); } - private void handleSetuidContextResult(AsyncResult setuidContextResult, - RoutingContext routingContext) { - - if (setuidContextResult.succeeded()) { - final SetuidContext setuidContext = setuidContextResult.result(); - final String bidderCookieFamily = setuidContext.getCookieName(); - final TcfContext tcfContext = setuidContext.getPrivacyContext().getTcfContext(); + private void processSetuidContext(SetuidContext setuidContext, RoutingContext routingContext) { + final TcfContext tcfContext = setuidContext.getPrivacyContext().getTcfContext(); - try { - validateSetuidContext(setuidContext, bidderCookieFamily); - } catch (InvalidRequestException | UnauthorizedUidsException | UnavailableForLegalReasonsException e) { - handleErrors(e, routingContext, tcfContext); - return; - } + try { + validateSetuidContext(setuidContext); + } catch (InvalidRequestException | UnauthorizedUidsException | UnavailableForLegalReasonsException e) { + handleErrors(e, routingContext, tcfContext); + return; + } - final AccountPrivacyConfig privacyConfig = setuidContext.getAccount().getPrivacy(); - final AccountGdprConfig accountGdprConfig = privacyConfig != null ? privacyConfig.getGdpr() : null; + final AccountPrivacyConfig privacyConfig = setuidContext.getAccount().getPrivacy(); + final AccountGdprConfig accountGdprConfig = privacyConfig != null ? privacyConfig.getGdpr() : null; - final String bidderName = cookieNameToBidderAndSyncType.get(bidderCookieFamily).getLeft(); + Future.all( + tcfDefinerService.isAllowedForHostVendorId(tcfContext), + tcfDefinerService.resultForBidderNames( + Collections.singleton(setuidContext.getBidder()), tcfContext, accountGdprConfig)) + .onComplete(hostTcfResponseResult -> respondByTcfResponse(hostTcfResponseResult, setuidContext)); + } - Future.all( - tcfDefinerService.isAllowedForHostVendorId(tcfContext), - tcfDefinerService.resultForBidderNames( - Collections.singleton(bidderName), tcfContext, accountGdprConfig)) - .onComplete(hostTcfResponseResult -> respondByTcfResponse( - hostTcfResponseResult, - bidderName, - setuidContext)); - } else { - final Throwable error = setuidContextResult.cause(); - handleErrors(error, routingContext, null); + private void validateSetuidContext(SetuidContext setuidContext) { + if (StringUtils.isBlank(setuidContext.getBidder())) { + throw new InvalidRequestException("\"bidder\" query param is required"); } - } - private void validateSetuidContext(SetuidContext setuidContext, String bidderCookieFamily) { - final String cookieName = setuidContext.getCookieName(); - final boolean isCookieNameBlank = StringUtils.isBlank(cookieName); - if (isCookieNameBlank || !cookieNameToBidderAndSyncType.containsKey(cookieName)) { - final String cookieNameError = isCookieNameBlank ? "required" : "invalid"; - throw new InvalidRequestException("\"bidder\" query param is " + cookieNameError); + final Usersyncer usersyncer = setuidContext.getUsersyncer(); + if (usersyncer == null) { + throw new InvalidRequestException("\"bidder\" query param is invalid"); } final TcfContext tcfContext = setuidContext.getPrivacyContext().getTcfContext(); if (tcfContext.isInGdprScope() && !tcfContext.isConsentValid()) { - metrics.updateUserSyncTcfInvalidMetric(bidderCookieFamily); + metrics.updateUserSyncTcfInvalidMetric(usersyncer.getCookieFamilyName()); throw new InvalidRequestException("Consent string is invalid"); } @@ -273,7 +245,7 @@ private void validateSetuidContext(SetuidContext setuidContext, String bidderCoo final ActivityInfrastructure activityInfrastructure = setuidContext.getActivityInfrastructure(); final ActivityInvocationPayload activityInvocationPayload = TcfContextActivityInvocationPayload.of( - ActivityInvocationPayloadImpl.of(ComponentType.BIDDER, bidderCookieFamily), + ActivityInvocationPayloadImpl.of(ComponentType.BIDDER, usersyncer.getCookieFamilyName()), tcfContext); if (!activityInfrastructure.isAllowed(Activity.SYNC_USER, activityInvocationPayload)) { @@ -282,11 +254,11 @@ private void validateSetuidContext(SetuidContext setuidContext, String bidderCoo } private void respondByTcfResponse(AsyncResult hostTcfResponseResult, - String bidderName, SetuidContext setuidContext) { final TcfContext tcfContext = setuidContext.getPrivacyContext().getTcfContext(); final RoutingContext routingContext = setuidContext.getRoutingContext(); + final String cookieFamilyName = setuidContext.getUsersyncer().getCookieFamilyName(); if (hostTcfResponseResult.succeeded()) { final CompositeFuture compositeFuture = hostTcfResponseResult.result(); @@ -295,7 +267,7 @@ private void respondByTcfResponse(AsyncResult hostTcfResponseRe final Map vendorIdToAction = bidderTcfResponse.getActions(); final PrivacyEnforcementAction action = vendorIdToAction != null - ? vendorIdToAction.get(bidderName) + ? vendorIdToAction.get(setuidContext.getBidder()) : null; final boolean notInGdprScope = BooleanUtils.isFalse(bidderTcfResponse.getUserInGdprScope()); @@ -304,7 +276,7 @@ private void respondByTcfResponse(AsyncResult hostTcfResponseRe if (hostVendorTcfResponse.isVendorAllowed() && isBidderVendorAllowed) { respondWithCookie(setuidContext); } else { - metrics.updateUserSyncTcfBlockedMetric(setuidContext.getCookieName()); + metrics.updateUserSyncTcfBlockedMetric(cookieFamilyName); final HttpResponseStatus status = new HttpResponseStatus(UNAVAILABLE_FOR_LEGAL_REASONS, "Unavailable for legal reasons"); @@ -319,7 +291,7 @@ private void respondByTcfResponse(AsyncResult hostTcfResponseRe } } else { final Throwable error = hostTcfResponseResult.cause(); - metrics.updateUserSyncTcfBlockedMetric(setuidContext.getCookieName()); + metrics.updateUserSyncTcfBlockedMetric(cookieFamilyName); handleErrors(error, routingContext, tcfContext); } } @@ -327,16 +299,16 @@ private void respondByTcfResponse(AsyncResult hostTcfResponseRe private void respondWithCookie(SetuidContext setuidContext) { final RoutingContext routingContext = setuidContext.getRoutingContext(); final String uid = routingContext.request().getParam(UID_PARAM); - final String bidder = setuidContext.getCookieName(); + final String cookieFamilyName = setuidContext.getUsersyncer().getCookieFamilyName(); final UpdateResult uidsCookieUpdateResult = uidsCookieService.updateUidsCookie( - setuidContext.getUidsCookie(), bidder, uid); + setuidContext.getUidsCookie(), cookieFamilyName, uid); uidsCookieService.splitUidsIntoCookies(uidsCookieUpdateResult.getValue()) .forEach(cookie -> addCookie(routingContext, cookie)); if (uidsCookieUpdateResult.isUpdated()) { - metrics.updateUserSyncSetsMetric(bidder); + metrics.updateUserSyncSetsMetric(cookieFamilyName); } final int statusCode = HttpResponseStatus.OK.code(); HttpUtil.executeSafely(routingContext, Endpoint.setuid, buildCookieResponseConsumer(setuidContext, statusCode)); @@ -344,7 +316,7 @@ private void respondWithCookie(SetuidContext setuidContext) { final TcfContext tcfContext = setuidContext.getPrivacyContext().getTcfContext(); final SetuidEvent setuidEvent = SetuidEvent.builder() .status(statusCode) - .bidder(bidder) + .bidder(cookieFamilyName) .uid(uid) .success(uidsCookieUpdateResult.isUpdated()) .build(); @@ -354,14 +326,18 @@ private void respondWithCookie(SetuidContext setuidContext) { private Consumer buildCookieResponseConsumer(SetuidContext setuidContext, int responseStatusCode) { - final String format = setuidContext.getRoutingContext().request().getParam(UsersyncUtil.FORMAT_PARAMETER); - return shouldRespondWithPixel(format, setuidContext.getSyncType()) + final String format = setuidContext.getRoutingContext().request().getParam(FORMAT_PARAM); + return shouldRespondWithPixel(format, preferredUserSyncType(setuidContext.getUsersyncer())) ? response -> response.sendFile(PIXEL_FILE_PATH) : response -> response - .setStatusCode(responseStatusCode) - .putHeader(HttpHeaders.CONTENT_LENGTH, "0") - .putHeader(HttpHeaders.CONTENT_TYPE, HttpHeaders.TEXT_HTML) - .end(); + .setStatusCode(responseStatusCode) + .putHeader(HttpHeaders.CONTENT_LENGTH, "0") + .putHeader(HttpHeaders.CONTENT_TYPE, HttpHeaders.TEXT_HTML) + .end(); + } + + private static UsersyncMethodType preferredUserSyncType(Usersyncer usersyncer) { + return ObjectUtils.firstNonNull(usersyncer.getIframe(), usersyncer.getRedirect()).getType(); } private boolean shouldRespondWithPixel(String format, UsersyncMethodType syncType) { @@ -374,21 +350,21 @@ private void handleErrors(Throwable error, RoutingContext routingContext, TcfCon final HttpResponseStatus status; final String body; switch (error) { - case InvalidRequestException invalidRequestException -> { + case InvalidRequestException ignored -> { metrics.updateUserSyncBadRequestMetric(); status = HttpResponseStatus.BAD_REQUEST; body = "Invalid request format: " + message; } - case UnauthorizedUidsException unauthorizedUidsException -> { + case UnauthorizedUidsException ignored -> { metrics.updateUserSyncOptoutMetric(); status = HttpResponseStatus.UNAUTHORIZED; body = "Unauthorized: " + message; } - case UnavailableForLegalReasonsException unavailableForLegalReasonsException -> { + case UnavailableForLegalReasonsException ignored -> { status = HttpResponseStatus.valueOf(451); body = "Unavailable For Legal Reasons."; } - case InvalidAccountConfigException invalidAccountConfigException -> { + case InvalidAccountConfigException ignored -> { metrics.updateUserSyncBadRequestMetric(); status = HttpResponseStatus.BAD_REQUEST; body = "Invalid account configuration: " + message; diff --git a/src/main/java/org/prebid/server/metric/Metrics.java b/src/main/java/org/prebid/server/metric/Metrics.java index e7b290bc14a..88775fcb927 100644 --- a/src/main/java/org/prebid/server/metric/Metrics.java +++ b/src/main/java/org/prebid/server/metric/Metrics.java @@ -400,12 +400,12 @@ public void updateUserSyncBadRequestMetric() { userSync().incCounter(MetricName.bad_requests); } - public void updateUserSyncSetsMetric(String bidder) { - userSync().forBidder(bidder).incCounter(MetricName.sets); + public void updateUserSyncSetsMetric(String cookieFamilyName) { + userSync().forBidder(cookieFamilyName).incCounter(MetricName.sets); } - public void updateUserSyncTcfBlockedMetric(String bidder) { - userSync().forBidder(bidder).tcf().incCounter(MetricName.blocked); + public void updateUserSyncTcfBlockedMetric(String cookieFamilyName) { + userSync().forBidder(cookieFamilyName).tcf().incCounter(MetricName.blocked); } public void updateUserSyncSizeBlockedMetric(String cookieFamilyName) { @@ -416,8 +416,8 @@ public void updateUserSyncSizedOutMetric(String cookieFamilyName) { userSync().forBidder(cookieFamilyName).incCounter(MetricName.sizedout); } - public void updateUserSyncTcfInvalidMetric(String bidder) { - userSync().forBidder(bidder).tcf().incCounter(MetricName.invalid); + public void updateUserSyncTcfInvalidMetric(String cookieFamilyName) { + userSync().forBidder(cookieFamilyName).tcf().incCounter(MetricName.invalid); } public void updateUserSyncTcfInvalidMetric() { diff --git a/src/main/java/org/prebid/server/proto/response/UsersyncInfo.java b/src/main/java/org/prebid/server/proto/response/UsersyncInfo.java index d8f85e9c8e2..67f4aa78868 100644 --- a/src/main/java/org/prebid/server/proto/response/UsersyncInfo.java +++ b/src/main/java/org/prebid/server/proto/response/UsersyncInfo.java @@ -12,13 +12,6 @@ @Value(staticConstructor = "of") public class UsersyncInfo { - public static final String GDPR_PLACEHOLDER = "{{gdpr}}"; - public static final String GDPR_CONSENT_PLACEHOLDER = "{{gdpr_consent}}"; - public static final String US_PRIVACY_PLACEHOLDER = "{{us_privacy}}"; - public static final String GPP_PLACEHOLDER = "{{gpp}}"; - public static final String GPP_SID_PLACEHOLDER = "{{gpp_sid}}"; - public static final String REDIRECT_URL_PLACEHOLDER = "{{redirect_url}}"; - String url; UsersyncMethodType type; diff --git a/src/main/java/org/prebid/server/spring/config/ServiceConfiguration.java b/src/main/java/org/prebid/server/spring/config/ServiceConfiguration.java index 64a8dc7614a..7de9d382f2e 100644 --- a/src/main/java/org/prebid/server/spring/config/ServiceConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/ServiceConfiguration.java @@ -77,6 +77,7 @@ import org.prebid.server.bidder.BidderRequestCompletionTrackerFactory; import org.prebid.server.bidder.HttpBidderRequestEnricher; import org.prebid.server.bidder.HttpBidderRequester; +import org.prebid.server.bidder.UsersyncInfoFactory; import org.prebid.server.cache.BasicPbcStorageService; import org.prebid.server.cache.CoreCacheService; import org.prebid.server.cache.PbcStorageService; @@ -754,25 +755,30 @@ CoopSyncProvider coopSyncProvider( return new CoopSyncProvider(bidderCatalog, prioritizedCoopSyncProvider, defaultCoopSync); } + @Bean + UsersyncInfoFactory usersyncInfoBuilder(@Value("${external-url}") String externalUrl) { + return new UsersyncInfoFactory(externalUrl); + } + @Bean CookieSyncService cookieSyncService( - @Value("${external-url}") String externalUrl, @Value("${cookie-sync.default-limit:#{2}}") Integer defaultLimit, @Value("${cookie-sync.max-limit:#{null}}") Integer maxLimit, BidderCatalog bidderCatalog, HostVendorTcfDefinerService hostVendorTcfDefinerService, CcpaEnforcement ccpaEnforcement, + UsersyncInfoFactory usersyncInfoFactory, UidsCookieService uidsCookieService, CoopSyncProvider coopSyncProvider, Metrics metrics) { return new CookieSyncService( - externalUrl, defaultLimit, ObjectUtils.defaultIfNull(maxLimit, Integer.MAX_VALUE), bidderCatalog, hostVendorTcfDefinerService, ccpaEnforcement, + usersyncInfoFactory, uidsCookieService, coopSyncProvider, metrics); diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AaxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AaxConfiguration.java index 83cc2694122..037498719fe 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AaxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AaxConfiguration.java @@ -5,7 +5,6 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; import org.prebid.server.util.HttpUtil; import org.springframework.beans.factory.annotation.Value; @@ -36,7 +35,6 @@ BidderDeps aaxBidderDeps(BidderConfigurationProperties aaxConfigurationPropertie return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(aaxConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AaxBidder(resolveEndpoint(config.getEndpoint(), externalUrl), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AceexConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AceexConfiguration.java index f8a168d86b8..713c8a5b3e1 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AceexConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AceexConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/aceex.yaml", factory = YamlPropertySourceFactory.class) public class AceexConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps aceexBidderDeps(BidderConfigurationProperties aceexConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(aceexConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AceexBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AcuityadsConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AcuityadsConfiguration.java index 77bec41b1c2..029b79e299c 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AcuityadsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AcuityadsConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/acuityads.yaml", factory = YamlPropertySourceFactory.class) public class AcuityadsConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps acuityadsBidderDeps(BidderConfigurationProperties acuityadsConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(acuityadsConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AcuityadsBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdQueryConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdQueryConfiguration.java index 0f5dda54587..10f9f980979 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdQueryConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdQueryConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adquery.yaml", factory = YamlPropertySourceFactory.class) public class AdQueryConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adqueryBidderDeps(BidderConfigurationProperties adqueryConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adqueryConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdQueryBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdagioConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdagioConfiguration.java index cd4544370a8..7e1edd7894b 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdagioConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdagioConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adagio.yaml", factory = YamlPropertySourceFactory.class) public class AdagioConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adagioBidderDeps(BidderConfigurationProperties adagioConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adagioConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdagioBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdelementConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdelementConfiguration.java index c38ca1c1fbe..d9b6ce94d4e 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdelementConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdelementConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adelement.yaml", factory = YamlPropertySourceFactory.class) public class AdelementConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adelementBidderDeps(BidderConfigurationProperties adelementConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adelementConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdelementBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdfConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdfConfiguration.java index 64091a95ef0..9399855cfd2 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdfConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdfConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adf.yaml", factory = YamlPropertySourceFactory.class) public class AdfConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adfBidderDeps(BidderConfigurationProperties adfConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adfConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdfBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdgenerationConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdgenerationConfiguration.java index b377b46d1f2..74949714e8b 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdgenerationConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdgenerationConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adgeneration.yaml", factory = YamlPropertySourceFactory.class) public class AdgenerationConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adgenerationBidderDeps(BidderConfigurationProperties adgenerationConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adgenerationConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdgenerationBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdheseConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdheseConfiguration.java index d0ac8674d9a..18a2c5ee037 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdheseConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdheseConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adhese.yaml", factory = YamlPropertySourceFactory.class) public class AdheseConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adheseBidderDeps(BidderConfigurationProperties adheseConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adheseConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdheseBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdkernelAdnConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdkernelAdnConfiguration.java index ca4ff6cbd07..7fbe6d8c46d 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdkernelAdnConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdkernelAdnConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adkerneladn.yaml", factory = YamlPropertySourceFactory.class) public class AdkernelAdnConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adkerneladnBidderDeps(BidderConfigurationProperties adkerneladnConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adkerneladnConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdkernelAdnBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdkernelConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdkernelConfiguration.java index cc360ff91f8..a9a9c0c2d9c 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdkernelConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdkernelConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adkernel.yaml", factory = YamlPropertySourceFactory.class) public class AdkernelConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adkernelBidderDeps(BidderConfigurationProperties adkernelConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adkernelConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdkernelBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdmanConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdmanConfiguration.java index c4b5f011268..47155981c0a 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdmanConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdmanConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adman.yaml", factory = YamlPropertySourceFactory.class) public class AdmanConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps admanBidderDeps(BidderConfigurationProperties admanConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(admanConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdmanBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdmaticConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdmaticConfiguration.java index 49237835dc2..717eb9790a4 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdmaticConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdmaticConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/admatic.yaml", factory = YamlPropertySourceFactory.class) public class AdmaticConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps admaticBidderDeps(BidderConfigurationProperties admaticConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(admaticConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdmaticBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdmixerConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdmixerConfiguration.java index 2a7a4cc8596..b639cec7c29 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdmixerConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdmixerConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/admixer.yaml", factory = YamlPropertySourceFactory.class) public class AdmixerConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps admixerBidderDeps(BidderConfigurationProperties admixerConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(admixerConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdmixerBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdnuntiusBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdnuntiusBidderConfiguration.java index 3aca2e59cf8..60fa2fadf40 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdnuntiusBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdnuntiusBidderConfiguration.java @@ -8,15 +8,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; import java.time.Clock; @Configuration @@ -33,13 +30,11 @@ AdnuntiusConfigurationProperties configurationProperties() { @Bean BidderDeps adnuntiusBidderDeps(AdnuntiusConfigurationProperties adnuntiusConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, Clock clock, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adnuntiusConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdnuntiusBidder( config.getEndpoint(), config.getEuEndpoint(), diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdotConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdotConfiguration.java index 9c0ac457d71..7055b62ea16 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdotConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdotConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adot.yaml", factory = YamlPropertySourceFactory.class) public class AdotConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adotBidderDeps(BidderConfigurationProperties adotConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adotConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdotBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdponeConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdponeConfiguration.java index 3792a998ea8..71797c91598 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdponeConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdponeConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adpone.yaml", factory = YamlPropertySourceFactory.class) public class AdponeConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adponeBidderDeps(BidderConfigurationProperties adponeConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adponeConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdponeBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdprimeConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdprimeConfiguration.java index c9f6f950059..cd8ee9aa5c1 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdprimeConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdprimeConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adprime.yaml", factory = YamlPropertySourceFactory.class) public class AdprimeConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adprimeBidderDeps(BidderConfigurationProperties adprimeConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adprimeConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdprimeBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdtargetConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdtargetConfiguration.java index 2b3996f7fef..f1b7a55f933 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdtargetConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdtargetConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adtarget.yaml", factory = YamlPropertySourceFactory.class) public class AdtargetConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adtargetBidderDeps(BidderConfigurationProperties adtargetConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adtargetConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdtargetBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdtelligentConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdtelligentConfiguration.java index de3713761b0..b4027a5f47a 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdtelligentConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdtelligentConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adtelligent.yaml", factory = YamlPropertySourceFactory.class) public class AdtelligentConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adtelligentBidderDeps(BidderConfigurationProperties adtelligentConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adtelligentConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdtelligentBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdtonosConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdtonosConfiguration.java index 8a86c88ac81..434c16c57fa 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdtonosConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdtonosConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adtonos.yaml", factory = YamlPropertySourceFactory.class) public class AdtonosConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adtonosBidderDeps(BidderConfigurationProperties adtonosConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adtonosConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdtonosBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdtrgtmeConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdtrgtmeConfiguration.java index 7a578330380..119329abfa3 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdtrgtmeConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdtrgtmeConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adtrgtme.yaml", factory = YamlPropertySourceFactory.class) public class AdtrgtmeConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adtrgtmeBidderDeps(BidderConfigurationProperties adtrgtmeConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adtrgtmeConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdtrgtmeBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AduptechConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AduptechConfiguration.java index 5011fc46c41..8e89e161ed1 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AduptechConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AduptechConfiguration.java @@ -9,15 +9,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @Configuration @@ -34,13 +31,11 @@ AduptechConfigurationProperties configurationProperties() { @Bean BidderDeps aduptechBidderDeps(AduptechConfigurationProperties aduptechConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, CurrencyConversionService currencyConversionService, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(aduptechConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AduptechBidder( config.getEndpoint(), mapper, diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdvangelistsConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdvangelistsConfiguration.java index 79d50338b1d..8aa8aa57b4d 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdvangelistsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdvangelistsConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/advangelists.yaml", factory = YamlPropertySourceFactory.class) public class AdvangelistsConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps advangelistsBidderDeps(BidderConfigurationProperties advangelistsConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(advangelistsConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdvangelistsBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdverxoBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdverxoBidderConfiguration.java index ae9224670b7..7e77f17a3bb 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdverxoBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdverxoBidderConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adverxo.yaml", factory = YamlPropertySourceFactory.class) public class AdverxoBidderConfiguration { @@ -30,13 +26,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adverxoBidderDeps(BidderConfigurationProperties adverxoConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper, CurrencyConversionService currencyConversionService) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adverxoConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdverxoBidder(config.getEndpoint(), mapper, currencyConversionService)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdviewConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdviewConfiguration.java index 58b17ef619f..a537ae185cd 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdviewConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdviewConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adview.yaml", factory = YamlPropertySourceFactory.class) public class AdviewConfiguration { @@ -30,13 +26,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adviewBidderDeps(BidderConfigurationProperties adviewConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper, CurrencyConversionService currencyConversionService) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adviewConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdviewBidder(config.getEndpoint(), currencyConversionService, mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdxcgConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdxcgConfiguration.java index 6e6c4659e36..109a8faa54b 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdxcgConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdxcgConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adxcg.yaml", factory = YamlPropertySourceFactory.class) public class AdxcgConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adxcgBidderDeps(BidderConfigurationProperties adxcgConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adxcgConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdxcgBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AdyoulikeConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AdyoulikeConfiguration.java index d1350a9f53a..632de3daa52 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AdyoulikeConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AdyoulikeConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/adyoulike.yaml", factory = YamlPropertySourceFactory.class) public class AdyoulikeConfiguration { @@ -30,13 +26,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps adyoulikeBidderDeps(BidderConfigurationProperties adyoulikeConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, CurrencyConversionService currencyConversionService, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(adyoulikeConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AdyoulikeBidder(config.getEndpoint(), currencyConversionService, mapper)) diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AfrontConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AfrontConfiguration.java index 60617aa5ea8..aa511e2f8b1 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AfrontConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AfrontConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/afront.yaml", factory = YamlPropertySourceFactory.class) public class AfrontConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps afrontBidderDeps(BidderConfigurationProperties afrontConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(afrontConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AfrontBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AidemConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AidemConfiguration.java index 7689a338302..30ce79f92a2 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AidemConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AidemConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/aidem.yaml", factory = YamlPropertySourceFactory.class) public class AidemConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps aidemBidderDeps(BidderConfigurationProperties aidemConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(aidemConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AidemBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AjaConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AjaConfiguration.java index 216aa69047e..5a8621fc454 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AjaConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AjaConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/aja.yaml", factory = YamlPropertySourceFactory.class) public class AjaConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps ajaBidderDeps(BidderConfigurationProperties ajaConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(ajaConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AjaBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AkceloConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AkceloConfiguration.java index 3b6472eac49..77869c8f90f 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AkceloConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AkceloConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/akcelo.yaml", factory = YamlPropertySourceFactory.class) @@ -30,12 +26,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps akceloBidderDeps(BidderConfigurationProperties akceloConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(akceloConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AkceloBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AlgorixConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AlgorixConfiguration.java index 1082e4c0b5a..675a8704789 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AlgorixConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AlgorixConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/algorix.yaml", factory = YamlPropertySourceFactory.class) @@ -30,12 +26,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps algorixBidderDeps(BidderConfigurationProperties algorixConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(algorixConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AlgorixBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AlkimiConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AlkimiConfiguration.java index 44f8e0d50d8..71357c09c09 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AlkimiConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AlkimiConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/alkimi.yaml", factory = YamlPropertySourceFactory.class) public class AlkimiConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps alkimiBidderDeps(BidderConfigurationProperties alkimiConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(alkimiConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AlkimiBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AmxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AmxConfiguration.java index d90cafd1fa8..967fc5aaab9 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AmxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AmxConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/amx.yaml", factory = YamlPropertySourceFactory.class) public class AmxConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps amxBidderDeps(BidderConfigurationProperties amxConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(amxConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AmxBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ApacdexConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ApacdexConfiguration.java index 1d8c5882416..ac54ed40701 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ApacdexConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ApacdexConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/apacdex.yaml", factory = YamlPropertySourceFactory.class) public class ApacdexConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps apacdexBidderDeps(BidderConfigurationProperties apacdexConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(apacdexConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ApacdexBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AppnexusConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AppnexusConfiguration.java index 87ca781f346..61795da3f8b 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AppnexusConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AppnexusConfiguration.java @@ -8,15 +8,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; import java.util.Map; @Configuration @@ -33,12 +30,10 @@ AppnexusConfigurationProperties configurationProperties() { @Bean BidderDeps appnexusBidderDeps(AppnexusConfigurationProperties appnexusConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(appnexusConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AppnexusBidder(config.getEndpoint(), appnexusConfigurationProperties.getPlatformId(), appnexusConfigurationProperties.getIabCategories(), diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AppushConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AppushConfiguration.java index af0c97490cd..d8f238b8242 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AppushConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AppushConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/appush.yaml", factory = YamlPropertySourceFactory.class) public class AppushConfiguration { @@ -28,12 +24,10 @@ BidderConfigurationProperties configurationProperties() { } @Bean - BidderDeps appushBidderDeps(BidderConfigurationProperties appushConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { + BidderDeps appushBidderDeps(BidderConfigurationProperties appushConfigurationProperties, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(appushConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AppushBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AsoConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AsoConfiguration.java index 840b578ea28..5714f9e503b 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AsoConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AsoConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import javax.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/aso.yaml", factory = YamlPropertySourceFactory.class) public class AsoConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps asoBidderDeps(BidderConfigurationProperties asoConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(asoConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AsoBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AudienceNetworkConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AudienceNetworkConfiguration.java index 49b0d3ff049..b9010278337 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AudienceNetworkConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AudienceNetworkConfiguration.java @@ -9,7 +9,6 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; @@ -41,7 +40,6 @@ BidderDeps audiencenetworkBidderDeps(AudienceNetworkConfigurationProperties audi return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(audienceNetworkConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(null)) .bidderCreator(audienceNetworkConfigurationProperties.getEnabled() ? bidderCreator : null) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AutomatadBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AutomatadBidderConfiguration.java index 18f2e1a62bc..345106fc79f 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AutomatadBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AutomatadBidderConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/automatad.yaml", factory = YamlPropertySourceFactory.class) public class AutomatadBidderConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps automatadBidderDeps(BidderConfigurationProperties automatadConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(automatadConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new GenericBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AvocetConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AvocetConfiguration.java index 87bb0b24f1a..7f1201a2390 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AvocetConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AvocetConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/avocet.yaml", factory = YamlPropertySourceFactory.class) public class AvocetConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps avocetBidderDeps(BidderConfigurationProperties avocetConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(avocetConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AvocetBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AxisConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AxisConfiguration.java index b75d013a8d6..da678bd98e1 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AxisConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AxisConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/axis.yaml", factory = YamlPropertySourceFactory.class) public class AxisConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps axisBidderDeps(BidderConfigurationProperties axisConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(axisConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AxisBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/AxonixConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/AxonixConfiguration.java index 39bdebda807..1220230726d 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/AxonixConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/AxonixConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/axonix.yaml", factory = YamlPropertySourceFactory.class) public class AxonixConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps axonixBidderDeps(BidderConfigurationProperties axonixConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(axonixConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new AxonixBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BeachfrontConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BeachfrontConfiguration.java index e34cf171976..382619ffc52 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BeachfrontConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BeachfrontConfiguration.java @@ -9,9 +9,7 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -34,13 +32,11 @@ BeachfrontConfigurationProperties configurationProperties() { @Bean BidderDeps beachfrontBidderDeps(BeachfrontConfigurationProperties beachfrontConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, CurrencyConversionService currencyConversionService, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(beachfrontConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BeachfrontBidder( config.getEndpoint(), diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BeintooConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BeintooConfiguration.java index b7113c8bbcc..1ef2c411a8e 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BeintooConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BeintooConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/beintoo.yaml", factory = YamlPropertySourceFactory.class) public class BeintooConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps beintooBidderDeps(BidderConfigurationProperties beintooConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(beintooConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BeintooBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BematterfullConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BematterfullConfiguration.java index e5ec3bc1557..62c6c2b0bf9 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BematterfullConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BematterfullConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/bematterfull.yaml", factory = YamlPropertySourceFactory.class) public class BematterfullConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps bematterfullBidderDeps(BidderConfigurationProperties bematterfullConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(bematterfullConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BematterfullBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BetweenConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BetweenConfiguration.java index 448104e62ba..04981caa4f4 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BetweenConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BetweenConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/between.yaml", factory = YamlPropertySourceFactory.class) public class BetweenConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps betweenBidderDeps(BidderConfigurationProperties betweenConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(betweenConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BetweenBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BeyondMediaConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BeyondMediaConfiguration.java index 541a70fa294..9a1a62c76de 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BeyondMediaConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BeyondMediaConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/beyondmedia.yaml", factory = YamlPropertySourceFactory.class) public class BeyondMediaConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps beyondMediaBidderDeps(BidderConfigurationProperties beyondMediaConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(beyondMediaConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BeyondMediaBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BidTheatreConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BidTheatreConfiguration.java index 2cbf98062df..0f8bf7071e3 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BidTheatreConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BidTheatreConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import javax.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/bidtheatre.yaml", factory = YamlPropertySourceFactory.class) public class BidTheatreConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps bidtheatreBidderDeps(BidderConfigurationProperties bidtheatreConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(bidtheatreConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BidTheatreBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BidmachineConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BidmachineConfiguration.java index d5171cff6fb..2454a721b59 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BidmachineConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BidmachineConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/bidmachine.yaml", factory = YamlPropertySourceFactory.class) public class BidmachineConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps bidmachineBidderDeps(BidderConfigurationProperties bidmachineConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(bidmachineConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BidmachineBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BidmaticConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BidmaticConfiguration.java index c5622397e71..474437288ff 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BidmaticConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BidmaticConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/bidmatic.yaml", factory = YamlPropertySourceFactory.class) public class BidmaticConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps bidmaticBidderDeps(BidderConfigurationProperties bidmaticConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(bidmaticConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BidmaticBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BidmyadzConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BidmyadzConfiguration.java index ebd9305906f..2638f6c6cce 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BidmyadzConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BidmyadzConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/bidmyadz.yaml", factory = YamlPropertySourceFactory.class) public class BidmyadzConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps bidmyadzBidderDeps(BidderConfigurationProperties bidmyadzConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(bidmyadzConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BidmyadzBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BidscubeConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BidscubeConfiguration.java index 389200d09c0..540c398bb33 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BidscubeConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BidscubeConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/bidscube.yaml", factory = YamlPropertySourceFactory.class) public class BidscubeConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps bidscubeBidderDeps(BidderConfigurationProperties bidscubeConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(bidscubeConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BidscubeBidder(mapper, config.getEndpoint())) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BidstackConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BidstackConfiguration.java index 1103ac66853..2abd4e457cb 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BidstackConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BidstackConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/bidstack.yaml", factory = YamlPropertySourceFactory.class) public class BidstackConfiguration { @@ -30,13 +26,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps bidstackBidderDeps(BidderConfigurationProperties bidstackConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, CurrencyConversionService currencyConversionService, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(bidstackConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BidstackBidder(config.getEndpoint(), currencyConversionService, mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BigoadConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BigoadConfiguration.java index bd3c932efc2..d77a2b1d80e 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BigoadConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BigoadConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/bigoad.yaml", factory = YamlPropertySourceFactory.class) public class BigoadConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps bigoadBidderDeps(BidderConfigurationProperties bigoadConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(bigoadConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BigoadBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BlastoConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BlastoConfiguration.java index 1c57db91aba..137eec03af8 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BlastoConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BlastoConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/blasto.yaml", factory = YamlPropertySourceFactory.class) public class BlastoConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps blastoBidderDeps(BidderConfigurationProperties blastoConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(blastoConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BlastoBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BliinkBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BliinkBidderConfiguration.java index 6ce0d022f04..243c537eaaf 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BliinkBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BliinkBidderConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/bliink.yaml", factory = YamlPropertySourceFactory.class) public class BliinkBidderConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps bliinkBidderDeps(BidderConfigurationProperties bliinkConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(bliinkConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BliinkBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BlisBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BlisBidderConfiguration.java index 47d2f796f40..7c9f4b9b2e2 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BlisBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BlisBidderConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/blis.yaml", factory = YamlPropertySourceFactory.class) public class BlisBidderConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps blisBidderDeps(BidderConfigurationProperties blisConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(blisConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BlisBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BlueSeaConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BlueSeaConfiguration.java index 823396b8b5d..7caeb37ee98 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BlueSeaConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BlueSeaConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/bluesea.yaml", factory = YamlPropertySourceFactory.class) public class BlueSeaConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps blueseaBidderDeps(BidderConfigurationProperties blueseaConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(blueseaConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BlueSeaBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BmtmConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BmtmConfiguration.java index c9c7bcbebfa..c4d81d8a846 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BmtmConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BmtmConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/bmtm.yaml", factory = YamlPropertySourceFactory.class) public class BmtmConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps bmtmBidderDeps(BidderConfigurationProperties bmtmConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(bmtmConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BmtmBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BoldwinConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BoldwinConfiguration.java index f062311c4fa..810ab668c6f 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BoldwinConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BoldwinConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/boldwin.yaml", factory = YamlPropertySourceFactory.class) public class BoldwinConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps boldwinBidderDeps(BidderConfigurationProperties boldwinConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(boldwinConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BoldwinBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BoldwinRapidConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BoldwinRapidConfiguration.java index be498585d72..cfae168b105 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BoldwinRapidConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BoldwinRapidConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/boldwinrapid.yaml", factory = YamlPropertySourceFactory.class) public class BoldwinRapidConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps boldwinrapidBidderDeps(BidderConfigurationProperties boldwinRapidConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(boldwinRapidConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BoldwinRapidBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BraveConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BraveConfiguration.java index de364ab4bc0..39d5a5b1540 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BraveConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BraveConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/brave.yaml", factory = YamlPropertySourceFactory.class) public class BraveConfiguration { @@ -28,12 +24,10 @@ BidderConfigurationProperties configurationProperties() { } @Bean - BidderDeps braveBidderDeps(BidderConfigurationProperties braveConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { + BidderDeps braveBidderDeps(BidderConfigurationProperties braveConfigurationProperties, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(braveConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BraveBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/BwxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/BwxConfiguration.java index 6b8ce8bf7d2..b7582b35afd 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/BwxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/BwxConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import javax.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/bwx.yaml", factory = YamlPropertySourceFactory.class) public class BwxConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps bwxBidderDeps(BidderConfigurationProperties bwxConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(bwxConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new BwxBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ClydoConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ClydoConfiguration.java index 98cedfc8d08..1491c43f2b1 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ClydoConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ClydoConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/clydo.yaml", factory = YamlPropertySourceFactory.class) public class ClydoConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps clydoBidderDeps(BidderConfigurationProperties clydoConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(clydoConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ClydoBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/CointrafficConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/CointrafficConfiguration.java index 4eb4c660adb..a3563b7edcb 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/CointrafficConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/CointrafficConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/cointraffic.yaml", factory = YamlPropertySourceFactory.class) public class CointrafficConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps cointrafficBidderDeps(BidderConfigurationProperties cointrafficConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(cointrafficConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new CointrafficBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/CoinzillaConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/CoinzillaConfiguration.java index 896bd31ff10..1f2e3337c33 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/CoinzillaConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/CoinzillaConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/coinzilla.yaml", factory = YamlPropertySourceFactory.class) public class CoinzillaConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps coinzillaBidderDeps(BidderConfigurationProperties coinzillaConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(coinzillaConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new CoinzillaBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ColossusConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ColossusConfiguration.java index 8d466e2e842..d1ccdeda9e0 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ColossusConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ColossusConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/colossus.yaml", factory = YamlPropertySourceFactory.class) public class ColossusConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps colossusBidderDeps(BidderConfigurationProperties colossusConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(colossusConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ColossusBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/CompassConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/CompassConfiguration.java index e638d721fd0..c7be607396a 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/CompassConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/CompassConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/compass.yaml", factory = YamlPropertySourceFactory.class) public class CompassConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps compassBidderDeps(BidderConfigurationProperties compassConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(compassConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new CompassBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ConcertConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ConcertConfiguration.java index 6ee644c4b59..d7fcf3d9e83 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ConcertConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ConcertConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/concert.yaml", factory = YamlPropertySourceFactory.class) public class ConcertConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps concertBidderDeps(BidderConfigurationProperties concertConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(concertConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ConcertBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ConnatixConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ConnatixConfiguration.java index 09754adc489..4d643e93915 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ConnatixConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ConnatixConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/connatix.yaml", factory = YamlPropertySourceFactory.class) public class ConnatixConfiguration { @@ -30,13 +26,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps connatixBidderDeps(BidderConfigurationProperties connatixConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper, CurrencyConversionService currencyConversionService) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(connatixConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ConnatixBidder(config.getEndpoint(), currencyConversionService, mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ConnectAdConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ConnectAdConfiguration.java index e076c7b35e6..1a6f42fd697 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ConnectAdConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ConnectAdConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/connectad.yaml", factory = YamlPropertySourceFactory.class) public class ConnectAdConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps connectadBidderDeps(BidderConfigurationProperties connectadConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(connectadConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ConnectAdBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ConsumableConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ConsumableConfiguration.java index 70a31dfdddf..c863cb7a5eb 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ConsumableConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ConsumableConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/consumable.yaml", factory = YamlPropertySourceFactory.class) public class ConsumableConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps consumableBidderDeps(BidderConfigurationProperties consumableConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(consumableConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ConsumableBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ContxtfulConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ContxtfulConfiguration.java index 0759f38bc17..ce23bbcb3a8 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ContxtfulConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ContxtfulConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/contxtful.yaml", factory = YamlPropertySourceFactory.class) public class ContxtfulConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps contxtfulBidderDeps(BidderConfigurationProperties contxtfulConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(contxtfulConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ContxtfulBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/Copper6SspConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/Copper6SspConfiguration.java index 61340987965..33032c48d71 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/Copper6SspConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/Copper6SspConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/copper6ssp.yaml", factory = YamlPropertySourceFactory.class) public class Copper6SspConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps copper6sspBidderDeps(BidderConfigurationProperties copper6sspConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(copper6sspConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new Copper6SspBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/CpmStarConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/CpmStarConfiguration.java index b247970937b..2e96d8695e6 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/CpmStarConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/CpmStarConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/cpmstar.yaml", factory = YamlPropertySourceFactory.class) public class CpmStarConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps cpmstarBidderDeps(BidderConfigurationProperties cpmstarConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(cpmstarConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new CpmStarBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/CriteoConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/CriteoConfiguration.java index 5693167b62e..268dc575b93 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/CriteoConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/CriteoConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/criteo.yaml", factory = YamlPropertySourceFactory.class) public class CriteoConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps criteoBidderDeps(BidderConfigurationProperties criteoConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(criteoConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new CriteoBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/DatablocksConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/DatablocksConfiguration.java index 9d5d4fd9b08..4e59634d2e7 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/DatablocksConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/DatablocksConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/datablocks.yaml", factory = YamlPropertySourceFactory.class) public class DatablocksConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps datablocksBidderDeps(BidderConfigurationProperties datablocksConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(datablocksConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new DatablocksBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/DecenteradsConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/DecenteradsConfiguration.java index c1eb0e2b1e3..e96bd342adb 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/DecenteradsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/DecenteradsConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/decenterads.yaml", factory = YamlPropertySourceFactory.class) public class DecenteradsConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps decenteradsBidderDeps(BidderConfigurationProperties decenteradsConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(decenteradsConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new DecenteradsBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/DeepintentConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/DeepintentConfiguration.java index ac14dd71c2e..35bf022ef01 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/DeepintentConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/DeepintentConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/deepintent.yaml", factory = YamlPropertySourceFactory.class) public class DeepintentConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps deepintentBidderDeps(BidderConfigurationProperties deepintentConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(deepintentConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new DeepintentBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/DefineMediaConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/DefineMediaConfiguration.java index f0026d2e9e7..393e3a25eba 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/DefineMediaConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/DefineMediaConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import javax.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/definemedia.yaml", factory = YamlPropertySourceFactory.class) public class DefineMediaConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps definemediaBidderDeps(BidderConfigurationProperties definemediaConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(definemediaConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new DefineMediaBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/DianomiBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/DianomiBidderConfiguration.java index e9938a9d632..55061ea7372 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/DianomiBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/DianomiBidderConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/dianomi.yaml", factory = YamlPropertySourceFactory.class) public class DianomiBidderConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps dianomiBidderDeps(BidderConfigurationProperties dianomiConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(dianomiConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new DianomiBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/DisplayioConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/DisplayioConfiguration.java index 9f153fda821..b854a41beca 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/DisplayioConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/DisplayioConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/displayio.yaml", factory = YamlPropertySourceFactory.class) public class DisplayioConfiguration { @@ -31,12 +27,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps displayioBidderDeps(BidderConfigurationProperties displayioConfigurationProperties, CurrencyConversionService currencyConversionService, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(displayioConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new DisplayioBidder(currencyConversionService, config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/DmxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/DmxConfiguration.java index a80323c031c..cd490ae982c 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/DmxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/DmxConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/dmx.yaml", factory = YamlPropertySourceFactory.class) public class DmxConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps dmxBidderDeps(BidderConfigurationProperties dmxConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(dmxConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new DmxBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/DriftpixelConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/DriftpixelConfiguration.java index d44eeed42d4..1493972156a 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/DriftpixelConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/DriftpixelConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/driftpixel.yaml", factory = YamlPropertySourceFactory.class) public class DriftpixelConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps driftpixelBidderDeps(BidderConfigurationProperties driftpixelConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(driftpixelConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new DriftpixelBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/DxKultureBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/DxKultureBidderConfiguration.java index 658a2c8743c..6aa63ef7eb0 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/DxKultureBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/DxKultureBidderConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/dxkulture.yaml", factory = YamlPropertySourceFactory.class) public class DxKultureBidderConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps dxkultureBidderDeps(BidderConfigurationProperties dxkultureConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(dxkultureConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new DxKultureBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/Edge226Configuration.java b/src/main/java/org/prebid/server/spring/config/bidder/Edge226Configuration.java index 03ecfc2add9..2fc7c4d2fe6 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/Edge226Configuration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/Edge226Configuration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/edge226.yaml", factory = YamlPropertySourceFactory.class) public class Edge226Configuration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps edge226BidderDeps(BidderConfigurationProperties edge226ConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(edge226ConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new Edge226Bidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ElementalTVConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ElementalTVConfiguration.java index 8cece283dd5..c244ea7d456 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ElementalTVConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ElementalTVConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/elementaltv.yaml", factory = YamlPropertySourceFactory.class) public class ElementalTVConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps elementaltvBidderDeps(BidderConfigurationProperties elementalTVConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(elementalTVConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ElementalTVBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/EmtvConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/EmtvConfiguration.java index 3c5a934a8bc..03ce5f2e859 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/EmtvConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/EmtvConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/emtv.yaml", factory = YamlPropertySourceFactory.class) public class EmtvConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps emtvBidderDeps(BidderConfigurationProperties emtvConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(emtvConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new EmtvBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/EmxDigitalConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/EmxDigitalConfiguration.java index dbeccd07032..8ca4cb127be 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/EmxDigitalConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/EmxDigitalConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/emxdigital.yaml", factory = YamlPropertySourceFactory.class) public class EmxDigitalConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps emxdigitalBidderDeps(BidderConfigurationProperties emxdigitalConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(emxdigitalConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new EmxDigitalBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/EplanningConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/EplanningConfiguration.java index f67ab6d9ff5..ade3f212f4b 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/EplanningConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/EplanningConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/eplanning.yaml", factory = YamlPropertySourceFactory.class) public class EplanningConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps eplanningBidderDeps(BidderConfigurationProperties eplanningConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(eplanningConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new EplanningBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/EpomConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/EpomConfiguration.java index 88776cd74ad..57758da5fa2 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/EpomConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/EpomConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/epom.yaml", factory = YamlPropertySourceFactory.class) public class EpomConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps epomBidderDeps(BidderConfigurationProperties epomConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(epomConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new EpomBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/EpsilonConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/EpsilonConfiguration.java index 555028584bb..08cd12b070d 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/EpsilonConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/EpsilonConfiguration.java @@ -9,17 +9,14 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; import org.prebid.server.util.VersionInfo; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; import org.springframework.validation.annotation.Validated; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @Configuration @@ -36,14 +33,12 @@ EpsilonConfigurationProperties configurationProperties() { @Bean BidderDeps epsilonBidderDeps(EpsilonConfigurationProperties epsilonConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, VersionInfo versionInfo, JacksonMapper mapper, CurrencyConversionService currencyConversionService) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(epsilonConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new EpsilonBidder( config.getEndpoint(), diff --git a/src/main/java/org/prebid/server/spring/config/bidder/EscalaxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/EscalaxConfiguration.java index 29bd855b91b..2b16db00645 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/EscalaxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/EscalaxConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/escalax.yaml", factory = YamlPropertySourceFactory.class) public class EscalaxConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps escalaxBidderDeps(BidderConfigurationProperties escalaxConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(escalaxConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new EscalaxBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/EvolutionConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/EvolutionConfiguration.java index 9757923928e..48c6cc5f0e8 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/EvolutionConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/EvolutionConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/evolution.yaml", factory = YamlPropertySourceFactory.class) public class EvolutionConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps evolutionBidderDeps(BidderConfigurationProperties evolutionConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(evolutionConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new EvolutionBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ExcoConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ExcoConfiguration.java index 9e079821d2e..d09115081ad 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ExcoConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ExcoConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import javax.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/exco.yaml", factory = YamlPropertySourceFactory.class) public class ExcoConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps excoBidderDeps(BidderConfigurationProperties excoConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(excoConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ExcoBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/FeedAdConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/FeedAdConfiguration.java index a716452fbfa..41cf0fb519e 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/FeedAdConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/FeedAdConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/feedad.yaml", factory = YamlPropertySourceFactory.class) public class FeedAdConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps feedadBidderDeps(BidderConfigurationProperties feedadConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(feedadConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new FeedAdBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/FlatadsConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/FlatadsConfiguration.java index eef57c1c0a9..3d5781e5dd9 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/FlatadsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/FlatadsConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/flatads.yaml", factory = YamlPropertySourceFactory.class) public class FlatadsConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps flatadsBidderDeps(BidderConfigurationProperties flatadsConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(flatadsConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new FlatadsBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/FlippConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/FlippConfiguration.java index e2e36373073..cff084ffe0b 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/FlippConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/FlippConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/flipp.yaml", factory = YamlPropertySourceFactory.class) public class FlippConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps flippBidderDeps(BidderConfigurationProperties flippConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(flippConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new FlippBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/FreewheelSSPConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/FreewheelSSPConfiguration.java index 0ac29fb2ad0..57871d12e58 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/FreewheelSSPConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/FreewheelSSPConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/freewheelssp.yaml", factory = YamlPropertySourceFactory.class) public class FreewheelSSPConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps freewheelsspBidderDeps(BidderConfigurationProperties freewheelsspConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(freewheelsspConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new FreewheelSSPBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/FrvrAdnBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/FrvrAdnBidderConfiguration.java index f4c903a4968..bc4b0b58e11 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/FrvrAdnBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/FrvrAdnBidderConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/frvradn.yaml", factory = YamlPropertySourceFactory.class) public class FrvrAdnBidderConfiguration { @@ -31,12 +27,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps frvradnBidderDeps(BidderConfigurationProperties frvradnConfigurationProperties, CurrencyConversionService currencyConversionService, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(frvradnConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new FrvrAdnBidder(config.getEndpoint(), currencyConversionService, mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/GammaConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/GammaConfiguration.java index b26cefb1909..c88807add39 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/GammaConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/GammaConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/gamma.yaml", factory = YamlPropertySourceFactory.class) public class GammaConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps gammaBidderDeps(BidderConfigurationProperties gammaConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(gammaConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new GammaBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/GamoshiConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/GamoshiConfiguration.java index 15d37d3b5b8..0c1d00d0bc3 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/GamoshiConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/GamoshiConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/gamoshi.yaml", factory = YamlPropertySourceFactory.class) public class GamoshiConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps gamoshiBidderDeps(BidderConfigurationProperties gamoshiConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(gamoshiConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new GamoshiBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/GenericBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/GenericBidderConfiguration.java index 23f1e2f2928..b28444e76b2 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/GenericBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/GenericBidderConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/generic.yaml", factory = YamlPropertySourceFactory.class) public class GenericBidderConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps genericBidderDeps(BidderConfigurationProperties genericConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(genericConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new GenericBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/GlobalsunConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/GlobalsunConfiguration.java index 2eca33cefcd..e8be6dfbfd5 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/GlobalsunConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/GlobalsunConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/globalsun.yaml", factory = YamlPropertySourceFactory.class) public class GlobalsunConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps globalsunBidderDeps(BidderConfigurationProperties globalsunConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(globalsunConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new GlobalsunBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/GothamAdsConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/GothamAdsConfiguration.java index 97691f8f563..126e5166a6a 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/GothamAdsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/GothamAdsConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/gothamads.yaml", factory = YamlPropertySourceFactory.class) public class GothamAdsConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps gothamadsBidderDeps(BidderConfigurationProperties gothamAdsConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(gothamAdsConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new GothamAdsBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/GridConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/GridConfiguration.java index f7ddefef701..8053753921d 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/GridConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/GridConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/grid.yaml", factory = YamlPropertySourceFactory.class) public class GridConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps gridBidderDeps(BidderConfigurationProperties gridConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(gridConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new GridBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/GumgumConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/GumgumConfiguration.java index 7970022d1e3..29984762a12 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/GumgumConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/GumgumConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/gumgum.yaml", factory = YamlPropertySourceFactory.class) public class GumgumConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps gumgumBidderDeps(BidderConfigurationProperties gumgumConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(gumgumConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new GumgumBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/HuaweiAdsConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/HuaweiAdsConfiguration.java index ba69ed885b1..3d6e803c8b8 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/HuaweiAdsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/HuaweiAdsConfiguration.java @@ -18,9 +18,7 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -28,7 +26,6 @@ import org.springframework.validation.annotation.Validated; import jakarta.validation.Valid; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import java.time.Clock; import java.util.List; @@ -49,12 +46,10 @@ HuaweiAdsConfigurationProperties configurationProperties() { BidderDeps huaweiAdsBidderDeps(HuaweiAdsConfigurationProperties huaweiadsConfigurationProperties, CountryCodeMapper countryCodeMapper, Clock clock, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(huaweiadsConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> { final ExtraInfo extraInfo = config.getExtraInfo(); return new HuaweiAdsBidder( diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ImdsConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ImdsConfiguration.java index 020dd0e6936..b4e90bbc06a 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ImdsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ImdsConfiguration.java @@ -5,17 +5,13 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; import org.prebid.server.version.PrebidVersionProvider; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/imds.yaml", factory = YamlPropertySourceFactory.class) public class ImdsConfiguration { @@ -30,13 +26,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps imdsBidderDeps(BidderConfigurationProperties imdsConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, PrebidVersionProvider prebidVersionProvider, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(imdsConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ImdsBidder( config.getEndpoint(), prebidVersionProvider.getNameVersionRecord(), diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ImpactifyConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ImpactifyConfiguration.java index af1fe09228f..68eb7e8eccf 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ImpactifyConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ImpactifyConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/impactify.yaml", factory = YamlPropertySourceFactory.class) public class ImpactifyConfiguration { @@ -30,13 +26,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps impactifyBidderDeps(BidderConfigurationProperties impactifyConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, CurrencyConversionService currencyConversionService, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(impactifyConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ImpactifyBidder(config.getEndpoint(), mapper, currencyConversionService)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ImprovedigitalConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ImprovedigitalConfiguration.java index 4003ed66438..73ce296c062 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ImprovedigitalConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ImprovedigitalConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/improvedigital.yaml", factory = YamlPropertySourceFactory.class) public class ImprovedigitalConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps improvedigitalBidderDeps(BidderConfigurationProperties improvedigitalConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(improvedigitalConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ImprovedigitalBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/InmobiConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/InmobiConfiguration.java index 1b2f21ec06e..c917c91b97e 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/InmobiConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/InmobiConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/inmobi.yaml", factory = YamlPropertySourceFactory.class) public class InmobiConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps inmobiBidderDeps(BidderConfigurationProperties inmobiConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(inmobiConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new InmobiBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/InsticatorConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/InsticatorConfiguration.java index 7ae0e1a3432..487994dc55b 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/InsticatorConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/InsticatorConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/insticator.yaml", factory = YamlPropertySourceFactory.class) public class InsticatorConfiguration { @@ -30,13 +26,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps insticatorBidderDeps(BidderConfigurationProperties insticatorConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, CurrencyConversionService currencyConversionService, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(insticatorConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new InsticatorBidder(currencyConversionService, config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/InteractiveOffersConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/InteractiveOffersConfiguration.java index 4dbc0a2ab0b..b0d2c555020 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/InteractiveOffersConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/InteractiveOffersConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/interactiveoffers.yaml", factory = YamlPropertySourceFactory.class) public class InteractiveOffersConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps interactiveoffersBidderDeps(BidderConfigurationProperties interactiveoffersConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(interactiveoffersConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new InteractiveOffersBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/IntertechConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/IntertechConfiguration.java index a6a5ea7c736..01c474c94e4 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/IntertechConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/IntertechConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/intertech.yaml", factory = YamlPropertySourceFactory.class) public class IntertechConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps intertechBidderDeps(BidderConfigurationProperties intertechConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(intertechConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new IntertechBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/InvibesConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/InvibesConfiguration.java index 2111af79fb2..ba48fcc279f 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/InvibesConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/InvibesConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/invibes.yaml", factory = YamlPropertySourceFactory.class) public class InvibesConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps invibesBidderDeps(BidderConfigurationProperties invibesConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(invibesConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new InvibesBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/IqxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/IqxConfiguration.java index 189ad72adda..8af5e218d38 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/IqxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/IqxConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/iqx.yaml", factory = YamlPropertySourceFactory.class) public class IqxConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps iqxBidderDeps(BidderConfigurationProperties iqxConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(iqxConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new IqxBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/IqzoneConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/IqzoneConfiguration.java index 4b9ddff193c..e962889e6a5 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/IqzoneConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/IqzoneConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/iqzone.yaml", factory = YamlPropertySourceFactory.class) public class IqzoneConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps iqzoneBidderDeps(BidderConfigurationProperties iqzoneConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(iqzoneConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new IqzoneBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/IxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/IxConfiguration.java index 49a1bdbea69..9e05bff420c 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/IxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/IxConfiguration.java @@ -5,17 +5,13 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; import org.prebid.server.version.PrebidVersionProvider; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/ix.yaml", factory = YamlPropertySourceFactory.class) public class IxConfiguration { @@ -30,13 +26,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps ixBidderDeps(BidderConfigurationProperties ixConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, PrebidVersionProvider prebidVersionProvider, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(ixConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new IxBidder(config.getEndpoint(), prebidVersionProvider, mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/JixieConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/JixieConfiguration.java index a3110e233ff..24af7e6e4d8 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/JixieConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/JixieConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/jixie.yaml", factory = YamlPropertySourceFactory.class) public class JixieConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps jixieBidderDeps(BidderConfigurationProperties jixieConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(jixieConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new JixieBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/KargoConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/KargoConfiguration.java index d01076cae25..a1e8c4fae0e 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/KargoConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/KargoConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/kargo.yaml", factory = YamlPropertySourceFactory.class) public class KargoConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps kargoBidderDeps(BidderConfigurationProperties kargoConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(kargoConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new KargoBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/KayzenConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/KayzenConfiguration.java index 94e953d2506..be01c335b41 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/KayzenConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/KayzenConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/kayzen.yaml", factory = YamlPropertySourceFactory.class) public class KayzenConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps kayzenBidderDeps(BidderConfigurationProperties kayzenConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(kayzenConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new KayzenBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/KidozConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/KidozConfiguration.java index c7c5b689c0c..70710b63dcf 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/KidozConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/KidozConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/kidoz.yaml", factory = YamlPropertySourceFactory.class) public class KidozConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps kidozBidderDeps(BidderConfigurationProperties kidozConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(kidozConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new KidozBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/KiviAdsBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/KiviAdsBidderConfiguration.java index 816ff86dac5..ee5df4aca0a 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/KiviAdsBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/KiviAdsBidderConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/kiviads.yaml", factory = YamlPropertySourceFactory.class) public class KiviAdsBidderConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps kiviAdsBidderDeps(BidderConfigurationProperties kiviAdsConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(kiviAdsConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new KiviAdsBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/KoblerConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/KoblerConfiguration.java index eaa41c79bde..7ac29111354 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/KoblerConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/KoblerConfiguration.java @@ -9,9 +9,7 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -35,12 +33,10 @@ KoblerConfigurationProperties configurationProperties() { @Bean BidderDeps koblerBidderDeps(KoblerConfigurationProperties config, CurrencyConversionService currencyConversionService, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(config) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(cfg -> new KoblerBidder( cfg.getEndpoint(), cfg.getDevEndpoint(), diff --git a/src/main/java/org/prebid/server/spring/config/bidder/KrushmediaConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/KrushmediaConfiguration.java index 4b271d5cfac..a42ff1a4fe3 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/KrushmediaConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/KrushmediaConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/krushmedia.yaml", factory = YamlPropertySourceFactory.class) public class KrushmediaConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps krushmediaBidderDeps(BidderConfigurationProperties krushmediaConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(krushmediaConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new KrushmediaBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/KueezRtbConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/KueezRtbConfiguration.java index 06e89467d0c..ab41d44fd5c 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/KueezRtbConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/KueezRtbConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/kueezrtb.yaml", factory = YamlPropertySourceFactory.class) public class KueezRtbConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps kueezrtbBidderDeps(BidderConfigurationProperties kueezrtbConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(kueezrtbConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new KueezRtbBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/LemmaDigitalConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/LemmaDigitalConfiguration.java index 3cdc83faed4..e3f9920f7c2 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/LemmaDigitalConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/LemmaDigitalConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/lemmadigital.yaml", factory = YamlPropertySourceFactory.class) public class LemmaDigitalConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps lemmadigitalBidderDeps(BidderConfigurationProperties lemmaDigitalConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(lemmaDigitalConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new LemmaDigitalBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/LimeLightDigitalConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/LimeLightDigitalConfiguration.java index a94fc4020a2..dc62ba9a691 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/LimeLightDigitalConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/LimeLightDigitalConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/limelightDigital.yaml", factory = YamlPropertySourceFactory.class) public class LimeLightDigitalConfiguration { @@ -30,13 +26,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps limeLightDigitalBidderDeps(BidderConfigurationProperties limelightDigitalConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, CurrencyConversionService currencyConversionService, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(limelightDigitalConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new LimeLightDigitalBidder(config.getEndpoint(), currencyConversionService, mapper)) .assemble(); diff --git a/src/main/java/org/prebid/server/spring/config/bidder/LmKiviAdsBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/LmKiviAdsBidderConfiguration.java index cca3ccf4dfe..0835cea7381 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/LmKiviAdsBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/LmKiviAdsBidderConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/lmkiviads.yaml", factory = YamlPropertySourceFactory.class) public class LmKiviAdsBidderConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps lmKiviadsBidderDeps(BidderConfigurationProperties lmkiviadsConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(lmkiviadsConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new LmKiviAdsBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/LockerdomeConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/LockerdomeConfiguration.java index b18f98fd753..88c26bf7f22 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/LockerdomeConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/LockerdomeConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/lockerdome.yaml", factory = YamlPropertySourceFactory.class) public class LockerdomeConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps lockerdomeBidderDeps(BidderConfigurationProperties lockerdomeConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(lockerdomeConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new LockerdomeBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/LoganConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/LoganConfiguration.java index 424c64cd7a0..12bcf16506a 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/LoganConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/LoganConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/logan.yaml", factory = YamlPropertySourceFactory.class) public class LoganConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps loganBidderDeps(BidderConfigurationProperties loganConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(loganConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new LoganBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/LogicadConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/LogicadConfiguration.java index 5063fd1c040..98425d448e4 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/LogicadConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/LogicadConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/logicad.yaml", factory = YamlPropertySourceFactory.class) public class LogicadConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps logicadBidderDeps(BidderConfigurationProperties logicadConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(logicadConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new LogicadBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/LoopmeConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/LoopmeConfiguration.java index 757f8059ed7..20e59ce5392 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/LoopmeConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/LoopmeConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import javax.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/loopme.yaml", factory = YamlPropertySourceFactory.class) public class LoopmeConfiguration { @@ -29,11 +25,9 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps loopmeBidderDeps(BidderConfigurationProperties loopmeConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(loopmeConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new LoopmeBidder(loopmeConfigurationProperties.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/LoyalConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/LoyalConfiguration.java index 2f42de9a763..45fdc5dfe39 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/LoyalConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/LoyalConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/loyal.yaml", factory = YamlPropertySourceFactory.class) public class LoyalConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps loaylBidderDeps(BidderConfigurationProperties loyalConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(loyalConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new LoyalBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/LunamediaConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/LunamediaConfiguration.java index 96076560f70..ef3deed54a9 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/LunamediaConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/LunamediaConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/lunamedia.yaml", factory = YamlPropertySourceFactory.class) public class LunamediaConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps lunamediaBidderDeps(BidderConfigurationProperties lunamediaConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(lunamediaConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new LunamediaBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MabidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MabidderConfiguration.java index 3adf4eaa583..9679910b403 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MabidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/MabidderConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import javax.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/mabidder.yaml", factory = YamlPropertySourceFactory.class) public class MabidderConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps mabidderDeps(BidderConfigurationProperties mabidderConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(mabidderConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new MabidderBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MadsenseConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MadsenseConfiguration.java index a1cc34057e3..e3099f1ae3f 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MadsenseConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/MadsenseConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/madsense.yaml", factory = YamlPropertySourceFactory.class) public class MadsenseConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps madsenseBidderDeps(BidderConfigurationProperties madsenseConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(madsenseConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new MadsenseBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MadvertiseConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MadvertiseConfiguration.java index 938bc20e96c..50a7e555589 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MadvertiseConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/MadvertiseConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/madvertise.yaml", factory = YamlPropertySourceFactory.class) public class MadvertiseConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps madvertiseBidderDeps(BidderConfigurationProperties madvertiseConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(madvertiseConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new MadvertiseBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MarsmediaConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MarsmediaConfiguration.java index 99012d82a84..525eda46014 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MarsmediaConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/MarsmediaConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/marsmedia.yaml", factory = YamlPropertySourceFactory.class) public class MarsmediaConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps marsmediaBidderDeps(BidderConfigurationProperties marsmediaConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(marsmediaConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new MarsmediaBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MediaGoConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MediaGoConfiguration.java index acef4e6f035..9f7d9dbc12f 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MediaGoConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/MediaGoConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/mediago.yaml", factory = YamlPropertySourceFactory.class) public class MediaGoConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps mediagoBidderDeps(BidderConfigurationProperties mediagoConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(mediagoConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new MediaGoBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MedianetConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MedianetConfiguration.java index 359f630febf..57d272c17ef 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MedianetConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/MedianetConfiguration.java @@ -5,7 +5,6 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; import org.prebid.server.util.HttpUtil; import org.springframework.beans.factory.annotation.Value; @@ -36,7 +35,6 @@ BidderDeps medianetBidderDeps(BidderConfigurationProperties medianetConfiguratio return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(medianetConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new MedianetBidder(resolveEndpoint(config.getEndpoint(), externalUrl), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MediasquareConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MediasquareConfiguration.java index bbdd5b6ed2b..d75a6ef410d 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MediasquareConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/MediasquareConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/mediasquare.yaml", factory = YamlPropertySourceFactory.class) public class MediasquareConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps mediasquareBidderDeps(BidderConfigurationProperties mediasquareConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(mediasquareConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new MediasquareBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MeloZenConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MeloZenConfiguration.java index 797ec11730c..ff38264bbd4 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MeloZenConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/MeloZenConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/melozen.yaml", factory = YamlPropertySourceFactory.class) public class MeloZenConfiguration { @@ -31,12 +27,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps melozenBidderDeps(BidderConfigurationProperties melozenConfigurationProperties, CurrencyConversionService currencyConversionService, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(melozenConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new MeloZenBidder(currencyConversionService, config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MetaxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MetaxConfiguration.java index df258ba30cd..1002bee699c 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MetaxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/MetaxConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/metax.yaml", factory = YamlPropertySourceFactory.class) public class MetaxConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps metaxBidderDeps(BidderConfigurationProperties metaxConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(metaxConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new MetaxBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MgidConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MgidConfiguration.java index 893e30c424f..d893cb80f3d 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MgidConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/MgidConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/mgid.yaml", factory = YamlPropertySourceFactory.class) public class MgidConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps mgidBidderDeps(BidderConfigurationProperties mgidConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(mgidConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new MgidBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MgidxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MgidxConfiguration.java index f891d3f44d7..93df815aa42 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MgidxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/MgidxConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/mgidx.yaml", factory = YamlPropertySourceFactory.class) public class MgidxConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps mgidxBidderDeps(BidderConfigurationProperties mgidxConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(mgidxConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new MgidxBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MinuteMediaConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MinuteMediaConfiguration.java index fd32784ea58..5285244e58f 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MinuteMediaConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/MinuteMediaConfiguration.java @@ -8,16 +8,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/minutemedia.yaml", factory = YamlPropertySourceFactory.class) public class MinuteMediaConfiguration { @@ -32,12 +28,10 @@ MinuteMediaConfigurationProperties configurationProperties() { @Bean BidderDeps minutemediaBidderDeps(MinuteMediaConfigurationProperties minutemediaConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(minutemediaConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new MinuteMediaBidder( config.getEndpoint(), config.getTestEndpoint(), diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MissenaConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MissenaConfiguration.java index 798f57dc35e..54d3a939a92 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MissenaConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/MissenaConfiguration.java @@ -6,17 +6,13 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; import org.prebid.server.version.PrebidVersionProvider; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/missena.yaml", factory = YamlPropertySourceFactory.class) public class MissenaConfiguration { @@ -31,14 +27,12 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps missenaBidderDeps(BidderConfigurationProperties missenaConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, CurrencyConversionService currencyConversionService, PrebidVersionProvider prebidVersionProvider, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(missenaConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new MissenaBidder( config.getEndpoint(), mapper, currencyConversionService, prebidVersionProvider)) .assemble(); diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MobfoxpbConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MobfoxpbConfiguration.java index bb8c80c037d..dfab8f5f2aa 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MobfoxpbConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/MobfoxpbConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/mobfoxpb.yaml", factory = YamlPropertySourceFactory.class) public class MobfoxpbConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps mobfoxpbBidderDeps(BidderConfigurationProperties mobfoxpbConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(mobfoxpbConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new MobfoxpbBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MobilefuseConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MobilefuseConfiguration.java index 6496f517007..c7400787654 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MobilefuseConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/MobilefuseConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/mobilefuse.yaml", factory = YamlPropertySourceFactory.class) public class MobilefuseConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps mobilefuseBidderDeps(BidderConfigurationProperties mobilefuseConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(mobilefuseConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new MobilefuseBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MobkoiConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MobkoiConfiguration.java index 9b4761fdfaf..531695a090c 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MobkoiConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/MobkoiConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import javax.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/mobkoi.yaml", factory = YamlPropertySourceFactory.class) public class MobkoiConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps mobkoiBidderDeps(BidderConfigurationProperties mobkoiConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(mobkoiConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new MobkoiBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/MotorikConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/MotorikConfiguration.java index e68ba630872..be60762aeeb 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/MotorikConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/MotorikConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/motorik.yaml", factory = YamlPropertySourceFactory.class) public class MotorikConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps motorikBidderDeps(BidderConfigurationProperties motorikConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(motorikConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new MotorikBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/NativeryBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/NativeryBidderConfiguration.java index 0dc07f48e94..35ea0b80cf7 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/NativeryBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/NativeryBidderConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/nativery.yaml", factory = YamlPropertySourceFactory.class) public class NativeryBidderConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps nativeryBidderDeps(BidderConfigurationProperties nativeryConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(nativeryConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new NativeryBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/NativoConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/NativoConfiguration.java index 52cb32090db..22c63d5f1f7 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/NativoConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/NativoConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/nativo.yaml", factory = YamlPropertySourceFactory.class) public class NativoConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps nativoBidderDeps(BidderConfigurationProperties nativoConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(nativoConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new NativoBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/NextMillenniumConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/NextMillenniumConfiguration.java index 4d102b90f9c..5ebf327c70e 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/NextMillenniumConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/NextMillenniumConfiguration.java @@ -8,16 +8,13 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; import org.prebid.server.version.PrebidVersionProvider; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; import java.util.List; @Configuration @@ -34,13 +31,11 @@ NextMillenniumConfigurationProperties configurationProperties() { @Bean BidderDeps nextMillenniumBidderDeps(NextMillenniumConfigurationProperties nextMillenniumConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, PrebidVersionProvider prebidVersionProvider, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(nextMillenniumConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new NextMillenniumBidder( config.getEndpoint(), mapper, diff --git a/src/main/java/org/prebid/server/spring/config/bidder/Nexx360Configuration.java b/src/main/java/org/prebid/server/spring/config/bidder/Nexx360Configuration.java index 2eccf05c68c..58e0244c2d5 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/Nexx360Configuration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/Nexx360Configuration.java @@ -5,17 +5,13 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; import org.prebid.server.version.PrebidVersionProvider; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/nexx360.yaml", factory = YamlPropertySourceFactory.class) public class Nexx360Configuration { @@ -30,13 +26,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps nexx360BidderDeps(BidderConfigurationProperties nexx360ConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, PrebidVersionProvider prebidVersionProvider, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(nexx360ConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new Nexx360Bidder( config.getEndpoint(), mapper, diff --git a/src/main/java/org/prebid/server/spring/config/bidder/NobidConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/NobidConfiguration.java index 52079d032ef..c5a55e9f234 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/NobidConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/NobidConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/nobid.yaml", factory = YamlPropertySourceFactory.class) public class NobidConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps nobidBidderDeps(BidderConfigurationProperties nobidConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(nobidConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new NobidBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/OguryConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/OguryConfiguration.java index 5e6174a3e35..ef1829c05a6 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/OguryConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/OguryConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/ogury.yaml", factory = YamlPropertySourceFactory.class) public class OguryConfiguration { @@ -30,13 +26,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps oguryBidderDeps(BidderConfigurationProperties oguryConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, CurrencyConversionService currencyConversionService, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(oguryConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new OguryBidder(config.getEndpoint(), currencyConversionService, mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/OmsBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/OmsBidderConfiguration.java index 92062b99e1e..d8b2c8c3596 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/OmsBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/OmsBidderConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/oms.yaml", factory = YamlPropertySourceFactory.class) public class OmsBidderConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps omsBidderDeps(BidderConfigurationProperties omsConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(omsConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new OmsBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/OnetagConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/OnetagConfiguration.java index ce37fc92ce2..afa622393f4 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/OnetagConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/OnetagConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/onetag.yaml", factory = YamlPropertySourceFactory.class) public class OnetagConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps onetagBidderDeps(BidderConfigurationProperties onetagConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(onetagConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new OnetagBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/OpenWebConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/OpenWebConfiguration.java index 370839be501..7e2f670db34 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/OpenWebConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/OpenWebConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/openweb.yaml", factory = YamlPropertySourceFactory.class) public class OpenWebConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties openWebProperties() { @Bean BidderDeps openWebBidderDeps(BidderConfigurationProperties openWebConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(openWebConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new OpenWebBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/OpenxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/OpenxConfiguration.java index 5e3886d5814..e23d6c8df23 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/OpenxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/OpenxConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/openx.yaml", factory = YamlPropertySourceFactory.class) public class OpenxConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties openxProperties() { @Bean BidderDeps openxBidderDeps(BidderConfigurationProperties openxConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(openxConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new OpenxBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/OperaadsConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/OperaadsConfiguration.java index 8b5055b4c29..75a220363eb 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/OperaadsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/OperaadsConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/operaads.yaml", factory = YamlPropertySourceFactory.class) public class OperaadsConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps operaadsBidderDeps(BidderConfigurationProperties operaadsConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(operaadsConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new OperaadsBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/OptidigitalConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/OptidigitalConfiguration.java index dbd9309821b..1060b48fdb6 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/OptidigitalConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/OptidigitalConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/optidigital.yaml", factory = YamlPropertySourceFactory.class) public class OptidigitalConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps optidigitalBidderDeps(BidderConfigurationProperties optidigitalConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(optidigitalConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new OptidigitalBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/OrakiConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/OrakiConfiguration.java index 8c5fbc6abe2..5c7ea052239 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/OrakiConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/OrakiConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/oraki.yaml", factory = YamlPropertySourceFactory.class) public class OrakiConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps orakiBidderDeps(BidderConfigurationProperties orakiConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(orakiConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new OrakiBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/OrbidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/OrbidderConfiguration.java index 0e9bbcb29a6..ba80b79da87 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/OrbidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/OrbidderConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/orbidder.yaml", factory = YamlPropertySourceFactory.class) public class OrbidderConfiguration { @@ -31,12 +27,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps orbidderBidderDeps(BidderConfigurationProperties orbidderConfigurationProperties, CurrencyConversionService currencyConversionService, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(orbidderConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new OrbidderBidder(config.getEndpoint(), currencyConversionService, mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/OutbrainConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/OutbrainConfiguration.java index 194dd8ca14a..fd4bd54dc4a 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/OutbrainConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/OutbrainConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/outbrain.yaml", factory = YamlPropertySourceFactory.class) public class OutbrainConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps outbrainBidderDeps(BidderConfigurationProperties outbrainConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(outbrainConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new OutbrainBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/OwnAdxBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/OwnAdxBidderConfiguration.java index b34028b4221..c7d47a8eabc 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/OwnAdxBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/OwnAdxBidderConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import javax.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/ownadx.yaml", factory = YamlPropertySourceFactory.class) public class OwnAdxBidderConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps ownAdxBidderDeps(BidderConfigurationProperties ownAdxConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(ownAdxConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new OwnAdxBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/PangleConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/PangleConfiguration.java index 2cd2c3b361c..a86690cf4b6 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/PangleConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/PangleConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/pangle.yaml", factory = YamlPropertySourceFactory.class) public class PangleConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps pangleBidderDeps(BidderConfigurationProperties pangleConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(pangleConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new PangleBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/PgamSspConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/PgamSspConfiguration.java index 7296f81625b..4b856c78b4e 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/PgamSspConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/PgamSspConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/pgamssp.yaml", factory = YamlPropertySourceFactory.class) public class PgamSspConfiguration { @@ -31,12 +27,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps pgamsspBidderDeps(BidderConfigurationProperties pgamsspConfigurationProperties, CurrencyConversionService currencyConversionService, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(pgamsspConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new PgamSspBidder(config.getEndpoint(), currencyConversionService, mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/PlaydigoConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/PlaydigoConfiguration.java index 75ae60eb5af..50830196caa 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/PlaydigoConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/PlaydigoConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/playdigo.yaml", factory = YamlPropertySourceFactory.class) public class PlaydigoConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps playdigoBidderDeps(BidderConfigurationProperties playdigoConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(playdigoConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new PlaydigoBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/PrecisoConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/PrecisoConfiguration.java index dfa65428aac..49b4c0bdcd0 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/PrecisoConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/PrecisoConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/preciso.yaml", factory = YamlPropertySourceFactory.class) public class PrecisoConfiguration { @@ -30,12 +26,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps precisoBidderDeps(BidderConfigurationProperties precisoConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, CurrencyConversionService currencyConversionService, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(precisoConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new PrecisoBidder( config.getEndpoint(), currencyConversionService, diff --git a/src/main/java/org/prebid/server/spring/config/bidder/PubmaticConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/PubmaticConfiguration.java index 2fa5477630f..39d5a3e9348 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/PubmaticConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/PubmaticConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/pubmatic.yaml", factory = YamlPropertySourceFactory.class) public class PubmaticConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps pubmaticBidderDeps(BidderConfigurationProperties pubmaticConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(pubmaticConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new PubmaticBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/PubnativeConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/PubnativeConfiguration.java index 5e1ec608cc5..a411274e3f5 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/PubnativeConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/PubnativeConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/pubnative.yaml", factory = YamlPropertySourceFactory.class) public class PubnativeConfiguration { @@ -30,13 +26,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps pubnativeBidderDeps(BidderConfigurationProperties pubnativeConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, CurrencyConversionService currencyConversionService, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(pubnativeConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new PubnativeBidder(config.getEndpoint(), mapper, currencyConversionService)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/PubriseConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/PubriseConfiguration.java index e8fd5755a58..74fe16cf9c7 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/PubriseConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/PubriseConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/pubrise.yaml", factory = YamlPropertySourceFactory.class) public class PubriseConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps pubriseBidderDeps(BidderConfigurationProperties pubriseConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(pubriseConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new PubriseBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/PulsepointConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/PulsepointConfiguration.java index 91ca1b19220..551d52bb3e1 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/PulsepointConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/PulsepointConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/pulsepoint.yaml", factory = YamlPropertySourceFactory.class) public class PulsepointConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps pulsepointBidderDeps(BidderConfigurationProperties pulsepointConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(pulsepointConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new PulsepointBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/PwbidConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/PwbidConfiguration.java index d076873bdf0..17cfaa07ceb 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/PwbidConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/PwbidConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/pwbid.yaml", factory = YamlPropertySourceFactory.class) public class PwbidConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps pwbidBidderDeps(BidderConfigurationProperties pwbidConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(pwbidConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new PwbidBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/QtConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/QtConfiguration.java index 0ccfe750403..eba1168e128 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/QtConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/QtConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/qt.yaml", factory = YamlPropertySourceFactory.class) public class QtConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps qtBidderDeps(BidderConfigurationProperties qtConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(qtConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new QtBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ReadPeakConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ReadPeakConfiguration.java index 351d6b121ac..e1b847af214 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ReadPeakConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ReadPeakConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/readpeak.yaml", factory = YamlPropertySourceFactory.class) public class ReadPeakConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps readpeakBidderDeps(BidderConfigurationProperties readpeakConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(readpeakConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ReadPeakBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/RediadsConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/RediadsConfiguration.java index 8339e77c199..6394ffef0eb 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/RediadsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/RediadsConfiguration.java @@ -8,9 +8,7 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -32,12 +30,10 @@ RediadsConfigurationProperties configurationProperties() { @Bean BidderDeps rediadsBidderDeps(RediadsConfigurationProperties rediadsConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(rediadsConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new RediadsBidder( config.getEndpoint(), mapper, diff --git a/src/main/java/org/prebid/server/spring/config/bidder/RelevantDigitalConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/RelevantDigitalConfiguration.java index b25ca14eb32..6e97324c782 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/RelevantDigitalConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/RelevantDigitalConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/relevantdigital.yaml", factory = YamlPropertySourceFactory.class) public class RelevantDigitalConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps relevantdigitalBidderDeps(BidderConfigurationProperties relevantDigitalConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(relevantDigitalConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new RelevantDigitalBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ResetDigitalConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ResetDigitalConfiguration.java index 4e4de161f66..5421fd03218 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ResetDigitalConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ResetDigitalConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/resetdigital.yaml", factory = YamlPropertySourceFactory.class) public class ResetDigitalConfiguration { @@ -30,13 +26,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps resetDigitalBidderDeps(BidderConfigurationProperties resetDigitalConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, CurrencyConversionService currencyConversionService, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(resetDigitalConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ResetDigitalBidder( config.getEndpoint(), currencyConversionService, diff --git a/src/main/java/org/prebid/server/spring/config/bidder/RevcontentConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/RevcontentConfiguration.java index c21bf079b70..59e22fe787b 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/RevcontentConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/RevcontentConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/revcontent.yaml", factory = YamlPropertySourceFactory.class) public class RevcontentConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps revcontentBidderDeps(BidderConfigurationProperties revcontentConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(revcontentConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new RevcontentBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/RichaudienceConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/RichaudienceConfiguration.java index fe8c2a00523..55e810c8062 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/RichaudienceConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/RichaudienceConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/richaudience.yaml", factory = YamlPropertySourceFactory.class) public class RichaudienceConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps richaudienceBidderDeps(BidderConfigurationProperties richaudienceConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(richaudienceConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new RichaudienceBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/RiseConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/RiseConfiguration.java index c54c39cd6c8..03cb1de5a2f 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/RiseConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/RiseConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/rise.yaml", factory = YamlPropertySourceFactory.class) public class RiseConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps riseBidderDeps(BidderConfigurationProperties riseConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(riseConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new RiseBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/RoulaxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/RoulaxConfiguration.java index 01ba4e70e3d..c623f4ca72d 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/RoulaxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/RoulaxConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import javax.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/roulax.yaml", factory = YamlPropertySourceFactory.class) public class RoulaxConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps roulaxBidderDeps(BidderConfigurationProperties roulaxConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(roulaxConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new RoulaxBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/RtbhouseConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/RtbhouseConfiguration.java index 2b99afafad9..8d421e41229 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/RtbhouseConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/RtbhouseConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/rtbhouse.yaml", factory = YamlPropertySourceFactory.class) public class RtbhouseConfiguration { @@ -30,12 +26,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps rtbhouseBidderDeps(BidderConfigurationProperties rtbhouseConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, CurrencyConversionService currencyConversionService, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(rtbhouseConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new RtbhouseBidder( config.getEndpoint(), currencyConversionService, diff --git a/src/main/java/org/prebid/server/spring/config/bidder/RubiconConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/RubiconConfiguration.java index 7089abb6d78..2fbf7f876c3 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/RubiconConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/RubiconConfiguration.java @@ -11,7 +11,6 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; import org.prebid.server.version.PrebidVersionProvider; import org.springframework.beans.factory.annotation.Value; @@ -47,7 +46,6 @@ BidderDeps rubiconBidderDeps(RubiconConfigurationProperties rubiconConfiguration return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(rubiconConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new RubiconBidder( BIDDER_NAME, diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SaLunamediaConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SaLunamediaConfiguration.java index ab466600f26..e129ddf45a3 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SaLunamediaConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SaLunamediaConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/salunamedia.yaml", factory = YamlPropertySourceFactory.class) public class SaLunamediaConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps salunamediaBidderDeps(BidderConfigurationProperties salunamediaConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(salunamediaConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SaLunamediaBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ScreencoreConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ScreencoreConfiguration.java index 3cf155022e9..7699029941a 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ScreencoreConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ScreencoreConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/screencore.yaml", factory = YamlPropertySourceFactory.class) public class ScreencoreConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps screencoreBidderDeps(BidderConfigurationProperties screencoreConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(screencoreConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ScreencoreBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SeedingAllianceBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SeedingAllianceBidderConfiguration.java index 426950a684a..96fd169fa50 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SeedingAllianceBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SeedingAllianceBidderConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/seedingAlliance.yaml", factory = YamlPropertySourceFactory.class) public class SeedingAllianceBidderConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps seedingAllianceBidderDeps(BidderConfigurationProperties seedingAllianceConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(seedingAllianceConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SeedingAllianceBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SeedtagConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SeedtagConfiguration.java index 08d5c527d62..fd7940da8f2 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SeedtagConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SeedtagConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/seedtag.yaml", factory = YamlPropertySourceFactory.class) public class SeedtagConfiguration { @@ -30,13 +26,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps seedtagBidderDeps(BidderConfigurationProperties seedtagConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, CurrencyConversionService currencyConversionService, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(seedtagConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SeedtagBidder( config.getEndpoint(), currencyConversionService, diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SharethroughConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SharethroughConfiguration.java index 3e75a34f8cc..5a3f4068fee 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SharethroughConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SharethroughConfiguration.java @@ -6,17 +6,13 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; import org.prebid.server.version.PrebidVersionProvider; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/sharethrough.yaml", factory = YamlPropertySourceFactory.class) public class SharethroughConfiguration { @@ -31,14 +27,12 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps sharethroughBidderDeps(BidderConfigurationProperties sharethroughConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, CurrencyConversionService currencyConversionService, PrebidVersionProvider prebidVersionProvider, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(sharethroughConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SharethroughBidder( config.getEndpoint(), currencyConversionService, diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ShowheroesConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ShowheroesConfiguration.java index 260d8376675..277773d181b 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ShowheroesConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ShowheroesConfiguration.java @@ -6,17 +6,13 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; import org.prebid.server.version.PrebidVersionProvider; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/showheroes.yaml", factory = YamlPropertySourceFactory.class) public class ShowheroesConfiguration { @@ -31,14 +27,12 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps showheroesBidderDeps(BidderConfigurationProperties showheroesConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, CurrencyConversionService currencyConversionService, PrebidVersionProvider prebidVersionProvider, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(showheroesConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ShowheroesBidder( config.getEndpoint(), currencyConversionService, diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SilverPushConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SilverPushConfiguration.java index b3dcb5baf90..a6e43a1b0b7 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SilverPushConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SilverPushConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/silverpush.yaml", factory = YamlPropertySourceFactory.class) public class SilverPushConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps silverpushBidderDeps(BidderConfigurationProperties silverpushConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(silverpushConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SilverPushBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SilvermobConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SilvermobConfiguration.java index e26433fb580..383bd010d10 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SilvermobConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SilvermobConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/silvermob.yaml", factory = YamlPropertySourceFactory.class) public class SilvermobConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps silvermobBidderDeps(BidderConfigurationProperties silvermobConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(silvermobConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SilvermobBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SmaatoConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SmaatoConfiguration.java index 0851bd87d7d..e3653581b2e 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SmaatoConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SmaatoConfiguration.java @@ -5,15 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; import java.time.Clock; @Configuration @@ -30,13 +27,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps smaatoBidderDeps(BidderConfigurationProperties smaatoConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, Clock clock, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(smaatoConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SmaatoBidder(config.getEndpoint(), mapper, clock)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SmartadserverConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SmartadserverConfiguration.java index 3d831685aff..831ed6bd612 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SmartadserverConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SmartadserverConfiguration.java @@ -8,16 +8,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/smartadserver.yaml", factory = YamlPropertySourceFactory.class) public class SmartadserverConfiguration { @@ -32,12 +28,10 @@ SmartadserverConfigurationProperties configurationProperties() { @Bean BidderDeps smartadserverBidderDeps(SmartadserverConfigurationProperties smartadserverConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(smartadserverConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SmartadserverBidder( config.getEndpoint(), config.getSecondaryEndpoint(), mapper)) .assemble(); diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SmarthubConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SmarthubConfiguration.java index 218f7f8ae96..243e417bcb7 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SmarthubConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SmarthubConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/smarthub.yaml", factory = YamlPropertySourceFactory.class) public class SmarthubConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps smarthubBidderDeps(BidderConfigurationProperties smarthubConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(smarthubConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SmarthubBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SmartrtbConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SmartrtbConfiguration.java index f0a5f22622c..ca4eab866b3 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SmartrtbConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SmartrtbConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/smartrtb.yaml", factory = YamlPropertySourceFactory.class) public class SmartrtbConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps smartrtbBidderDeps(BidderConfigurationProperties smartrtbConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(smartrtbConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SmartrtbBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SmartxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SmartxConfiguration.java index 5b6c08b6dd3..08f57667669 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SmartxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SmartxConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/smartx.yaml", factory = YamlPropertySourceFactory.class) public class SmartxConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps smartxBidderDeps(BidderConfigurationProperties smartxConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(smartxConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SmartxBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SmartyAdsConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SmartyAdsConfiguration.java index a5de7f27094..e5f75684518 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SmartyAdsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SmartyAdsConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/smartyads.yaml", factory = YamlPropertySourceFactory.class) public class SmartyAdsConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps smartyadsBidderDeps(BidderConfigurationProperties smartyadsConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(smartyadsConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SmartyAdsBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SmileWantedConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SmileWantedConfiguration.java index eb3ae5bb83c..e3186c8f0b7 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SmileWantedConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SmileWantedConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/smilewanted.yaml", factory = YamlPropertySourceFactory.class) public class SmileWantedConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps smilewantedBidderDeps(BidderConfigurationProperties smilewantedConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(smilewantedConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SmileWantedBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SmootConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SmootConfiguration.java index 154bb8c4779..6507d280aa8 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SmootConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SmootConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/smoot.yaml", factory = YamlPropertySourceFactory.class) public class SmootConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps smootBidderDeps(BidderConfigurationProperties smootConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(smootConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SmootBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SmrtconnectConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SmrtconnectConfiguration.java index 24eb4d44996..8f797a92038 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SmrtconnectConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SmrtconnectConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import javax.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/smrtconnect.yaml", factory = YamlPropertySourceFactory.class) public class SmrtconnectConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps smrtconnectBidderDeps(BidderConfigurationProperties smrtconnectConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(smrtconnectConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SmrtconnectBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SonobiConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SonobiConfiguration.java index f640fe9f34d..225ed9af2a7 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SonobiConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SonobiConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/sonobi.yaml", factory = YamlPropertySourceFactory.class) public class SonobiConfiguration { @@ -31,12 +27,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps sonobiBidderDeps(BidderConfigurationProperties sonobiConfigurationProperties, CurrencyConversionService currencyConversionService, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(sonobiConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SonobiBidder(currencyConversionService, config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SovrnConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SovrnConfiguration.java index 4de292e9184..183bda1294e 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SovrnConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SovrnConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/sovrn.yaml", factory = YamlPropertySourceFactory.class) public class SovrnConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps sovrnBidderDeps(BidderConfigurationProperties sovrnConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(sovrnConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SovrnBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SovrnXspConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SovrnXspConfiguration.java index a494790bb71..114d795a27f 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SovrnXspConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SovrnXspConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/sovrnXsp.yaml", factory = YamlPropertySourceFactory.class) public class SovrnXspConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps sovrnXspBidderDeps(BidderConfigurationProperties sovrnXspConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(sovrnXspConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SovrnXspBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SparteoConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SparteoConfiguration.java index 5934319d2db..19006f9c803 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SparteoConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SparteoConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/sparteo.yaml", factory = YamlPropertySourceFactory.class) @@ -30,12 +26,10 @@ public BidderConfigurationProperties configurationProperties() { @Bean public BidderDeps sparteoBidderDeps(BidderConfigurationProperties sparteoConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(sparteoConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SparteoBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/SspbcBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/SspbcBidderConfiguration.java index 95ff7edcf08..f0849de3540 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/SspbcBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/SspbcBidderConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/sspbc.yaml", factory = YamlPropertySourceFactory.class) public class SspbcBidderConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps sspbcBidderDeps(BidderConfigurationProperties sspbcConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(sspbcConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new SspbcBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/StartioBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/StartioBidderConfiguration.java index 1cb3bda1cf3..2ed6ec2aa93 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/StartioBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/StartioBidderConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/startio.yaml", factory = YamlPropertySourceFactory.class) public class StartioBidderConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps startioBidderDeps(BidderConfigurationProperties startioConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(startioConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new StartioBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/StroeerCoreConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/StroeerCoreConfiguration.java index 49369a2ddac..6e0d80dd6f0 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/StroeerCoreConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/StroeerCoreConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/stroeercore.yaml", factory = YamlPropertySourceFactory.class) public class StroeerCoreConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps stroeercoreBidderDeps(BidderConfigurationProperties stroeercoreConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(stroeercoreConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new StroeerCoreBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/TaboolaConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TaboolaConfiguration.java index ef917b09bc5..93d6756db5c 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/TaboolaConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TaboolaConfiguration.java @@ -5,7 +5,6 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -13,8 +12,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/taboola.yaml", factory = YamlPropertySourceFactory.class) public class TaboolaConfiguration { @@ -30,12 +27,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps taboolaBidderDeps(BidderConfigurationProperties taboolaConfigurationProperties, @Value("${gdpr.host-vendor-id:#{null}}") Integer hostVendorId, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(taboolaConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new TaboolaBidder(config.getEndpoint(), hostVendorId, mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/TappxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TappxConfiguration.java index 6c7b8dedae6..e8844e29c68 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/TappxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TappxConfiguration.java @@ -5,15 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; import java.time.Clock; @Configuration @@ -30,13 +27,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps tappxBidderDeps(BidderConfigurationProperties tappxConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, Clock clock, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(tappxConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new TappxBidder(config.getEndpoint(), clock, mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/TeadsConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TeadsConfiguration.java index a1cb6c26c99..6ee47423658 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/TeadsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TeadsConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/teads.yaml", factory = YamlPropertySourceFactory.class) public class TeadsConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps teadsBidderDeps(BidderConfigurationProperties teadsConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(teadsConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new TeadsBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/TealConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TealConfiguration.java index cbbff678a7e..8eefc95155e 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/TealConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TealConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/teal.yaml", factory = YamlPropertySourceFactory.class) public class TealConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps tealBidderDeps(BidderConfigurationProperties tealConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(tealConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new TealBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/TelariaConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TelariaConfiguration.java index 9be27f6bc33..b07ef6afcf8 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/TelariaConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TelariaConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/telaria.yaml", factory = YamlPropertySourceFactory.class) public class TelariaConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps telariaBidderDeps(BidderConfigurationProperties telariaConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(telariaConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new TelariaBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/util/TeqblazeConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TeqblazeConfiguration.java similarity index 81% rename from src/main/java/org/prebid/server/spring/config/bidder/util/TeqblazeConfiguration.java rename to src/main/java/org/prebid/server/spring/config/bidder/TeqblazeConfiguration.java index b780582cf11..bff299b2f9d 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/util/TeqblazeConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TeqblazeConfiguration.java @@ -1,18 +1,16 @@ -package org.prebid.server.spring.config.bidder.util; +package org.prebid.server.spring.config.bidder; import org.prebid.server.bidder.BidderDeps; import org.prebid.server.bidder.teqblaze.TeqblazeBidder; import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; +import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/teqblaze.yaml", factory = YamlPropertySourceFactory.class) public class TeqblazeConfiguration { @@ -27,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps teqblazeBidderDeps(BidderConfigurationProperties teqblazeConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(teqblazeConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new TeqblazeBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/TheTradeDeskConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TheTradeDeskConfiguration.java index 899c29d2293..f641d22e3c5 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/TheTradeDeskConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TheTradeDeskConfiguration.java @@ -8,16 +8,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/thetradedesk.yaml", factory = YamlPropertySourceFactory.class) public class TheTradeDeskConfiguration { @@ -32,12 +28,10 @@ TheTradeDeskConfigurationProperties configurationProperties() { @Bean BidderDeps theTradeDeskBidderDeps(TheTradeDeskConfigurationProperties theTradeDeskConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(theTradeDeskConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new TheTradeDeskBidder( config.getEndpoint(), mapper, diff --git a/src/main/java/org/prebid/server/spring/config/bidder/TheadxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TheadxConfiguration.java index 6bb9e397e05..f0825c525c3 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/TheadxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TheadxConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import javax.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/theadx.yaml", factory = YamlPropertySourceFactory.class) public class TheadxConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps theadxBidderDeps(BidderConfigurationProperties theadxConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(theadxConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new TheadxBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ThirtyThreeAcrossConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ThirtyThreeAcrossConfiguration.java index 1a04588e973..bc130fea840 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ThirtyThreeAcrossConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ThirtyThreeAcrossConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/thirtythreeacross.yaml", factory = YamlPropertySourceFactory.class) public class ThirtyThreeAcrossConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps thirtythreeacrossBidderDeps(BidderConfigurationProperties thirtyThreeAcrossConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(thirtyThreeAcrossConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ThirtyThreeAcrossBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/TpmnAdnBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TpmnAdnBidderConfiguration.java index 0a40807f424..9006119fc6c 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/TpmnAdnBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TpmnAdnBidderConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/tpmn.yaml", factory = YamlPropertySourceFactory.class) public class TpmnAdnBidderConfiguration { @@ -31,12 +27,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps tpmnBidderDeps(BidderConfigurationProperties tpmnConfigurationProperties, CurrencyConversionService currencyConversionService, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(tpmnConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new TpmnBidder(config.getEndpoint(), currencyConversionService, mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/TradPlusBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TradPlusBidderConfiguration.java index 8bd04ffd8f3..1ba50fa5377 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/TradPlusBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TradPlusBidderConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import javax.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/tradplus.yaml", factory = YamlPropertySourceFactory.class) public class TradPlusBidderConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps tradplusBidderDeps(BidderConfigurationProperties tradplusConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(tradplusConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new TradPlusBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/TrafficGateConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TrafficGateConfiguration.java index 33e0ecaa1e8..c13d84282fc 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/TrafficGateConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TrafficGateConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/trafficgate.yaml", factory = YamlPropertySourceFactory.class) public class TrafficGateConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps trafficGateBidderDeps(BidderConfigurationProperties trafficGateConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(trafficGateConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new TrafficGateBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/TripleliftConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TripleliftConfiguration.java index 301b26478c1..da4894895ff 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/TripleliftConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TripleliftConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/triplelift.yaml", factory = YamlPropertySourceFactory.class) public class TripleliftConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps tripleliftBidderDeps(BidderConfigurationProperties tripleliftConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(tripleliftConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new TripleliftBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/TripleliftNativeConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TripleliftNativeConfiguration.java index 11ef984aa78..1a9934f8aa3 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/TripleliftNativeConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TripleliftNativeConfiguration.java @@ -9,16 +9,13 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; import org.springframework.validation.annotation.Validated; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import java.util.List; @@ -37,12 +34,10 @@ TripleliftNativeConfigurationProperties configurationProperties() { @Bean BidderDeps tripleliftNativeBidderDeps( TripleliftNativeConfigurationProperties tripleliftNativeConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(tripleliftNativeConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new TripleliftNativeBidder( config.getEndpoint(), diff --git a/src/main/java/org/prebid/server/spring/config/bidder/TrustedstackConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TrustedstackConfiguration.java index 679792ee341..c01786f59c0 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/TrustedstackConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TrustedstackConfiguration.java @@ -5,7 +5,6 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -34,7 +33,6 @@ BidderDeps trustedstackBidderDeps(BidderConfigurationProperties trustedstackConf return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(trustedstackConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new TrustedstackBidder(config.getEndpoint(), externalUrl, mapper)) .assemble(); diff --git a/src/main/java/org/prebid/server/spring/config/bidder/TrustxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/TrustxConfiguration.java index 35a7cb4a50b..69dc593397f 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/TrustxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/TrustxConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/trustx.yaml", factory = YamlPropertySourceFactory.class) public class TrustxConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps trustxBidderDeps(BidderConfigurationProperties trustxConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(trustxConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new TrustxBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/UcfunnelConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/UcfunnelConfiguration.java index 6e2e4067b7d..06dff2b49c8 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/UcfunnelConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/UcfunnelConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/ucfunnel.yaml", factory = YamlPropertySourceFactory.class) public class UcfunnelConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps ucfunnelBidderDeps(BidderConfigurationProperties ucfunnelConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(ucfunnelConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new UcfunnelBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/UndertoneConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/UndertoneConfiguration.java index a51380096ea..c811cc7724a 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/UndertoneConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/UndertoneConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/undertone.yaml", factory = YamlPropertySourceFactory.class) public class UndertoneConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps undertoneBidderDeps(BidderConfigurationProperties undertoneConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(undertoneConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new UndertoneBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/UnicornConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/UnicornConfiguration.java index 6feae487f51..86203001746 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/UnicornConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/UnicornConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/unicorn.yaml", factory = YamlPropertySourceFactory.class) public class UnicornConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps unicornBidderDeps(BidderConfigurationProperties unicornConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(unicornConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new UnicornBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/UnrulyConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/UnrulyConfiguration.java index 44ed956b391..780f3063bf2 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/UnrulyConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/UnrulyConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/unruly.yaml", factory = YamlPropertySourceFactory.class) public class UnrulyConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps unrulyBidderDeps(BidderConfigurationProperties unrulyConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(unrulyConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new UnrulyBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/VidazooConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/VidazooConfiguration.java index bf83a8bcaac..9366e7d991b 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/VidazooConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/VidazooConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/vidazoo.yaml", factory = YamlPropertySourceFactory.class) public class VidazooConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps vidazooBidderDeps(BidderConfigurationProperties vidazooConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(vidazooConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new VidazooBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/VideoHeroesConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/VideoHeroesConfiguration.java index f501af44cf4..f2332ad40e4 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/VideoHeroesConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/VideoHeroesConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/videoheroes.yaml", factory = YamlPropertySourceFactory.class) public class VideoHeroesConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps videoheroesBidderDeps(BidderConfigurationProperties videoheroesConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(videoheroesConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new VideoHeroesBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/VideobyteConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/VideobyteConfiguration.java index a25f213c6a1..32f715ca941 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/VideobyteConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/VideobyteConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/videobyte.yaml", factory = YamlPropertySourceFactory.class) public class VideobyteConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps videobyteBidderDeps(BidderConfigurationProperties videobyteConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(videobyteConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new VideobyteBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/VidoomyConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/VidoomyConfiguration.java index 45806a99bf0..bea99a3ba3b 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/VidoomyConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/VidoomyConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/vidoomy.yaml", factory = YamlPropertySourceFactory.class) public class VidoomyConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps vidoomyBidderDeps(BidderConfigurationProperties vidoomyConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(vidoomyConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new VidoomyBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/VisibleMeasuresConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/VisibleMeasuresConfiguration.java index 9dfc739b5ff..ca7e0146b00 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/VisibleMeasuresConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/VisibleMeasuresConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/visiblemeasures.yaml", factory = YamlPropertySourceFactory.class) public class VisibleMeasuresConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps visiblemeasuresBidderDeps(BidderConfigurationProperties visiblemeasuresConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(visiblemeasuresConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new VisibleMeasuresBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/VisxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/VisxConfiguration.java index a3585633163..ff9d938512f 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/VisxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/VisxConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/visx.yaml", factory = YamlPropertySourceFactory.class) public class VisxConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps visxBidderDeps(BidderConfigurationProperties visxConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(visxConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new VisxBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/VoxConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/VoxConfiguration.java index 0d0974c87d0..9392cf5e23a 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/VoxConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/VoxConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/vox.yaml", factory = YamlPropertySourceFactory.class) public class VoxConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps voxBidderDeps(BidderConfigurationProperties voxConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(voxConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new VoxBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/VrtcalConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/VrtcalConfiguration.java index 73e0b9bacc5..9914600a3b3 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/VrtcalConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/VrtcalConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/vrtcal.yaml", factory = YamlPropertySourceFactory.class) public class VrtcalConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps vrtcalBidderDeps(BidderConfigurationProperties vrtcalConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(vrtcalConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new VrtcalBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/VungleConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/VungleConfiguration.java index a2bc6bd427e..70549c3f9b5 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/VungleConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/VungleConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/vungle.yaml", factory = YamlPropertySourceFactory.class) public class VungleConfiguration { @@ -30,13 +26,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps vungleBidderDeps(BidderConfigurationProperties vungleConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, CurrencyConversionService currencyConversionService, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(vungleConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new VungleBidder(config.getEndpoint(), currencyConversionService, mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/XeworksBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/XeworksBidderConfiguration.java index be4681a98e7..2db8299acc6 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/XeworksBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/XeworksBidderConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/xeworks.yaml", factory = YamlPropertySourceFactory.class) public class XeworksBidderConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps xeworksBidderDeps(BidderConfigurationProperties xeworksConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(xeworksConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new XeworksBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/YahooAdsConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/YahooAdsConfiguration.java index 9cd3ed1249b..78a857edcd1 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/YahooAdsConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/YahooAdsConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/yahooAds.yaml", factory = YamlPropertySourceFactory.class) public class YahooAdsConfiguration { @@ -30,13 +26,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps yahooAdsBidderDeps(BidderConfigurationProperties yahooAdsConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper, BidRequestOrtbVersionConversionManager conversionManager) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(yahooAdsConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new YahooAdsBidder(config.getEndpoint(), conversionManager, mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/YandexConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/YandexConfiguration.java index 5f1afa3398f..cc4ec05550e 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/YandexConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/YandexConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/yandex.yaml", factory = YamlPropertySourceFactory.class) public class YandexConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps yandexBidderDeps(BidderConfigurationProperties yandexConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(yandexConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new YandexBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/YeahmobiConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/YeahmobiConfiguration.java index 1bc55fd4ef8..05fb3084845 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/YeahmobiConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/YeahmobiConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/yeahmobi.yaml", factory = YamlPropertySourceFactory.class) public class YeahmobiConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps yeahmobiBidderDeps(BidderConfigurationProperties yeahmobiConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(yeahmobiConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new YeahmobiBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/YearxeroConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/YearxeroConfiguration.java index 1ce349de7dd..3f8c327a1df 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/YearxeroConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/YearxeroConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/yearxero.yaml", factory = YamlPropertySourceFactory.class) public class YearxeroConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps yearxeroBidderDeps(BidderConfigurationProperties yearxeroConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(yearxeroConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new YearxeroBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/YieldlabConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/YieldlabConfiguration.java index 5bf1f496477..028f5363d19 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/YieldlabConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/YieldlabConfiguration.java @@ -5,15 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; import java.time.Clock; @Configuration @@ -30,13 +27,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps yieldlabBidderDeps(BidderConfigurationProperties yieldlabConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, Clock clock, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(yieldlabConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new YieldlabBidder(config.getEndpoint(), clock, mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/YieldmoConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/YieldmoConfiguration.java index c8d9c6eff62..22b3b85cfe2 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/YieldmoConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/YieldmoConfiguration.java @@ -6,16 +6,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/yieldmo.yaml", factory = YamlPropertySourceFactory.class) public class YieldmoConfiguration { @@ -30,13 +26,11 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps yieldmoBidderDeps(BidderConfigurationProperties yieldmoConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper, CurrencyConversionService currencyConversionService) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(yieldmoConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new YieldmoBidder(config.getEndpoint(), currencyConversionService, mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/YieldoneConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/YieldoneConfiguration.java index 8e32a38e2d3..d89c2e2838c 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/YieldoneConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/YieldoneConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/yieldone.yaml", factory = YamlPropertySourceFactory.class) public class YieldoneConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps yieldoneBidderDeps(BidderConfigurationProperties yieldoneConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(yieldoneConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new YieldoneBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ZMaticooBidderConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ZMaticooBidderConfiguration.java index 540a58a67ec..09388a7c31d 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ZMaticooBidderConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ZMaticooBidderConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import javax.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/zmaticoo.yaml", factory = YamlPropertySourceFactory.class) public class ZMaticooBidderConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps zmaticooBidderDeps(BidderConfigurationProperties zmaticooConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(zmaticooConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ZMaticooBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ZentotemConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ZentotemConfiguration.java index 1578640e0ad..482f4eda2b1 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ZentotemConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ZentotemConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/zentotem.yaml", factory = YamlPropertySourceFactory.class) public class ZentotemConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps zentotemBidderDeps(BidderConfigurationProperties zentotemConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(zentotemConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ZentotemBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/ZeroclickfraudConfiguration.java b/src/main/java/org/prebid/server/spring/config/bidder/ZeroclickfraudConfiguration.java index 3430977f4db..cae7b8977b1 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/ZeroclickfraudConfiguration.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/ZeroclickfraudConfiguration.java @@ -5,16 +5,12 @@ import org.prebid.server.json.JacksonMapper; import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.util.BidderDepsAssembler; -import org.prebid.server.spring.config.bidder.util.UsersyncerCreator; import org.prebid.server.spring.env.YamlPropertySourceFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import jakarta.validation.constraints.NotBlank; - @Configuration @PropertySource(value = "classpath:/bidder-config/zeroclickfraud.yaml", factory = YamlPropertySourceFactory.class) public class ZeroclickfraudConfiguration { @@ -29,12 +25,10 @@ BidderConfigurationProperties configurationProperties() { @Bean BidderDeps zeroclickfraudBidderDeps(BidderConfigurationProperties zeroclickfraudConfigurationProperties, - @NotBlank @Value("${external-url}") String externalUrl, JacksonMapper mapper) { return BidderDepsAssembler.forBidder(BIDDER_NAME) .withConfig(zeroclickfraudConfigurationProperties) - .usersyncerCreator(UsersyncerCreator.create(externalUrl)) .bidderCreator(config -> new ZeroclickfraudBidder(config.getEndpoint(), mapper)) .assemble(); } diff --git a/src/main/java/org/prebid/server/spring/config/bidder/model/usersync/CookieFamilySource.java b/src/main/java/org/prebid/server/spring/config/bidder/model/usersync/CookieFamilySource.java deleted file mode 100644 index 42cae92a9ae..00000000000 --- a/src/main/java/org/prebid/server/spring/config/bidder/model/usersync/CookieFamilySource.java +++ /dev/null @@ -1,6 +0,0 @@ -package org.prebid.server.spring.config.bidder.model.usersync; - -public enum CookieFamilySource { - - ROOT, ALIAS -} diff --git a/src/main/java/org/prebid/server/spring/config/bidder/util/BidderDepsAssembler.java b/src/main/java/org/prebid/server/spring/config/bidder/util/BidderDepsAssembler.java index 1c0b27d1188..415a20f8ee2 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/util/BidderDepsAssembler.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/util/BidderDepsAssembler.java @@ -19,7 +19,6 @@ import org.prebid.server.spring.config.bidder.model.BidderConfigurationProperties; import org.prebid.server.spring.config.bidder.model.MediaType; import org.prebid.server.spring.config.bidder.model.MetaInfo; -import org.prebid.server.spring.config.bidder.model.usersync.CookieFamilySource; import org.prebid.server.spring.config.bidder.model.usersync.UsersyncConfigurationProperties; import org.prebid.server.spring.env.YamlPropertySourceFactory; import org.springframework.boot.context.properties.bind.Binder; @@ -36,7 +35,6 @@ import java.util.Optional; import java.util.Properties; import java.util.Set; -import java.util.function.BiFunction; import java.util.function.Function; public class BidderDepsAssembler { @@ -52,7 +50,6 @@ public class BidderDepsAssembler { private String bidderName; private CFG configProperties; - private BiFunction usersyncerCreator; private Function> bidderCreator; private BidderDepsAssembler() { @@ -64,13 +61,6 @@ public static BidderDepsAssembler usersyncerCreator( - BiFunction usersyncerCreator) { - - this.usersyncerCreator = usersyncerCreator; - return this; - } - public BidderDepsAssembler bidderCreator(Function> bidderCreator) { this.bidderCreator = bidderCreator; return this; @@ -98,7 +88,6 @@ private BidderInstanceDeps coreDeps() { validateCoreCapabilities(bidderName, configProperties); return deps( bidderName, - usersyncer(configProperties, CookieFamilySource.ROOT), BidderInfoCreator.create(configProperties), configProperties); } @@ -120,20 +109,13 @@ private BidderInstanceDeps aliasDeps(Map.Entry entry) { validateCapabilities(alias, aliasMergedProperties, bidderName, configProperties); - final Usersyncer usersyncer = Optional.ofNullable(aliasConfigProperties.getUsersync()) - .map(UsersyncConfigurationProperties::getCookieFamilyName) - .map(familyName -> usersyncer(aliasMergedProperties, CookieFamilySource.ALIAS)) - .orElseGet(() -> usersyncer(aliasMergedProperties, CookieFamilySource.ROOT)); - return deps( alias, - usersyncer, BidderInfoCreator.create(aliasMergedProperties, bidderName), aliasMergedProperties); } private BidderInstanceDeps deps(String bidderName, - Usersyncer usersyncer, BidderInfo bidderInfo, CFG configProperties) { @@ -141,16 +123,16 @@ private BidderInstanceDeps deps(String bidderName, .name(bidderName) .deprecatedNames(configProperties.getDeprecatedNames()) .bidderInfo(bidderInfo) - .usersyncer(usersyncer) + .usersyncer(usersyncer(configProperties)) .bidder(bidder(configProperties)) .build(); } - private Usersyncer usersyncer(CFG configProperties, CookieFamilySource cookieFamilySource) { + private Usersyncer usersyncer(CFG configProperties) { final UsersyncConfigurationProperties usersync = configProperties.getUsersync(); final boolean usersyncPresent = usersync != null && ObjectUtils.anyNotNull(usersync.getRedirect(), usersync.getIframe()); - return usersyncPresent ? usersyncerCreator.apply(usersync, cookieFamilySource) : null; + return usersyncPresent ? UsersyncerUtil.create(usersync) : null; } private Bidder bidder(CFG configProperties) { diff --git a/src/main/java/org/prebid/server/spring/config/bidder/util/UsersyncerCreator.java b/src/main/java/org/prebid/server/spring/config/bidder/util/UsersyncerUtil.java similarity index 51% rename from src/main/java/org/prebid/server/spring/config/bidder/util/UsersyncerCreator.java rename to src/main/java/org/prebid/server/spring/config/bidder/util/UsersyncerUtil.java index b5606c719b9..7bba4eb01a3 100644 --- a/src/main/java/org/prebid/server/spring/config/bidder/util/UsersyncerCreator.java +++ b/src/main/java/org/prebid/server/spring/config/bidder/util/UsersyncerUtil.java @@ -1,34 +1,20 @@ package org.prebid.server.spring.config.bidder.util; -import org.apache.commons.lang3.StringUtils; import org.prebid.server.bidder.UsersyncMethod; import org.prebid.server.bidder.UsersyncMethodType; -import org.prebid.server.bidder.UsersyncUtil; import org.prebid.server.bidder.Usersyncer; -import org.prebid.server.spring.config.bidder.model.usersync.CookieFamilySource; import org.prebid.server.spring.config.bidder.model.usersync.UsersyncBidderRegulationScopeProperties; import org.prebid.server.spring.config.bidder.model.usersync.UsersyncConfigurationProperties; import org.prebid.server.spring.config.bidder.model.usersync.UsersyncMethodConfigurationProperties; -import org.prebid.server.util.HttpUtil; import java.util.Objects; -import java.util.function.BiFunction; -public class UsersyncerCreator { +public class UsersyncerUtil { - private UsersyncerCreator() { + private UsersyncerUtil() { } - public static BiFunction create( - String externalUrl) { - - return (usersyncConfig, cookieFamilySource) -> - createAndValidate(usersyncConfig, cookieFamilySource, externalUrl); - } - - private static Usersyncer createAndValidate(UsersyncConfigurationProperties usersync, - CookieFamilySource cookieFamilySource, - String externalUrl) { + public static Usersyncer create(UsersyncConfigurationProperties usersync) { final String cookieFamilyName = usersync.getCookieFamilyName(); final UsersyncBidderRegulationScopeProperties skipwhenConfig = usersync.getSkipwhen(); @@ -36,17 +22,14 @@ private static Usersyncer createAndValidate(UsersyncConfigurationProperties user return Usersyncer.of( usersync.getEnabled(), cookieFamilyName, - cookieFamilySource, - toMethod(UsersyncMethodType.IFRAME, usersync.getIframe(), cookieFamilyName, externalUrl), - toMethod(UsersyncMethodType.REDIRECT, usersync.getRedirect(), cookieFamilyName, externalUrl), + toMethod(UsersyncMethodType.IFRAME, usersync.getIframe()), + toMethod(UsersyncMethodType.REDIRECT, usersync.getRedirect()), skipwhenConfig != null && skipwhenConfig.isGdpr(), skipwhenConfig == null ? null : skipwhenConfig.getGppSid()); } private static UsersyncMethod toMethod(UsersyncMethodType type, - UsersyncMethodConfigurationProperties properties, - String cookieFamilyName, - String externalUrl) { + UsersyncMethodConfigurationProperties properties) { if (properties == null) { return null; @@ -55,14 +38,9 @@ private static UsersyncMethod toMethod(UsersyncMethodType type, return UsersyncMethod.builder() .type(type) .usersyncUrl(Objects.requireNonNull(properties.getUrl())) - .redirectUrl(toRedirectUrl(cookieFamilyName, externalUrl, properties.getUidMacro())) + .uidMacro(properties.getUidMacro()) .supportCORS(properties.getSupportCors()) .formatOverride(properties.getFormatOverride()) .build(); } - - private static String toRedirectUrl(String cookieFamilyName, String externalUri, String uidMacro) { - return UsersyncUtil.CALLBACK_URL_TEMPLATE.formatted( - HttpUtil.validateUrl(externalUri), cookieFamilyName, StringUtils.defaultString(uidMacro)); - } } diff --git a/src/test/java/org/prebid/server/bidder/BidderCatalogTest.java b/src/test/java/org/prebid/server/bidder/BidderCatalogTest.java index 96861372cd3..bffdb40faf9 100644 --- a/src/test/java/org/prebid/server/bidder/BidderCatalogTest.java +++ b/src/test/java/org/prebid/server/bidder/BidderCatalogTest.java @@ -310,7 +310,11 @@ public void usersyncReadyBiddersShouldReturnBiddersThatCanSync() { .name("bidder-with-usersync") .deprecatedNames(emptyList()) .bidderInfo(infoOfBidderWithUsersyncConfig) - .usersyncer(Usersyncer.of("bidder-with-usersync-family", null, null, false, null)) + .usersyncer(Usersyncer.of("bidder-with-usersync-family", + null, + null, + false, + null)) .build())), BidderDeps.of(singletonList(BidderInstanceDeps.builder() .name("bidder-without-usersync") @@ -320,7 +324,11 @@ public void usersyncReadyBiddersShouldReturnBiddersThatCanSync() { BidderDeps.of(singletonList(BidderInstanceDeps.builder() .name("disabled-bidder-with-usersync") .bidderInfo(infoOfDisabledBidderWithUsersyncConfig) - .usersyncer(Usersyncer.of("isabled-bidder-with-usersync-family", null, null, false, null)) + .usersyncer(Usersyncer.of("disabled-bidder-with-usersync-family", + null, + null, + false, + null)) .deprecatedNames(emptyList()) .build()))); diff --git a/src/test/java/org/prebid/server/bidder/UsersyncInfoBuilderTest.java b/src/test/java/org/prebid/server/bidder/UsersyncInfoBuilderTest.java deleted file mode 100644 index d6357c17e2d..00000000000 --- a/src/test/java/org/prebid/server/bidder/UsersyncInfoBuilderTest.java +++ /dev/null @@ -1,174 +0,0 @@ -package org.prebid.server.bidder; - -import org.junit.jupiter.api.Test; -import org.prebid.server.privacy.ccpa.Ccpa; -import org.prebid.server.privacy.model.Privacy; -import org.prebid.server.proto.response.UsersyncInfo; - -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; - -public class UsersyncInfoBuilderTest { - - @Test - public void assembleUsersyncInfoShouldAppendRedirectUrlToUsersyncUrl() { - // given and when - final UsersyncInfo result = UsersyncInfoBuilder - .from(createUsersyncMethod( - "http://url/redirect={{redirect_url}}", - "http://localhost:8000redirectUrl")) - .build(); - - // then - assertThat(result.getUrl()).isEqualTo("http://url/redirect=http%3A%2F%2Flocalhost%3A8000redirectUrl%3Ff%3Di"); - } - - @Test - public void assembleUsersyncInfoShouldAppendEncodedRedirectUrlAndNotEncodedQueryParamsToUsersyncUrl() { - // given and when - final UsersyncInfo result = UsersyncInfoBuilder - .from(createUsersyncMethod( - "http://url/redirect={{redirect_url}}", - "http://localhost:8000/setuid?gdpr={{gdpr}}?gdpr={{gdpr}}")) - .build(); - - // then - assertThat(result.getUrl()).isEqualTo( - "http://url/redirect=http%3A%2F%2Flocalhost%3A8000%2F" - + "setuid%3Fgdpr%3D%7B%7Bgdpr%7D%7D?gdpr={{gdpr}}&f=i"); - } - - @Test - public void assembleUsersyncInfoShouldIgnoreRedirectUrlIfNotDefined() { - // given and when - final UsersyncInfo result = UsersyncInfoBuilder - .from(createUsersyncMethod("http://url/redirect=", null)) - .build(); - - // then - assertThat(result.getUrl()).isEqualTo("http://url/redirect="); - } - - @Test - public void assembleWithPrivacyShouldCreatePrivacyAwareUsersyncInfo() { - // given and when - final UsersyncInfo result = UsersyncInfoBuilder - .from(createUsersyncMethod( - """ - http://url?redir=\ - %26gdpr%3D{{gdpr}}\ - %26gdpr_consent%3D{{gdpr_consent}}\ - %26us_privacy%3D{{us_privacy}}\ - %26gpp%3D{{gpp}}\ - %26gpp_sid%3D{{gpp_sid}}""", - null)) - .privacy(Privacy.builder() - .gdpr("1") - .consentString("consent$1") - .ccpa(Ccpa.of("1YNN")) - .gpp("gpp") - .gppSid(List.of(1)) - .build()) - .build(); - - // then - assertThat(result.getUrl()).isEqualTo( - "http://url?redir=%26gdpr%3D1%26gdpr_consent%3Dconsent%241" - + "%26us_privacy%3D1YNN%26gpp%3Dgpp%26gpp_sid%3D1"); - } - - @Test - public void assembleWithPrivacyShouldTolerateMissingPrivacyParamsUsersyncInfo() { - // given and when - final UsersyncInfo result = UsersyncInfoBuilder - .from(createUsersyncMethod( - """ - http://url?redir=\ - %26gdpr%3D{{gdpr}}\ - %26gdpr_consent%3D{{gdpr_consent}}\ - %26us_privacy%3D{{us_privacy}}\ - %26gpp%3D{{gpp}}\ - %26gpp_sid%3D{{gpp_sid}}""", - null)) - .privacy(Privacy.builder().ccpa(Ccpa.EMPTY).build()) - .build(); - - // then - assertThat(result.getUrl()).isEqualTo( - "http://url?redir=%26gdpr%3D%26gdpr_consent%3D%26us_privacy%3D%26gpp%3D%26gpp_sid%3D"); - } - - @Test - public void assembleWithPrivacyShouldIgnorePrivacyParamsIfTheyAreMissingInUrl() { - // given and when - final UsersyncInfo result = UsersyncInfoBuilder - .from(createUsersyncMethod("http://url?redir=a%3Db", null)) - .privacy(Privacy.builder() - .gdpr("1") - .consentString("consent") - .ccpa(Ccpa.of("YNN")) - .build()) - .build(); - - // then - assertThat(result.getUrl()).isEqualTo("http://url?redir=a%3Db"); - } - - @Test - public void assembleWithPrivacyUsersyncInfoShouldPopulateWithPrivacyRedirectAndUsersyncUrl() { - // given and when - final UsersyncInfo result = UsersyncInfoBuilder - .from(createUsersyncMethod( - """ - http://url\ - ?gdpr={{gdpr}}\ - &{{gdpr_consent}}\ - &gpp={{gpp}}\ - &gpp_sid={{gpp_sid}}\ - &redir={{redirect_url}}""", - """ - http://localhost:8000/setuid\ - ?bidder=adnxs\ - &gdpr={{gdpr}}\ - &gdpr_consent={{gdpr_consent}}\ - &us_privacy={{us_privacy}}\ - &gpp={{gpp}}\ - &gpp_sid={{gpp_sid}}\ - &uid=$UID""")) - .privacy(Privacy.builder() - .gdpr("1") - .consentString("consent$1") - .ccpa(Ccpa.of("1YNN")) - .build()) - .build(); - - // then - assertThat(result.getUrl()).isEqualTo(""" - http://url?gdpr=1&consent%241&gpp=&gpp_sid=\ - &redir=http%3A%2F%2Flocalhost%3A8000%2Fsetuid%3Fbidder%3Dadnxs%26gdpr%3D1\ - %26gdpr_consent%3Dconsent%241%26us_privacy%3D1YNN\ - %26gpp%3D%26gpp_sid%3D%26f%3Di%26uid%3D%24UID"""); - } - - @Test - public void assembleWithUrlUsersyncInfoShouldUpdateUsersyncUrl() { - // given and when - final UsersyncInfo result = UsersyncInfoBuilder - .from(createUsersyncMethod("http://url", null)) - .usersyncUrl("http://updated-url") - .build(); - - // then - assertThat(result.getUrl()).isEqualTo("http://updated-url"); - } - - private static UsersyncMethod createUsersyncMethod(String usersyncUrl, String redirectUrl) { - return UsersyncMethod.builder() - .type(UsersyncMethodType.REDIRECT) - .usersyncUrl(usersyncUrl) - .redirectUrl(redirectUrl) - .supportCORS(false) - .build(); - } -} diff --git a/src/test/java/org/prebid/server/bidder/UsersyncInfoFactoryTest.java b/src/test/java/org/prebid/server/bidder/UsersyncInfoFactoryTest.java new file mode 100644 index 00000000000..9d750ae9c80 --- /dev/null +++ b/src/test/java/org/prebid/server/bidder/UsersyncInfoFactoryTest.java @@ -0,0 +1,409 @@ +package org.prebid.server.bidder; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.prebid.server.privacy.ccpa.Ccpa; +import org.prebid.server.privacy.model.Privacy; +import org.prebid.server.proto.response.UsersyncInfo; + +import java.util.List; +import java.util.function.UnaryOperator; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatNullPointerException; + +public class UsersyncInfoFactoryTest { + + private static final String BIDDER = "bidder"; + + private UsersyncInfoFactory target; + + @BeforeEach + public void setUp() { + target = new UsersyncInfoFactory("http://localhost:8080"); + } + + @Test + public void constructorShouldThrowExceptionIfExternalUrlIsNull() { + assertThatNullPointerException() + .isThrownBy(() -> new UsersyncInfoFactory(null)); + } + + @Test + public void constructorShouldThrowExceptionIfExternalUrlIsInvalid() { + assertThatExceptionOfType(IllegalArgumentException.class) + .isThrownBy(() -> new UsersyncInfoFactory("invalid-url")); + } + + @Test + public void buildShouldUseUsersyncUrlFromUsersyncMethodIfHostCookieUidIsNull() { + // given + final UsersyncMethod method = givenUsersyncMethod("http://specific-usersync-url-from-method"); + + // when + final UsersyncInfo result = target.build(BIDDER, null, method, givenEmptyPrivacy()); + + // then + assertThat(result.getUrl()).isEqualTo("http://specific-usersync-url-from-method"); + } + + @Test + public void buildShouldUseEmptyStringWhenUsersyncUrlIsNullAndHostCookieUidIsNull() { + // given + final UsersyncMethod method = givenUsersyncMethod(builder -> builder.usersyncUrl(null)); + + // when + final UsersyncInfo result = target.build(BIDDER, null, method, givenEmptyPrivacy()); + + // then + assertThat(result.getUrl()).isEmpty(); + } + + @Test + public void buildShouldReplaceRedirectParameterWithRedirectUrlIfHostCookieUidIsNull() { + // given + final UsersyncMethod method = givenUsersyncMethod("http://usersync-url?redir={{redirect_url}}"); + + // when + final UsersyncInfo result = target.build(BIDDER, null, method, givenEmptyPrivacy()); + + // then + assertThat(result.getUrl()) + .doesNotContain("{{redirect_url}}") + .startsWith("http://usersync-url?redir=http%3A%2F%2F"); + } + + @Test + public void buildShouldUseExternalUrlAsBaseForRedirectUrlIfHostCookieUidIsNull() { + // given + final UsersyncMethod method = givenUsersyncMethod("{{redirect_url}}"); + + // when + final UsersyncInfo result = target.build(BIDDER, null, method, givenEmptyPrivacy()); + + // then + assertThat(result.getUrl()).startsWith("http%3A%2F%2Flocalhost%3A8080%2Fsetuid"); + } + + @Test + public void buildShouldUseBidderParameterWithBidderNameInRedirectUrlIfHostCookieUidIsNull() { + // given + final UsersyncMethod method = givenUsersyncMethod("{{redirect_url}}"); + + // when + final UsersyncInfo result = target.build("specific-bidder", null, method, givenEmptyPrivacy()); + + // then + assertThat(result.getUrl()).contains("bidder%3Dspecific-bidder"); + } + + @Test + public void buildShouldUseUidParameterWithUidMacroFromUsersyncMethodInRedirectUrlIfHostCookieUidIsNull() { + // given + final UsersyncMethod method = givenUsersyncMethod(builder -> builder + .usersyncUrl("{{redirect_url}}") + .uidMacro("UID-MACRO")); + + // when + final UsersyncInfo result = target.build(BIDDER, null, method, givenEmptyPrivacy()); + + // then + assertThat(result.getUrl()).contains("uid%3DUID-MACRO"); + } + + @Test + public void buildShouldUseFormatParameterWithFormatFromUsersyncMethodInRedirectUrlIfHostCookieUidIsNull() { + // given + final UsersyncMethod method = givenUsersyncMethod(builder -> builder + .usersyncUrl("{{redirect_url}}") + .type(UsersyncMethodType.IFRAME)); + + // when + final UsersyncInfo result = target.build(BIDDER, null, method, givenEmptyPrivacy()); + + // then + assertThat(result.getUrl()).contains("f%3Db"); + } + + @Test + public void buildShouldUseRedirectUrlAsUsersyncUrlIfHostCookieUidIsNotNull() { + // given + final UsersyncMethod method = givenUsersyncMethod("http://method-usersync-url"); + + // when + final UsersyncInfo result = target.build(BIDDER, "host-cookie-uid", method, givenEmptyPrivacy()); + + // then + assertThat(result.getUrl()) + .doesNotContain("method-usersync-url") + .startsWith("http://localhost:8080/setuid"); + } + + @Test + public void buildshouldUseBidderParameterWithBidderNameInUsersyncUrlIfHostCookieUidIsNotNull() { + // given + final UsersyncMethod method = givenUsersyncMethod(UnaryOperator.identity()); + + // when + final UsersyncInfo result = target.build( + "specific-bidder", "host-cookie-uid", method, givenEmptyPrivacy()); + + // then + assertThat(result.getUrl()).contains("bidder=specific-bidder"); + } + + @Test + public void buildShouldUseUidParameterWithHostCookieUidInUsersyncUrlIfHostCookieUidIsNotNull() { + // given + final UsersyncMethod method = givenUsersyncMethod(UnaryOperator.identity()); + + // when + final UsersyncInfo result = target.build( + BIDDER, "specific-host-cookie-uid", method, givenEmptyPrivacy()); + + // then + assertThat(result.getUrl()).contains("uid=specific-host-cookie-uid"); + } + + @Test + public void buildShouldUseFormatParameterWithFormatFromUsersyncMethodInUsersyncUrlIfHostCookieUidIsNotNull() { + // given + final UsersyncMethod method = givenUsersyncMethod(builder -> builder.type(UsersyncMethodType.IFRAME)); + + // when + final UsersyncInfo result = target.build(BIDDER, "host-cookie-uid", method, givenEmptyPrivacy()); + + // then + assertThat(result.getUrl()).contains("f=b"); + } + + @Test + public void buildShouldIncludePrivacyParametersInUsersyncUrl() { + // given + final UsersyncMethod method = givenUsersyncMethod(""" + http://usersync-url?\ + gdpr={{gdpr}}\ + &gdpr_consent={{gdpr_consent}}\ + &us_privacy={{us_privacy}}\ + &gpp={{gpp}}\ + &gpp_sid={{gpp_sid}}"""); + final Privacy privacy = Privacy.builder() + .gdpr("1") + .consentString("consent$1") + .ccpa(Ccpa.of("1YNN")) + .gpp("g pp") + .gppSid(List.of(1, 2)) + .build(); + + // when + final UsersyncInfo result = target.build(BIDDER, null, method, privacy); + + // then + assertThat(result.getUrl()).isEqualTo(""" + http://usersync-url\ + ?gdpr=1\ + &gdpr_consent=consent%241\ + &us_privacy=1YNN\ + &gpp=g+pp\ + &gpp_sid=1%2C2"""); + } + + @Test + public void buildShouldUseEmptyStringsIfPrivacyParametersAreNull() { + // given + final UsersyncMethod method = givenUsersyncMethod(""" + http://usersync-url?\ + gdpr={{gdpr}}\ + &gdpr_consent={{gdpr_consent}}\ + &us_privacy={{us_privacy}}\ + &gpp={{gpp}}\ + &gpp_sid={{gpp_sid}}"""); + + // when + final UsersyncInfo result = target.build(BIDDER, null, method, givenEmptyPrivacy()); + + // then + assertThat(result.getUrl()).isEqualTo("http://usersync-url?gdpr=&gdpr_consent=&us_privacy=&gpp=&gpp_sid="); + } + + @Test + public void buildShouldIncludePrivacyParametersInRedirectUrl() { + // given + final UsersyncMethod method = givenUsersyncMethod("{{redirect_url}}"); + final Privacy privacy = Privacy.builder() + .gdpr("1") + .consentString("consent$1") + .ccpa(Ccpa.of("1YNN")) + .gpp("gpp") + .gppSid(List.of(1, 2)) + .build(); + + // when + final UsersyncInfo result = target.build(BIDDER, null, method, privacy); + + // then + assertThat(result.getUrl()).isEqualTo(""" + http%3A%2F%2Flocalhost%3A8080%2Fsetuid\ + %3Fbidder%3Dbidder\ + %26gdpr%3D1\ + %26gdpr_consent%3Dconsent%241\ + %26us_privacy%3D1YNN\ + %26gpp%3Dgpp\ + %26gpp_sid%3D1%2C2\ + %26f%3Di\ + %26uid%3D%24UID"""); + } + + @Test + public void buildShouldReturnTypeFromUsersyncMethod() { + // given + final UsersyncMethod method = givenUsersyncMethod(builder -> builder.type(UsersyncMethodType.IFRAME)); + + // when + final UsersyncInfo result = target.build(BIDDER, null, method, givenEmptyPrivacy()); + + // then + assertThat(result.getType()).isEqualTo(UsersyncMethodType.IFRAME); + } + + @Test + public void buildShouldReturnIsSupportCORSFromUsersyncMethod() { + // given + final UsersyncMethod method = givenUsersyncMethod(builder -> builder.supportCORS(true)); + + // when + final UsersyncInfo result = target.build(BIDDER, null, method, givenEmptyPrivacy()); + + // then + assertThat(result.getSupportCORS()).isTrue(); + } + + @Test + public void buildShouldUseFormatOverrideOverTypeFormat() { + // given + final UsersyncMethod method = givenUsersyncMethod(builder -> builder + .usersyncUrl("{{redirect_url}}") + .type(UsersyncMethodType.REDIRECT) + .formatOverride(UsersyncFormat.BLANK)); + + // when + final UsersyncInfo result = target.build(BIDDER, null, method, givenEmptyPrivacy()); + + // then + assertThat(result.getUrl()).contains("f%3Db"); + } + + @Test + public void buildShouldEncodeBidderNameInRedirectUrl() { + // given + final UsersyncMethod method = givenUsersyncMethod("{{redirect_url}}"); + + // when + final UsersyncInfo result = target.build("bidder name", null, method, givenEmptyPrivacy()); + + // then + assertThat(result.getUrl()).contains("bidder%3Dbidder%2Bname"); + } + + @Test + public void buildShouldReturnCorrectFullUrlIfHostCookieUidIsNull() { + // given + final UsersyncMethod method = UsersyncMethod.builder() + .type(UsersyncMethodType.IFRAME) + .usersyncUrl(""" + http://usersync-url\ + ?redir={{redirect_url}}\ + &gdpr={{gdpr}}\ + &gdpr_consent={{gdpr_consent}}\ + &us_privacy={{us_privacy}}\ + &gpp={{gpp}}\ + &gpp_sid={{gpp_sid}}""") + .uidMacro("$UID-MACRO") + .supportCORS(true) + .formatOverride(UsersyncFormat.PIXEL) + .build(); + final Privacy privacy = Privacy.builder() + .gdpr("1") + .consentString("c$1") + .ccpa(Ccpa.of("1YNN")) + .gpp("g pp") + .gppSid(List.of(1, 2)) + .build(); + + // when + final UsersyncInfo result = target.build("sync-bidder test", null, method, privacy); + + // then + assertThat(result.getSupportCORS()).isTrue(); + assertThat(result.getType()).isEqualTo(UsersyncMethodType.IFRAME); + assertThat(result.getUrl()).isEqualTo(""" + http://usersync-url\ + ?redir=\ + http%3A%2F%2Flocalhost%3A8080%2Fsetuid%3F\ + bidder%3Dsync-bidder%2Btest\ + %26gdpr%3D1\ + %26gdpr_consent%3Dc%241\ + %26us_privacy%3D1YNN\ + %26gpp%3Dg+pp\ + %26gpp_sid%3D1%2C2\ + %26f%3Di\ + %26uid%3D%24UID-MACRO\ + &gdpr=1\ + &gdpr_consent=c%241\ + &us_privacy=1YNN\ + &gpp=g+pp\ + &gpp_sid=1%2C2"""); + } + + @Test + public void buildShouldReturnCorrectFullUrlIfHostCookieUidIsNotNull() { + // given + final UsersyncMethod method = UsersyncMethod.builder() + .type(UsersyncMethodType.IFRAME) + .usersyncUrl("http://ignored.example/should-not-appear") + .uidMacro("$IGNORED") + .supportCORS(true) + .formatOverride(UsersyncFormat.PIXEL) + .build(); + final Privacy privacy = Privacy.builder() + .gdpr("1") + .consentString("c$1") + .ccpa(Ccpa.of("1YNN")) + .gpp("g pp") + .gppSid(List.of(1, 2)) + .build(); + + // when + final UsersyncInfo result = target.build("sync-bidder test", "host-uid value", method, privacy); + + // then + assertThat(result.getSupportCORS()).isTrue(); + assertThat(result.getType()).isEqualTo(UsersyncMethodType.IFRAME); + assertThat(result.getUrl()).isEqualTo(""" + http://localhost:8080/setuid?\ + bidder=sync-bidder+test\ + &gdpr=1\ + &gdpr_consent=c%241\ + &us_privacy=1YNN\ + &gpp=g+pp\ + &gpp_sid=1%2C2\ + &f=i\ + &uid=host-uid value"""); + } + + private static UsersyncMethod givenUsersyncMethod(String usersyncUrl) { + return givenUsersyncMethod(builder -> builder.usersyncUrl(usersyncUrl)); + } + + private static UsersyncMethod givenUsersyncMethod(UnaryOperator customize) { + return customize.apply(UsersyncMethod.builder() + .type(UsersyncMethodType.REDIRECT) + .usersyncUrl("http://usersync-url") + .uidMacro("$UID")).build(); + } + + private static Privacy givenEmptyPrivacy() { + return Privacy.builder().ccpa(Ccpa.EMPTY).build(); + } +} diff --git a/src/test/java/org/prebid/server/bidder/UsersyncMethodChooserTest.java b/src/test/java/org/prebid/server/bidder/UsersyncMethodChooserTest.java index b129a075dce..349e11c297f 100644 --- a/src/test/java/org/prebid/server/bidder/UsersyncMethodChooserTest.java +++ b/src/test/java/org/prebid/server/bidder/UsersyncMethodChooserTest.java @@ -58,7 +58,11 @@ public void shouldReturnRedirectMethodWhenIframeMethodFilterExcludeAndNullBidder null, CookieSyncRequest.FilterType.exclude), null); - final Usersyncer usersyncer = Usersyncer.of(null, iframeMethod("url"), redirectMethod("url"), false, null); + final Usersyncer usersyncer = Usersyncer.of(null, + iframeMethod("url"), + redirectMethod("url"), + false, + null); // when final UsersyncMethod chosenMethod = UsersyncMethodChooser.from(filter) @@ -93,7 +97,11 @@ public void shouldReturnSecondaryMethodWhenInMethodFilterExcludeList() { mapper.createArrayNode().add(BIDDER), CookieSyncRequest.FilterType.exclude), null); - final Usersyncer usersyncer = Usersyncer.of(null, iframeMethod("url"), redirectMethod("url"), false, null); + final Usersyncer usersyncer = Usersyncer.of(null, + iframeMethod("url"), + redirectMethod("url"), + false, + null); // when final UsersyncMethod chosenMethod = UsersyncMethodChooser.from(filter) @@ -111,7 +119,11 @@ public void shouldReturnSecondaryMethodWhenMethodFilterExcludesAll() { new TextNode("*"), CookieSyncRequest.FilterType.exclude), null); - final Usersyncer usersyncer = Usersyncer.of(null, iframeMethod("url"), redirectMethod("url"), false, null); + final Usersyncer usersyncer = Usersyncer.of(null, + iframeMethod("url"), + redirectMethod("url"), + false, + null); // when final UsersyncMethod chosenMethod = UsersyncMethodChooser.from(filter) @@ -180,7 +192,11 @@ public void shouldReturnSecondaryMethodWhenNotInMethodFilterIncludeList() { mapper.createArrayNode().add("anotherbidder"), CookieSyncRequest.FilterType.include), null); - final Usersyncer usersyncer = Usersyncer.of(null, iframeMethod("url"), redirectMethod("url"), false, null); + final Usersyncer usersyncer = Usersyncer.of(null, + iframeMethod("url"), + redirectMethod("url"), + false, + null); // when final UsersyncMethod chosenMethod = UsersyncMethodChooser.from(filter) @@ -231,7 +247,11 @@ public void shouldReturnSecondaryMethodWhenMethodFilterIncludeListIsNotArray() { new IntNode(1), CookieSyncRequest.FilterType.include), null); - final Usersyncer usersyncer = Usersyncer.of(null, iframeMethod("url"), redirectMethod("url"), false, null); + final Usersyncer usersyncer = Usersyncer.of(null, + iframeMethod("url"), + redirectMethod("url"), + false, + null); // when final UsersyncMethod chosenMethod = UsersyncMethodChooser.from(filter).choose(usersyncer, BIDDER); @@ -248,7 +268,11 @@ public void shouldReturnSecondaryMethodWhenMethodFilterIncludeListIsNotStringArr mapper.createArrayNode().add(1), CookieSyncRequest.FilterType.include), null); - final Usersyncer usersyncer = Usersyncer.of(null, iframeMethod("url"), redirectMethod("url"), false, null); + final Usersyncer usersyncer = Usersyncer.of(null, + iframeMethod("url"), + redirectMethod("url"), + false, + null); // when final UsersyncMethod chosenMethod = UsersyncMethodChooser.from(filter) @@ -268,7 +292,11 @@ public void shouldReturnSecondaryMethodWhenPrimaryIsFilteredOutAndSecondIsNot() CookieSyncRequest.MethodFilter.of( new TextNode("*"), CookieSyncRequest.FilterType.include)); - final Usersyncer usersyncer = Usersyncer.of(null, iframeMethod("url"), redirectMethod("url"), false, null); + final Usersyncer usersyncer = Usersyncer.of(null, + iframeMethod("url"), + redirectMethod("url"), + false, + null); // when final UsersyncMethod chosenMethod = UsersyncMethodChooser.from(filter) @@ -288,7 +316,11 @@ public void shouldReturnNullWhenPrimaryAndSecondaryAreFilteredOut() { CookieSyncRequest.MethodFilter.of( new TextNode("*"), CookieSyncRequest.FilterType.exclude)); - final Usersyncer usersyncer = Usersyncer.of(null, iframeMethod("url"), redirectMethod("url"), false, null); + final Usersyncer usersyncer = Usersyncer.of(null, + iframeMethod("url"), + redirectMethod("url"), + false, + null); // when final UsersyncMethod chosenMethod = UsersyncMethodChooser.from(filter) @@ -336,7 +368,6 @@ private UsersyncMethod iframeMethod(String url) { return UsersyncMethod.builder() .type(UsersyncMethodType.IFRAME) .usersyncUrl(url) - .redirectUrl(null) .supportCORS(false) .build(); } @@ -345,7 +376,6 @@ private UsersyncMethod redirectMethod(String url) { return UsersyncMethod.builder() .type(UsersyncMethodType.REDIRECT) .usersyncUrl(url) - .redirectUrl(null) .supportCORS(false) .build(); } diff --git a/src/test/java/org/prebid/server/bidder/UsersyncUtilTest.java b/src/test/java/org/prebid/server/bidder/UsersyncUtilTest.java deleted file mode 100644 index 37402f9c8f0..00000000000 --- a/src/test/java/org/prebid/server/bidder/UsersyncUtilTest.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.prebid.server.bidder; - -import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.assertThat; - -public class UsersyncUtilTest { - - @Test - public void resolveFormatShouldPreferFormatOverride() { - // given and when - final UsersyncFormat format = UsersyncUtil.resolveFormat( - UsersyncMethod.builder() - .type(UsersyncMethodType.IFRAME) - .formatOverride(UsersyncFormat.PIXEL) - .build()); - - // then - assertThat(format).isEqualTo(UsersyncFormat.PIXEL); - } - - @Test - public void resolveFormatShouldReturnDefaultFormatForUsersyncTypeWhenOverrideAbsent() { - // given and when - final UsersyncFormat format = UsersyncUtil.resolveFormat( - UsersyncMethod.builder() - .type(UsersyncMethodType.IFRAME) - .build()); - - // then - assertThat(format).isEqualTo(UsersyncFormat.BLANK); - } - - @Test - public void enrichUrlWithFormatShouldNotChangeUrlIfMissing() { - // given and when - final String url = UsersyncUtil.enrichUrlWithFormat(null, UsersyncFormat.BLANK); - - // then - assertThat(url).isNull(); - } - - @Test - public void enrichUrlWithFormatShouldNotChangeUrlIfEmpty() { - // given and when - final String url = UsersyncUtil.enrichUrlWithFormat("", UsersyncFormat.BLANK); - - // then - assertThat(url).isEmpty(); - } - - @Test - public void enrichUrlWithFormatShouldNotChangeUrlIfTypeMissing() { - // given and when - final String url = UsersyncUtil.enrichUrlWithFormat("", UsersyncFormat.BLANK); - - // then - assertThat(url).isEmpty(); - } - - @Test - public void enrichUrlWithFormatShouldInsertFormat() { - // given and when - final String url = UsersyncUtil.enrichUrlWithFormat( - "http://url?param1=value1¶m2=value2", - UsersyncFormat.PIXEL); - - // then - assertThat(url).isEqualTo("http://url?param1=value1&f=i¶m2=value2"); - } -} diff --git a/src/test/java/org/prebid/server/cookie/CookieSyncServiceTest.java b/src/test/java/org/prebid/server/cookie/CookieSyncServiceTest.java index bafc6a11d16..3a6d0185286 100644 --- a/src/test/java/org/prebid/server/cookie/CookieSyncServiceTest.java +++ b/src/test/java/org/prebid/server/cookie/CookieSyncServiceTest.java @@ -2,6 +2,7 @@ import io.vertx.core.Future; import io.vertx.ext.web.RoutingContext; +import org.assertj.core.api.InstanceOfAssertFactories; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -13,6 +14,7 @@ import org.prebid.server.activity.infrastructure.ActivityInfrastructure; import org.prebid.server.auction.privacy.enforcement.CcpaEnforcement; import org.prebid.server.bidder.BidderCatalog; +import org.prebid.server.bidder.UsersyncInfoFactory; import org.prebid.server.bidder.UsersyncMethod; import org.prebid.server.bidder.UsersyncMethodChooser; import org.prebid.server.bidder.UsersyncMethodType; @@ -39,11 +41,9 @@ import org.prebid.server.settings.model.Account; import org.prebid.server.settings.model.AccountCookieSyncConfig; import org.prebid.server.settings.model.AccountCoopSyncConfig; -import org.prebid.server.spring.config.bidder.model.usersync.CookieFamilySource; import java.util.Arrays; import java.util.Collections; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Optional; @@ -73,6 +73,10 @@ public class CookieSyncServiceTest extends VertxTest { @Mock(strictness = LENIENT) private HostVendorTcfDefinerService hostVendorTcfDefinerService; @Mock + private UsersyncInfoFactory usersyncInfoFactory; + @Mock + private UsersyncInfo usersyncInfo; + @Mock private CcpaEnforcement ccpaEnforcement; @Mock private UidsCookieService uidsCookieService; @@ -97,7 +101,7 @@ public void setUp() { given(hostVendorTcfDefinerService.isAllowedForHostVendorId(any())) .willReturn(Future.succeededFuture(HostVendorTcfResponse.allowedVendor())); given(hostVendorTcfDefinerService.resultForBidderNames(anySet(), any(), any())) - .willReturn(Future.succeededFuture(TcfResponse.of(false, emptyMap(), "country"))); + .willReturn(Future.succeededFuture(TcfResponse.of(false, emptyMap(), "country"))); given(activityInfrastructure.isAllowed(any(), any())) .willReturn(true); @@ -317,7 +321,6 @@ public void processContextShouldResolveBiddersToSync() { .satisfies(context -> { assertThat(context.requestedBidders()).containsExactly("requested-bidder"); assertThat(context.coopSyncBidders()).containsExactly("coop-sync-bidder"); - assertThat(context.multiSyncBidders()).isEmpty(); // TODO: add multisync }); } @@ -405,7 +408,6 @@ public void processContextShouldRejectBiddersWithDisabledUsersync() { false, "bidder-with-disabled-usersync", "bidder-with-disabled-usersync-cookie-family", - CookieFamilySource.ROOT, false, null); @@ -436,7 +438,6 @@ public void processContextShouldRejectBiddersWhenUserIsGdprScope() { true, "bidder-skipwhen-in-gdpr-scope", "bidder-skipwhen-in-gdpr-scope-cookie-family", - CookieFamilySource.ROOT, true, null); @@ -481,7 +482,6 @@ public void processContextShouldRejectBiddersWhenBidderShouldBeSkippedForSid() { true, "bidder-skipwhen-sid-1", "bidder-skipwhen-sid-1-cookie-family", - CookieFamilySource.ROOT, false, List.of(1)); @@ -489,7 +489,6 @@ public void processContextShouldRejectBiddersWhenBidderShouldBeSkippedForSid() { true, "bidder-skipwhen-sid-2", "bidder-skipwhen-sid-2-cookie-family", - CookieFamilySource.ROOT, false, List.of(2)); @@ -497,7 +496,6 @@ public void processContextShouldRejectBiddersWhenBidderShouldBeSkippedForSid() { true, "bidder-skipwhen-sid-1-3", "bidder-skipwhen-sid-1-3-cookie-family", - CookieFamilySource.ROOT, false, List.of(1, 3)); @@ -505,7 +503,6 @@ public void processContextShouldRejectBiddersWhenBidderShouldBeSkippedForSid() { true, "bidder-skipwhen-sid-absent", "bidder-skipwhen-sid-absent-cookie-family", - CookieFamilySource.ROOT, false, null); @@ -626,7 +623,7 @@ public void processContextShouldFilterInSyncBidders() { } @Test - public void processContextShouldFilterDisallowedByActivityInfrastructureBidders() { + public void processContextShouldRejectBiddersOverLimit() { // given givenCoopSyncBidders("coop-sync-bidder"); @@ -635,14 +632,43 @@ public void processContextShouldFilterDisallowedByActivityInfrastructureBidders( givenAllAllowedTcfResultForBidders("requested-bidder", "coop-sync-bidder"); - given(activityInfrastructure.isAllowed( - eq(Activity.SYNC_USER), - argThat(argument -> argument.componentType().equals(ComponentType.BIDDER) - && "requested-bidder".equals(argument.componentName())))) - .willReturn(false); + final CookieSyncRequest cookieSyncRequest = CookieSyncRequest.builder() + .limit(1) + .bidders(Set.of("requested-bidder")) + .build(); - final CookieSyncContext cookieSyncContext = givenCookieSyncContext(builder -> - builder.cookieSyncRequest(givenCookieSyncRequest("requested-bidder"))); + final CookieSyncContext cookieSyncContext = givenCookieSyncContext(cookieSyncContextBuilder -> + cookieSyncContextBuilder.cookieSyncRequest(cookieSyncRequest)); + + // when + final Future result = target.processContext(cookieSyncContext); + + // then + assertThat(result).isSucceeded() + .unwrap() + .extracting(CookieSyncContext::getBiddersContext) + .extracting(BiddersContext::allowedBidders) + .asInstanceOf(InstanceOfAssertFactories.COLLECTION) + .hasSize(1); + } + + @Test + public void processContextShouldFavorRequestBidders() { + // given + givenCoopSyncBidders("coop-sync-bidder"); + + givenValidActiveBidders("requested-bidder", "coop-sync-bidder"); + givenUsersyncersForBidders("requested-bidder", "coop-sync-bidder"); + + givenAllAllowedTcfResultForBidders("requested-bidder", "coop-sync-bidder"); + + final CookieSyncRequest cookieSyncRequest = CookieSyncRequest.builder() + .limit(1) + .bidders(Set.of("requested-bidder")) + .build(); + + final CookieSyncContext cookieSyncContext = givenCookieSyncContext(cookieSyncContextBuilder -> + cookieSyncContextBuilder.cookieSyncRequest(cookieSyncRequest)); // when final Future result = target.processContext(cookieSyncContext); @@ -652,99 +678,127 @@ public void processContextShouldFilterDisallowedByActivityInfrastructureBidders( .unwrap() .extracting(CookieSyncContext::getBiddersContext) .extracting(BiddersContext::rejectedBidders) - .isEqualTo(Map.of("requested-bidder", RejectionReason.DISALLOWED_ACTIVITY)); + .isEqualTo(Map.of("coop-sync-bidder", RejectionReason.OVER_LIMIT)); } @Test - public void prepareResponseShouldReturnOkStatusWhenUidsCookieHasLiveUids() { + public void processContextShouldUseCoopSyncBiddersAfterRequestBidders() { // given - given(uidsCookie.hasLiveUids()).willReturn(true); - final CookieSyncContext cookieSyncContext = givenCookieSyncContext(UnaryOperator.identity()); + givenCoopSyncBidders("coop-sync-bidder"); + + givenValidActiveBidders("requested-bidder", "coop-sync-bidder"); + givenUsersyncersForBidders("requested-bidder", "coop-sync-bidder"); + + givenAllAllowedTcfResultForBidders("coop-sync-bidder"); + + final CookieSyncContext cookieSyncContext = givenCookieSyncContext(cookieSyncContextBuilder -> + cookieSyncContextBuilder.cookieSyncRequest(givenCookieSyncRequest("requested-bidder"))); // when - final CookieSyncResponse result = target.prepareResponse(cookieSyncContext); + final Future result = target.processContext(cookieSyncContext); // then - assertThat(result.getStatus()).isEqualTo(CookieSyncStatus.OK); + assertThat(result).isSucceeded() + .unwrap() + .extracting(CookieSyncContext::getBiddersContext) + .extracting(BiddersContext::allowedBidders) + .asInstanceOf(InstanceOfAssertFactories.set(String.class)) + .containsExactly("coop-sync-bidder"); } @Test - public void prepareResponseShouldReturnNoCookieStatusWhenUidsCookieHasNoLiveUids() { + public void processContextShouldRejectBiddersWithDuplicateCookieFamilyName() { // given - given(uidsCookie.hasLiveUids()).willReturn(false); - final CookieSyncContext cookieSyncContext = givenCookieSyncContext(UnaryOperator.identity()); + givenCoopSyncBidders("coop-sync-bidder"); + + givenValidActiveBidders("requested-bidder", "coop-sync-bidder"); + givenUsersyncerForBidder("requested-bidder", "cookie-family-name"); + givenUsersyncerForBidder("coop-sync-bidder", "cookie-family-name"); + + givenAllAllowedTcfResultForBidders("requested-bidder", "coop-sync-bidder"); + + final CookieSyncContext cookieSyncContext = givenCookieSyncContext(cookieSyncContextBuilder -> + cookieSyncContextBuilder.cookieSyncRequest(givenCookieSyncRequest("requested-bidder"))); // when - final CookieSyncResponse result = target.prepareResponse(cookieSyncContext); + final Future result = target.processContext(cookieSyncContext); // then - assertThat(result.getStatus()).isEqualTo(CookieSyncStatus.NO_COOKIE); + assertThat(result).isSucceeded() + .unwrap() + .extracting(CookieSyncContext::getBiddersContext) + .extracting(BiddersContext::rejectedBidders) + .isEqualTo(Map.of("coop-sync-bidder", RejectionReason.DUPLICATE_COOKIE_FAMILY_NAME)); } @Test - public void prepareResponseShouldLimitResponseStatuses() { + public void processContextShouldFilterDisallowedByActivityInfrastructureBidders() { // given + givenCoopSyncBidders("coop-sync-bidder"); + + givenValidActiveBidders("requested-bidder", "coop-sync-bidder"); givenUsersyncersForBidders("requested-bidder", "coop-sync-bidder"); - final Map bidderUsersyncMethods = Map.of( - "requested-bidder", givenUsersyncMethod("requested-bidder"), - "coop-sync-bidder", givenUsersyncMethod("coop-sync-bidder")); + givenAllAllowedTcfResultForBidders("requested-bidder", "coop-sync-bidder"); - final CookieSyncContext cookieSyncContext = givenCookieSyncContext( - cookieSyncContextBuilder -> cookieSyncContextBuilder.limit(1), - biddersContextBuilder -> biddersContextBuilder - .requestedBidders(singleton("requested-bidder")) - .coopSyncBidders(singleton("coop-sync-bidder")) - .bidderUsersyncMethod(bidderUsersyncMethods)); + given(activityInfrastructure.isAllowed( + eq(Activity.SYNC_USER), + argThat(argument -> argument.componentType().equals(ComponentType.BIDDER) + && "requested-bidder".equals(argument.componentName())))) + .willReturn(false); + + final CookieSyncContext cookieSyncContext = givenCookieSyncContext(builder -> + builder.cookieSyncRequest(givenCookieSyncRequest("requested-bidder"))); // when - final CookieSyncResponse cookieSyncResponse = target.prepareResponse(cookieSyncContext); + final Future result = target.processContext(cookieSyncContext); // then - assertThat(cookieSyncResponse.getBidderStatus()).hasSize(1); + assertThat(result).isSucceeded() + .unwrap() + .extracting(CookieSyncContext::getBiddersContext) + .extracting(BiddersContext::rejectedBidders) + .isEqualTo(Map.of("requested-bidder", RejectionReason.DISALLOWED_ACTIVITY)); } @Test - public void prepareResponseShouldFavourRequest() { + public void prepareResponseShouldReturnOkStatusWhenUidsCookieHasLiveUids() { // given - givenUsersyncersForBidders("requested-bidder", "coop-sync-bidder"); + given(uidsCookie.hasLiveUids()).willReturn(true); + final CookieSyncContext cookieSyncContext = givenCookieSyncContext(UnaryOperator.identity()); - final Map bidderUsersyncMethods = Map.of( - "requested-bidder", givenUsersyncMethod("requested-bidder"), - "coop-sync-bidder", givenUsersyncMethod("coop-sync-bidder")); + // when + final CookieSyncResponse result = target.prepareResponse(cookieSyncContext); - final CookieSyncContext cookieSyncContext = givenCookieSyncContext( - cookieSyncContextBuilder -> cookieSyncContextBuilder.limit(1), - biddersContextBuilder -> biddersContextBuilder - .requestedBidders(singleton("requested-bidder")) - .coopSyncBidders(singleton("coop-sync-bidder")) - .bidderUsersyncMethod(bidderUsersyncMethods)); + // then + assertThat(result.getStatus()).isEqualTo(CookieSyncStatus.OK); + } + + @Test + public void prepareResponseShouldReturnNoCookieStatusWhenUidsCookieHasNoLiveUids() { + // given + given(uidsCookie.hasLiveUids()).willReturn(false); + final CookieSyncContext cookieSyncContext = givenCookieSyncContext(UnaryOperator.identity()); // when - final CookieSyncResponse cookieSyncResponse = target.prepareResponse(cookieSyncContext); + final CookieSyncResponse result = target.prepareResponse(cookieSyncContext); // then - assertThat(cookieSyncResponse.getBidderStatus()) - .extracting(BidderUsersyncStatus::getBidder) - .containsExactly("requested-bidder-cookie-family"); + assertThat(result.getStatus()).isEqualTo(CookieSyncStatus.NO_COOKIE); } @Test - public void prepareResponseShouldFavourCoopSyncAfterRequest() { + public void prepareResponseShouldReturnBidderNameAndNotTheCookieFamilyName() { // given - givenUsersyncersForBidders("requested-bidder", "coop-sync-bidder"); + givenUsersyncerForBidder("requested-bidder", "requested-bidder-cookie-family"); final Map bidderUsersyncMethods = Map.of( - "requested-bidder", givenUsersyncMethod("requested-bidder"), - "coop-sync-bidder", givenUsersyncMethod("coop-sync-bidder")); + "requested-bidder", givenUsersyncMethod("requested-bidder")); - final CookieSyncContext cookieSyncContext = givenCookieSyncContext( - cookieSyncContextBuilder -> cookieSyncContextBuilder.limit(1), - biddersContextBuilder -> biddersContextBuilder - .requestedBidders(singleton("requested-bidder")) - .coopSyncBidders(singleton("coop-sync-bidder")) - .rejectedBidders(Map.of("requested-bidder", RejectionReason.REJECTED_BY_TCF)) - .bidderUsersyncMethod(bidderUsersyncMethods)); + final CookieSyncContext cookieSyncContext = givenCookieSyncContext(cookieSyncContextBuilder -> + cookieSyncContextBuilder.biddersContext(BiddersContext.builder() + .requestedBidders(Set.of("requested-bidder")) + .bidderUsersyncMethod(bidderUsersyncMethods).build())); // when final CookieSyncResponse cookieSyncResponse = target.prepareResponse(cookieSyncContext); @@ -752,7 +806,7 @@ public void prepareResponseShouldFavourCoopSyncAfterRequest() { // then assertThat(cookieSyncResponse.getBidderStatus()) .extracting(BidderUsersyncStatus::getBidder) - .containsExactly("coop-sync-bidder-cookie-family"); + .containsExactly("requested-bidder"); } @Test @@ -778,7 +832,7 @@ public void prepareResponseShouldNotReturnErrorsWhenDebugFalse() { // then assertThat(cookieSyncResponse.getBidderStatus()) .extracting(BidderUsersyncStatus::getBidder) - .containsExactly("coop-sync-bidder-cookie-family"); + .containsExactly("coop-sync-bidder"); } @Test @@ -833,7 +887,7 @@ public void prepareResponseShouldReturnInvalidBidderErrorOnlyForRequestedBidders // then assertThat(cookieSyncResponse.getBidderStatus()) - .containsExactly(errorStatus("requested-bidder-cookie-family", "Unsupported bidder")); + .containsExactly(errorStatus("requested-bidder", "Unsupported bidder")); } @Test @@ -862,7 +916,7 @@ public void prepareResponseShouldReturnDisabledBidderErrorOnlyForRequestedBidder // then assertThat(cookieSyncResponse.getBidderStatus()) - .containsExactly(errorStatus("requested-bidder-cookie-family", "Disabled bidder")); + .containsExactly(errorStatus("requested-bidder", "Disabled bidder")); } @Test @@ -891,8 +945,8 @@ public void prepareResponseShouldReturnTcfRejectedErrorForCoopSyncAndRequestedBi // then assertThat(cookieSyncResponse.getBidderStatus()).containsExactlyInAnyOrder( - errorStatus("requested-bidder-cookie-family", "Rejected by TCF"), - errorStatus("coop-sync-bidder-cookie-family", "Rejected by TCF")); + errorStatus("requested-bidder", "Rejected by TCF"), + errorStatus("coop-sync-bidder", "Rejected by TCF")); } @Test @@ -921,8 +975,8 @@ public void prepareResponseShouldReturnCcpaRejectedErrorForCoopSyncAndRequestedB // then assertThat(cookieSyncResponse.getBidderStatus()).containsExactlyInAnyOrder( - errorStatus("requested-bidder-cookie-family", "Rejected by CCPA"), - errorStatus("coop-sync-bidder-cookie-family", "Rejected by CCPA")); + errorStatus("requested-bidder", "Rejected by CCPA"), + errorStatus("coop-sync-bidder", "Rejected by CCPA")); } @Test @@ -974,8 +1028,8 @@ public void prepareResponseShouldReturnFilterRejectedErrorForCoopSyncAndRequeste // then assertThat(cookieSyncResponse.getBidderStatus()).containsExactlyInAnyOrder( - errorStatus("requested-bidder-cookie-family", "Rejected by request filter"), - errorStatus("coop-sync-bidder-cookie-family", "Rejected by request filter")); + errorStatus("requested-bidder", "Rejected by request filter"), + errorStatus("coop-sync-bidder", "Rejected by request filter")); } @Test @@ -1004,128 +1058,93 @@ public void prepareResponseShouldReturnAlreadyInSyncErrorOnlyForRequestedBidders // then assertThat(cookieSyncResponse.getBidderStatus()) - .containsExactly(errorStatus("requested-bidder-cookie-family", "Already in sync")); + .containsExactly(errorStatus("requested-bidder", "Already in sync")); } @Test - public void prepareResponseShouldReturnWarningForAliasesSyncedAsRootCookieFamilyWhenDebugTrue() { + public void prepareResponseShouldReturnOverLimitErrorOnlyForRequestedBiddersWhenDebugTrue() { // given - given(bidderCatalog.isValidName("alias")).willReturn(true); - given(bidderCatalog.isActive("alias")).willReturn(true); - given(bidderCatalog.isAlias("alias")).willReturn(true); - givenUsersyncerForBidder(true, "alias", "root-cookie-family", CookieFamilySource.ROOT, false, null); + givenUsersyncersForBidders("requested-bidder", "coop-sync-bidder"); + + final Map bidderUsersyncMethods = Map.of( + "requested-bidder", givenUsersyncMethod("requested-bidder"), + "coop-sync-bidder", givenUsersyncMethod("coop-sync-bidder")); + + final Map biddersRejectionReasons = Map.of( + "requested-bidder", RejectionReason.OVER_LIMIT, + "coop-sync-bidder", RejectionReason.OVER_LIMIT); final CookieSyncContext cookieSyncContext = givenCookieSyncContext( cookieSyncContextBuilder -> cookieSyncContextBuilder.debug(true), biddersContextBuilder -> biddersContextBuilder - .requestedBidders(singleton("alias")) - .bidderUsersyncMethod(Map.of("alias", givenUsersyncMethod("alias")))); + .requestedBidders(singleton("requested-bidder")) + .coopSyncBidders(singleton("coop-sync-bidder")) + .rejectedBidders(biddersRejectionReasons) + .bidderUsersyncMethod(bidderUsersyncMethods)); // when - final CookieSyncResponse result = target.prepareResponse(cookieSyncContext); + final CookieSyncResponse cookieSyncResponse = target.prepareResponse(cookieSyncContext); // then - final BidderUsersyncStatus warningStatus = errorStatus("alias", "synced as root-cookie-family"); - final BidderUsersyncStatus validStatus = BidderUsersyncStatus.builder() - .bidder("root-cookie-family") - .noCookie(true) - .usersync(UsersyncInfo.of("https://alias-usersync-url.com", UsersyncMethodType.IFRAME, false)) - .build(); - - assertThat(result.getBidderStatus()).containsExactlyInAnyOrder(validStatus, warningStatus); + assertThat(cookieSyncResponse.getBidderStatus()) + .containsExactly(errorStatus("requested-bidder", "Limit reached")); } @Test - public void prepareResponseShouldNotReturnWarningForAliasesSyncedAsAliasCookieFamilyWhenDebugFalse() { + public void prepareResponseShouldReturnDuplicateBidderErrorOnlyForRequestedBiddersWhenDebugTrue() { // given - given(bidderCatalog.isValidName("alias")).willReturn(true); - given(bidderCatalog.isActive("alias")).willReturn(true); - given(bidderCatalog.isAlias("alias")).willReturn(true); - givenUsersyncerForBidder(true, "alias", "alias-cookie-family", CookieFamilySource.ALIAS, false, null); + givenUsersyncersForBidders("requested-bidder", "coop-sync-bidder"); + + final Map bidderUsersyncMethods = Map.of( + "requested-bidder", givenUsersyncMethod("requested-bidder"), + "coop-sync-bidder", givenUsersyncMethod("coop-sync-bidder")); + + final Map biddersRejectionReasons = Map.of( + "requested-bidder", RejectionReason.DUPLICATE_COOKIE_FAMILY_NAME, + "coop-sync-bidder", RejectionReason.DUPLICATE_COOKIE_FAMILY_NAME); final CookieSyncContext cookieSyncContext = givenCookieSyncContext( cookieSyncContextBuilder -> cookieSyncContextBuilder.debug(true), biddersContextBuilder -> biddersContextBuilder - .requestedBidders(singleton("alias")) - .bidderUsersyncMethod(Map.of("alias", givenUsersyncMethod("alias")))); + .requestedBidders(singleton("requested-bidder")) + .coopSyncBidders(singleton("coop-sync-bidder")) + .rejectedBidders(biddersRejectionReasons) + .bidderUsersyncMethod(bidderUsersyncMethods)); // when - final CookieSyncResponse result = target.prepareResponse(cookieSyncContext); + final CookieSyncResponse cookieSyncResponse = target.prepareResponse(cookieSyncContext); // then - final BidderUsersyncStatus status = BidderUsersyncStatus.builder() - .bidder("alias-cookie-family") - .noCookie(true) - .usersync(UsersyncInfo.of("https://alias-usersync-url.com", UsersyncMethodType.IFRAME, false)) - .build(); - - assertThat(result.getBidderStatus()).containsExactly(status); + assertThat(cookieSyncResponse.getBidderStatus()).containsExactly( + errorStatus("requested-bidder", "Duplicate bidder synced as requested-bidder-cookie-family")); } @Test - public void prepareResponseShouldReturnErrorForBiddersThatWereNotIncludedInResponseDueToLimitWhenDebugTrue() { + public void prepareResponseShouldPassCorrectParametersToUsersyncInfoFactory() { // given - givenValidActiveBidders("bidder1", "bidder2"); - givenUsersyncersForBidders("bidder1", "bidder2"); - - final CookieSyncContext cookieSyncContext = givenCookieSyncContext( - cookieSyncContextBuilder -> cookieSyncContextBuilder.debug(true).limit(1), - biddersContextBuilder -> biddersContextBuilder - .requestedBidders(new LinkedHashSet<>(List.of("bidder1", "bidder2"))) // to preserve order - .bidderUsersyncMethod( - Map.of("bidder1", givenUsersyncMethod("bidder1"), - "bidder2", givenUsersyncMethod("bidder2")))); - - // when - final CookieSyncResponse result = target.prepareResponse(cookieSyncContext); - - // then - final BidderUsersyncStatus warningStatus = errorStatus("bidder2-cookie-family", "limit reached"); - final BidderUsersyncStatus validStatus = BidderUsersyncStatus.builder() - .bidder("bidder1-cookie-family") - .noCookie(true) - .usersync(UsersyncInfo.of("https://bidder1-usersync-url.com", UsersyncMethodType.IFRAME, false)) - .build(); + givenUsersyncerForBidder("requested-bidder", "requested-bidder-cookie-family"); - assertThat(result.getBidderStatus()).containsExactlyInAnyOrder(validStatus, warningStatus); - } + final UsersyncMethod usersyncMethod = givenUsersyncMethod("requested-bidder"); + final Map bidderUsersyncMethods = Map.of("requested-bidder", usersyncMethod); - @Test - public void prepareResponseShouldReturnCustomUsersyncUrlForHostCookieSync() { - // given - givenValidActiveBidder("host-bidder"); - givenUsersyncersForBidders("host-bidder"); + given(uidsCookieService.hostCookieUidToSync(routingContext, "requested-bidder-cookie-family")) + .willReturn("host-cookie-uid"); - given(uidsCookieService.hostCookieUidToSync(routingContext, "host-bidder-cookie-family")) - .willReturn("bogus"); + final PrivacyContext privacyContext = givenAllAllowedPrivacyContext(); - final CookieSyncContext cookieSyncContext = givenCookieSyncContext( - UnaryOperator.identity(), - biddersContextBuilder -> biddersContextBuilder - .requestedBidders(singleton("host-bidder")) - .bidderUsersyncMethod(Map.of("host-bidder", givenUsersyncMethod("alias")))); + final CookieSyncContext cookieSyncContext = givenCookieSyncContext(cookieSyncContextBuilder -> + cookieSyncContextBuilder + .privacyContext(privacyContext) + .biddersContext(BiddersContext.builder() + .requestedBidders(Set.of("requested-bidder")) + .bidderUsersyncMethod(bidderUsersyncMethods).build())); // when - final CookieSyncResponse result = target.prepareResponse(cookieSyncContext); + target.prepareResponse(cookieSyncContext); // then - final String expectedUrl = """ - https://external-url.com/setuid\ - ?bidder=host-bidder-cookie-family\ - &gdpr=gdpr\ - &gdpr_consent=consent-string\ - &us_privacy=\ - &gpp=\ - &gpp_sid=\ - &f=b\ - &uid=bogus"""; - final BidderUsersyncStatus status = BidderUsersyncStatus.builder() - .noCookie(true) - .bidder("host-bidder-cookie-family") - .usersync(UsersyncInfo.of(expectedUrl, UsersyncMethodType.IFRAME, false)) - .build(); - - assertThat(result.getBidderStatus()).containsExactly(status); + verify(usersyncInfoFactory).build( + "requested-bidder", "host-cookie-uid", usersyncMethod, privacyContext.getPrivacy()); } @Test @@ -1134,33 +1153,21 @@ public void prepareResponseShouldReturnResponseWithWarningsIfNotEmpty() { givenValidActiveBidder("host-bidder"); givenUsersyncersForBidders("host-bidder"); - given(uidsCookieService.hostCookieUidToSync(routingContext, "host-bidder-cookie-family")) - .willReturn("bogus"); + given(usersyncInfoFactory.build(any(), any(), any(), any())).willReturn(usersyncInfo); final CookieSyncContext cookieSyncContext = givenCookieSyncContext( cookieSyncContextBuilder -> cookieSyncContextBuilder.warnings(List.of("Warning")), biddersContextBuilder -> biddersContextBuilder - .requestedBidders(singleton("host-bidder")) - .bidderUsersyncMethod(Map.of("host-bidder", givenUsersyncMethod("alias")))); + .requestedBidders(singleton("host-bidder"))); // when final CookieSyncResponse result = target.prepareResponse(cookieSyncContext); // then - final String expectedUrl = """ - https://external-url.com/setuid\ - ?bidder=host-bidder-cookie-family\ - &gdpr=gdpr\ - &gdpr_consent=consent-string\ - &us_privacy=\ - &gpp=\ - &gpp_sid=\ - &f=b\ - &uid=bogus"""; final BidderUsersyncStatus status = BidderUsersyncStatus.builder() .noCookie(true) - .bidder("host-bidder-cookie-family") - .usersync(UsersyncInfo.of(expectedUrl, UsersyncMethodType.IFRAME, false)) + .bidder("host-bidder") + .usersync(usersyncInfo) .build(); assertThat(result.getBidderStatus()).containsExactly(status); @@ -1173,33 +1180,21 @@ public void prepareResponseShouldReturnResponseWithoutWarningsIfEmpty() { givenValidActiveBidder("host-bidder"); givenUsersyncersForBidders("host-bidder"); - given(uidsCookieService.hostCookieUidToSync(routingContext, "host-bidder-cookie-family")) - .willReturn("bogus"); + given(usersyncInfoFactory.build(any(), any(), any(), any())).willReturn(usersyncInfo); final CookieSyncContext cookieSyncContext = givenCookieSyncContext( cookieSyncContextBuilder -> cookieSyncContextBuilder.warnings(Collections.emptyList()), biddersContextBuilder -> biddersContextBuilder - .requestedBidders(singleton("host-bidder")) - .bidderUsersyncMethod(Map.of("host-bidder", givenUsersyncMethod("alias")))); + .requestedBidders(singleton("host-bidder"))); // when final CookieSyncResponse result = target.prepareResponse(cookieSyncContext); // then - final String expectedUrl = """ - https://external-url.com/setuid\ - ?bidder=host-bidder-cookie-family\ - &gdpr=gdpr\ - &gdpr_consent=consent-string\ - &us_privacy=\ - &gpp=\ - &gpp_sid=\ - &f=b\ - &uid=bogus"""; final BidderUsersyncStatus status = BidderUsersyncStatus.builder() .noCookie(true) - .bidder("host-bidder-cookie-family") - .usersync(UsersyncInfo.of(expectedUrl, UsersyncMethodType.IFRAME, false)) + .bidder("host-bidder") + .usersync(usersyncInfo) .build(); assertThat(result.getBidderStatus()).containsExactly(status); @@ -1249,19 +1244,21 @@ private void givenUsersyncersForBidders(String... bidders) { } private void givenUsersyncerForBidder(String bidder) { - givenUsersyncerForBidder(true, bidder, bidder + "-cookie-family", CookieFamilySource.ROOT, false, null); + givenUsersyncerForBidder(true, bidder, bidder + "-cookie-family", false, null); + } + + private void givenUsersyncerForBidder(String bidder, String cookieFamilyName) { + givenUsersyncerForBidder(true, bidder, cookieFamilyName, false, null); } private void givenUsersyncerForBidder(boolean enabled, String bidder, String cookieFamilyName, - CookieFamilySource cookieFamilySource, boolean gdpr, List gppSid) { final UsersyncMethod usersyncMethod = givenUsersyncMethod(bidder); - final Usersyncer usersyncer = Usersyncer.of( - enabled, cookieFamilyName, cookieFamilySource, usersyncMethod, null, gdpr, gppSid); + final Usersyncer usersyncer = Usersyncer.of(enabled, cookieFamilyName, usersyncMethod, null, gdpr, gppSid); given(bidderCatalog.usersyncerByName(eq(bidder))).willReturn(Optional.of(usersyncer)); given(bidderCatalog.cookieFamilyName(eq(bidder))).willReturn(Optional.of(cookieFamilyName)); @@ -1287,12 +1284,12 @@ private static Account givenAccount(int limit, int maxLimit) { private void givenCookieSyncService(int limit, int maxLimit) { target = new CookieSyncService( - "https://external-url.com", limit, maxLimit, bidderCatalog, hostVendorTcfDefinerService, ccpaEnforcement, + usersyncInfoFactory, uidsCookieService, coopSyncProvider, metrics); diff --git a/src/test/java/org/prebid/server/handler/SetuidHandlerTest.java b/src/test/java/org/prebid/server/handler/SetuidHandlerTest.java index ed88f7f6fdd..78cc895e3b9 100644 --- a/src/test/java/org/prebid/server/handler/SetuidHandlerTest.java +++ b/src/test/java/org/prebid/server/handler/SetuidHandlerTest.java @@ -473,7 +473,9 @@ public void shouldRespondWithCookieFromRequestParam() throws IOException { } @Test - public void shouldRespondWithCookieFromRequestParamWhenBidderAndCookieFamilyAreDifferent() throws IOException { + public void shouldRespondWithCookieFromRequestParamWhenBidderAndCookieFamilyAreDifferent() + throws IOException { + // given final UidsCookie uidsCookie = emptyUidsCookie(); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) @@ -481,7 +483,7 @@ public void shouldRespondWithCookieFromRequestParamWhenBidderAndCookieFamilyAreD given(uidsCookieService.updateUidsCookie(uidsCookie, ADNXS, "J5VLCWQP-26-CWFT")) .willReturn(updated(uidsCookie.updateUid(ADNXS, "J5VLCWQP-26-CWFT"))); - given(httpRequest.getParam("bidder")).willReturn(ADNXS); + given(httpRequest.getParam("bidder")).willReturn(APPNEXUS); given(httpRequest.getParam("uid")).willReturn("J5VLCWQP-26-CWFT"); // when @@ -717,7 +719,7 @@ public void shouldReturnMultipleCookies() throws IOException { public void shouldRespondWithCookieIfUserIsNotInGdprScope() throws IOException { // given given(tcfDefinerService.resultForVendorIds(anySet(), any())) - .willReturn(Future.succeededFuture(TcfResponse.of(false, emptyMap(), null))); + .willReturn(Future.succeededFuture(TcfResponse.of(false, emptyMap(), null))); final UidsCookie uidsCookie = emptyUidsCookie(); given(uidsCookieService.parseFromRequest(any(RoutingContext.class))) diff --git a/src/test/java/org/prebid/server/it/ApplicationTest.java b/src/test/java/org/prebid/server/it/ApplicationTest.java index 3a3710c6e6e..b659d577771 100644 --- a/src/test/java/org/prebid/server/it/ApplicationTest.java +++ b/src/test/java/org/prebid/server/it/ApplicationTest.java @@ -329,11 +329,11 @@ public void cookieSyncShouldReturnBidderStatusWithExpectedUsersyncInfo() { UsersyncMethodType.REDIRECT, false)) .build(), BidderUsersyncStatus.builder() - .bidder(APPNEXUS_COOKIE_FAMILY) + .bidder(APPNEXUS) .noCookie(true) .usersync(UsersyncInfo.of( "//usersync-url/getuid?http%3A%2F%2Flocalhost%3A8080%2Fsetuid%3Fbidder" - + "%3Dadnxs%26gdpr%3D1%26gdpr_consent%3D" + gdprConsent + + "%3Dappnexus%26gdpr%3D1%26gdpr_consent%3D" + gdprConsent + "%26us_privacy%3D1YNN" + "%26gpp%3D" + "%26gpp_sid%3D" diff --git a/src/test/java/org/prebid/server/spring/config/bidder/util/UsersyncerCreatorTest.java b/src/test/java/org/prebid/server/spring/config/bidder/util/UsersyncerCreatorTest.java deleted file mode 100644 index 7337d5d8b1c..00000000000 --- a/src/test/java/org/prebid/server/spring/config/bidder/util/UsersyncerCreatorTest.java +++ /dev/null @@ -1,149 +0,0 @@ -package org.prebid.server.spring.config.bidder.util; - -import org.junit.jupiter.api.Test; -import org.prebid.server.bidder.UsersyncMethod; -import org.prebid.server.bidder.UsersyncMethodType; -import org.prebid.server.bidder.Usersyncer; -import org.prebid.server.spring.config.bidder.model.usersync.CookieFamilySource; -import org.prebid.server.spring.config.bidder.model.usersync.UsersyncConfigurationProperties; -import org.prebid.server.spring.config.bidder.model.usersync.UsersyncMethodConfigurationProperties; - -import java.net.MalformedURLException; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - -public class UsersyncerCreatorTest { - - @Test - public void createShouldReturnUsersyncerWithConcatenatedExternalAndRedirectUrl() { - // given - final UsersyncConfigurationProperties config = new UsersyncConfigurationProperties(); - final UsersyncMethodConfigurationProperties methodConfig = new UsersyncMethodConfigurationProperties(); - methodConfig.setUrl("//redirect-url?uid="); - methodConfig.setUidMacro("uid-macro"); - methodConfig.setSupportCors(false); - - config.setEnabled(true); - config.setCookieFamilyName("rubicon"); - config.setRedirect(methodConfig); - - // when and then - assertThat(UsersyncerCreator.create("http://localhost:8000").apply(config, CookieFamilySource.ROOT)) - .extracting(usersyncer -> usersyncer.getRedirect().getRedirectUrl()) - .isEqualTo(""" - http://localhost:8000/setuid\ - ?bidder=rubicon\ - &gdpr={{gdpr}}\ - &gdpr_consent={{gdpr_consent}}\ - &us_privacy={{us_privacy}}\ - &gpp={{gpp}}\ - &gpp_sid={{gpp_sid}}\ - &uid=uid-macro\ - """); - } - - @Test - public void createShouldValidateExternalUrl() { - // given - final UsersyncConfigurationProperties config = new UsersyncConfigurationProperties(); - final UsersyncMethodConfigurationProperties methodConfig = new UsersyncMethodConfigurationProperties(); - methodConfig.setUrl("//usersync-url"); - methodConfig.setUidMacro("not-valid-macro"); - methodConfig.setSupportCors(true); - - config.setEnabled(true); - config.setRedirect(methodConfig); - - // given, when and then - assertThatThrownBy(() -> UsersyncerCreator.create(null).apply(config, CookieFamilySource.ROOT)) - .hasCauseExactlyInstanceOf(MalformedURLException.class) - .hasMessage("URL supplied is not valid: null"); - } - - @Test - public void createShouldReturnUsersyncerWithPrimaryAndSecondaryMethods() { - // given - final UsersyncConfigurationProperties config = new UsersyncConfigurationProperties(); - config.setCookieFamilyName("rubicon"); - - final UsersyncMethodConfigurationProperties iframeConfig = new UsersyncMethodConfigurationProperties(); - iframeConfig.setUrl("//usersync-url-iframe?uid="); - iframeConfig.setUidMacro("uid-macro-iframe"); - iframeConfig.setSupportCors(true); - - final UsersyncMethodConfigurationProperties redirectConfig = new UsersyncMethodConfigurationProperties(); - redirectConfig.setUrl("//usersync-url-redirect?u="); - redirectConfig.setUidMacro("uid-macro-redirect"); - redirectConfig.setSupportCors(false); - - config.setEnabled(true); - config.setIframe(iframeConfig); - config.setRedirect(redirectConfig); - - // when - final Usersyncer result = UsersyncerCreator.create("http://localhost:8000").apply(config, CookieFamilySource.ROOT); - - // then - final UsersyncMethod expectedIframeMethod = UsersyncMethod.builder() - .type(UsersyncMethodType.IFRAME) - .usersyncUrl("//usersync-url-iframe?uid=") - .redirectUrl(""" - http://localhost:8000/setuid\ - ?bidder=rubicon\ - &gdpr={{gdpr}}\ - &gdpr_consent={{gdpr_consent}}\ - &us_privacy={{us_privacy}}\ - &gpp={{gpp}}\ - &gpp_sid={{gpp_sid}}\ - &uid=uid-macro-iframe\ - """) - .supportCORS(true) - .build(); - - final UsersyncMethod expectedRedirectMethod = UsersyncMethod.builder() - .type(UsersyncMethodType.REDIRECT) - .usersyncUrl("//usersync-url-redirect?u=") - .redirectUrl(""" - http://localhost:8000/setuid\ - ?bidder=rubicon&gdpr={{gdpr}}\ - &gdpr_consent={{gdpr_consent}}\ - &us_privacy={{us_privacy}}\ - &gpp={{gpp}}\ - &gpp_sid={{gpp_sid}}\ - &uid=uid-macro-redirect\ - """) - .supportCORS(false) - .build(); - - assertThat(result).isEqualTo( - Usersyncer.of("rubicon", expectedIframeMethod, expectedRedirectMethod, false, null)); - } - - @Test - public void createShouldTolerateMissingUid() { - // given - final UsersyncConfigurationProperties config = new UsersyncConfigurationProperties(); - final UsersyncMethodConfigurationProperties methodConfig = new UsersyncMethodConfigurationProperties(); - methodConfig.setUrl("//redirect-url?uid="); - methodConfig.setSupportCors(false); - - config.setEnabled(true); - config.setCookieFamilyName("rubicon"); - config.setRedirect(methodConfig); - - // when and then - assertThat(UsersyncerCreator.create("http://localhost:8000").apply(config, CookieFamilySource.ROOT)) - .extracting(usersyncer -> usersyncer.getRedirect().getRedirectUrl()) - .isEqualTo(""" - http://localhost:8000/setuid\ - ?bidder=rubicon\ - &gdpr={{gdpr}}\ - &gdpr_consent={{gdpr_consent}}\ - &us_privacy={{us_privacy}}\ - &gpp={{gpp}}\ - &gpp_sid={{gpp_sid}}\ - &uid=\ - """); - } -} diff --git a/src/test/java/org/prebid/server/spring/config/bidder/util/UsersyncerUtilTest.java b/src/test/java/org/prebid/server/spring/config/bidder/util/UsersyncerUtilTest.java new file mode 100644 index 00000000000..c9e7ca12d07 --- /dev/null +++ b/src/test/java/org/prebid/server/spring/config/bidder/util/UsersyncerUtilTest.java @@ -0,0 +1,136 @@ +package org.prebid.server.spring.config.bidder.util; + +import org.junit.jupiter.api.Test; +import org.prebid.server.bidder.UsersyncFormat; +import org.prebid.server.bidder.UsersyncMethod; +import org.prebid.server.bidder.UsersyncMethodType; +import org.prebid.server.bidder.Usersyncer; +import org.prebid.server.spring.config.bidder.model.usersync.UsersyncBidderRegulationScopeProperties; +import org.prebid.server.spring.config.bidder.model.usersync.UsersyncConfigurationProperties; +import org.prebid.server.spring.config.bidder.model.usersync.UsersyncMethodConfigurationProperties; + +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +public class UsersyncerUtilTest { + + @Test + public void createShouldReturnUsersyncerWithCorrectParamsIfSkipWhenConfigIsNull() { + // given + final UsersyncConfigurationProperties properties = givenUsersyncConfigurationProperties(); + properties.setSkipwhen(null); + + // when + final Usersyncer usersyncer = UsersyncerUtil.create(properties); + + // then + assertThat(usersyncer.isEnabled()).isTrue(); + assertThat(usersyncer.getCookieFamilyName()).isEqualTo("cookie-family-name"); + assertThat(usersyncer.isSkipWhenInGdprScope()).isFalse(); + assertThat(usersyncer.getGppSidToSkip()).isNull(); + } + + @Test + public void createShouldReturnUsersyncerWithCorrectParamsIfSkipWhenConfigIsNotNull() { + // given + final UsersyncBidderRegulationScopeProperties skipwhen = new UsersyncBidderRegulationScopeProperties(); + skipwhen.setGdpr(true); + skipwhen.setGppSid(List.of(1, 2, 3)); + + final UsersyncConfigurationProperties properties = givenUsersyncConfigurationProperties(); + properties.setSkipwhen(skipwhen); + + // when + final Usersyncer usersyncer = UsersyncerUtil.create(properties); + + // then + assertThat(usersyncer.isEnabled()).isTrue(); + assertThat(usersyncer.getCookieFamilyName()).isEqualTo("cookie-family-name"); + assertThat(usersyncer.isSkipWhenInGdprScope()).isTrue(); + assertThat(usersyncer.getGppSidToSkip()).containsExactly(1, 2, 3); + } + + @Test + public void createShouldReturnUsersyncerWithCorrectUsersyncMethodParams() { + // given + final UsersyncMethodConfigurationProperties iframe = new UsersyncMethodConfigurationProperties(); + iframe.setUrl("iframe-url"); + iframe.setUidMacro("iframe-uid-macro"); + iframe.setSupportCors(true); + iframe.setFormatOverride(UsersyncFormat.BLANK); + + final UsersyncConfigurationProperties properties = givenUsersyncConfigurationProperties(); + properties.setIframe(iframe); + + // when + final Usersyncer usersyncer = UsersyncerUtil.create(properties); + + // then + assertThat(usersyncer.getIframe()).isEqualTo(UsersyncMethod.builder() + .type(UsersyncMethodType.IFRAME) + .usersyncUrl("iframe-url") + .uidMacro("iframe-uid-macro") + .supportCORS(true) + .formatOverride(UsersyncFormat.BLANK) + .build()); + } + + @Test + public void createShouldReturnUsersyncerWithNullUsersyncMethodIfPropertiesIsNull() { + // given + final UsersyncConfigurationProperties properties = givenUsersyncConfigurationProperties(); + properties.setIframe(null); + properties.setRedirect(null); + + // when + final Usersyncer usersyncer = UsersyncerUtil.create(properties); + + // then + assertThat(usersyncer.getIframe()).isNull(); + assertThat(usersyncer.getRedirect()).isNull(); + } + + @Test + public void createShouldUseCorrespondingParamsForIframeAndRedirectIfBothAreProvided() { + // given + final UsersyncMethodConfigurationProperties iframe = givenUsersyncMethodConfigurationProperties(); + iframe.setUrl("iframe-url"); + + final UsersyncMethodConfigurationProperties redirect = givenUsersyncMethodConfigurationProperties(); + redirect.setUrl("redirect-url"); + + final UsersyncConfigurationProperties properties = givenUsersyncConfigurationProperties(); + properties.setIframe(iframe); + properties.setRedirect(redirect); + + // when + final Usersyncer useresyncer = UsersyncerUtil.create(properties); + + // then + assertThat(useresyncer.getIframe()).satisfies(method -> { + assertThat(method.getType()).isEqualTo(UsersyncMethodType.IFRAME); + assertThat(method.getUsersyncUrl()).isEqualTo("iframe-url"); + }); + assertThat(useresyncer.getRedirect()).satisfies(method -> { + assertThat(method.getType()).isEqualTo(UsersyncMethodType.REDIRECT); + assertThat(method.getUsersyncUrl()).isEqualTo("redirect-url"); + }); + } + + private static UsersyncConfigurationProperties givenUsersyncConfigurationProperties() { + final UsersyncConfigurationProperties properties = new UsersyncConfigurationProperties(); + properties.setEnabled(true); + properties.setCookieFamilyName("cookie-family-name"); + properties.setIframe(givenUsersyncMethodConfigurationProperties()); + properties.setRedirect(givenUsersyncMethodConfigurationProperties()); + return properties; + } + + private static UsersyncMethodConfigurationProperties givenUsersyncMethodConfigurationProperties() { + final UsersyncMethodConfigurationProperties properties = new UsersyncMethodConfigurationProperties(); + properties.setUrl("url"); + properties.setSupportCors(false); + return properties; + } +}