Skip to content

Commit b4ead33

Browse files
authored
Make implicit bidder config defaults more explicit (#1488)
1 parent b23bac7 commit b4ead33

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

src/main/java/org/prebid/server/spring/config/bidder/model/BidderConfigurationProperties.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import javax.annotation.PostConstruct;
1212
import javax.validation.constraints.NotBlank;
1313
import javax.validation.constraints.NotNull;
14-
import java.util.Collections;
1514
import java.util.List;
1615
import java.util.Map;
1716

@@ -35,17 +34,17 @@ public class BidderConfigurationProperties {
3534

3635
private Boolean modifyingVastXmlAllowed;
3736

38-
private List<String> deprecatedNames = Collections.emptyList();
37+
private List<String> deprecatedNames;
3938

40-
private Map<String, Object> aliases = Collections.emptyMap();
39+
private Map<String, Object> aliases;
4140

4241
@NotNull
4342
private MetaInfo metaInfo;
4443

4544
@NotNull
4645
private UsersyncConfigurationProperties usersync;
4746

48-
private Map<String, String> extraInfo = Collections.emptyMap();
47+
private Map<String, String> extraInfo;
4948

5049
private final Class<? extends BidderConfigurationProperties> selfClass;
5150

@@ -60,5 +59,8 @@ private void init() {
6059
pbsEnforcesCcpa = ObjectUtils.defaultIfNull(pbsEnforcesCcpa, defaultProperties.getPbsEnforcesCcpa());
6160
modifyingVastXmlAllowed = ObjectUtils.defaultIfNull(modifyingVastXmlAllowed,
6261
defaultProperties.getModifyingVastXmlAllowed());
62+
aliases = ObjectUtils.defaultIfNull(aliases, defaultProperties.getAliases());
63+
deprecatedNames = ObjectUtils.defaultIfNull(deprecatedNames, defaultProperties.getDeprecatedNames());
64+
extraInfo = ObjectUtils.defaultIfNull(extraInfo, defaultProperties.getExtraInfo());
6365
}
6466
}

src/main/java/org/prebid/server/spring/config/bidder/model/DefaultBidderConfigurationProperties.java

+9
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
import org.springframework.validation.annotation.Validated;
55

66
import javax.validation.constraints.NotNull;
7+
import java.util.Collections;
8+
import java.util.List;
9+
import java.util.Map;
710

811
@Validated
912
@Data
@@ -20,4 +23,10 @@ public class DefaultBidderConfigurationProperties {
2023

2124
@NotNull
2225
private Boolean modifyingVastXmlAllowed;
26+
27+
private final Map<String, Object> aliases = Collections.emptyMap();
28+
29+
private final List<String> deprecatedNames = Collections.emptyList();
30+
31+
private final Map<String, String> extraInfo = Collections.emptyMap();
2332
}

0 commit comments

Comments
 (0)