Skip to content

Resolve bean conflict in modules #4289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CTMBNara merged 1 commit into from
Nov 19, 2025
Merged

Resolve bean conflict in modules #4289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...s/liveintent/omni/channel/identity/config/LiveIntentOmniChannelIdentityConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@ public class LiveIntentOmniChannelIdentityConfiguration {

@Bean
@ConfigurationProperties(prefix = "hooks.modules." + LiveIntentOmniChannelIdentityModule.CODE)
LiveIntentOmniChannelProperties properties() {
LiveIntentOmniChannelProperties liveIntentOmniChannelProperties() {
return new LiveIntentOmniChannelProperties();
}

@Bean
Module liveIntentOmniChannelIdentityModule(LiveIntentOmniChannelProperties properties,
Module liveIntentOmniChannelIdentityModule(LiveIntentOmniChannelProperties liveIntentOmniChannelProperties,
JacksonMapper mapper,
UserFpdActivityMask userFpdActivityMask,
HttpClient httpClient,
@Value("${logging.sampling-rate:0.01}") double logSamplingRate) {

final LiveIntentOmniChannelIdentityProcessedAuctionRequestHook hook =
new LiveIntentOmniChannelIdentityProcessedAuctionRequestHook(
properties, userFpdActivityMask, mapper, httpClient, logSamplingRate);
liveIntentOmniChannelProperties, userFpdActivityMask, mapper, httpClient, logSamplingRate);

return new LiveIntentOmniChannelIdentityModule(Collections.singleton(hook));
}
Expand Down
6 changes: 3 additions & 3 deletions ...java/org/prebid/server/hooks/modules/optable/targeting/config/OptableTargetingConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class OptableTargetingConfig {

@Bean
@ConfigurationProperties(prefix = "hooks.modules." + OptableTargetingModule.CODE)
OptableTargetingProperties properties() {
OptableTargetingProperties optableTargetingProperties() {
return new OptableTargetingProperties();
}

Expand All @@ -45,11 +45,11 @@ IdsMapper queryParametersExtractor(@Value("${logging.sampling-rate:0.01}") doubl
APIClientImpl apiClient(HttpClient httpClient,
@Value("${logging.sampling-rate:0.01}")
double logSamplingRate,
OptableTargetingProperties properties,
OptableTargetingProperties optableTargetingProperties,
JacksonMapper jacksonMapperr) {

return new APIClientImpl(
properties.getApiEndpoint(),
optableTargetingProperties.getApiEndpoint(),
httpClient,
jacksonMapperr,
logSamplingRate);
Expand Down
Loading