Skip to content

Commit 6033934

Browse files
authored
Resolve bean conflict in modules (#4289)
1 parent 3cb039b commit 6033934

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

extra/modules/live-intent-omni-channel-identity/src/main/java/org/prebid/server/hooks/modules/liveintent/omni/channel/identity/config/LiveIntentOmniChannelIdentityConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ public class LiveIntentOmniChannelIdentityConfiguration {
2424

2525
@Bean
2626
@ConfigurationProperties(prefix = "hooks.modules." + LiveIntentOmniChannelIdentityModule.CODE)
27-
LiveIntentOmniChannelProperties properties() {
27+
LiveIntentOmniChannelProperties liveIntentOmniChannelProperties() {
2828
return new LiveIntentOmniChannelProperties();
2929
}
3030

3131
@Bean
32-
Module liveIntentOmniChannelIdentityModule(LiveIntentOmniChannelProperties properties,
32+
Module liveIntentOmniChannelIdentityModule(LiveIntentOmniChannelProperties liveIntentOmniChannelProperties,
3333
JacksonMapper mapper,
3434
UserFpdActivityMask userFpdActivityMask,
3535
HttpClient httpClient,
3636
@Value("${logging.sampling-rate:0.01}") double logSamplingRate) {
3737

3838
final LiveIntentOmniChannelIdentityProcessedAuctionRequestHook hook =
3939
new LiveIntentOmniChannelIdentityProcessedAuctionRequestHook(
40-
properties, userFpdActivityMask, mapper, httpClient, logSamplingRate);
40+
liveIntentOmniChannelProperties, userFpdActivityMask, mapper, httpClient, logSamplingRate);
4141

4242
return new LiveIntentOmniChannelIdentityModule(Collections.singleton(hook));
4343
}

extra/modules/optable-targeting/src/main/java/org/prebid/server/hooks/modules/optable/targeting/config/OptableTargetingConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class OptableTargetingConfig {
3232

3333
@Bean
3434
@ConfigurationProperties(prefix = "hooks.modules." + OptableTargetingModule.CODE)
35-
OptableTargetingProperties properties() {
35+
OptableTargetingProperties optableTargetingProperties() {
3636
return new OptableTargetingProperties();
3737
}
3838

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

5151
return new APIClientImpl(
52-
properties.getApiEndpoint(),
52+
optableTargetingProperties.getApiEndpoint(),
5353
httpClient,
5454
jacksonMapperr,
5555
logSamplingRate);

0 commit comments

Comments
 (0)