diff --git a/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiAdmBuilder.java b/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiAdmBuilder.java
index 277ea05eea6..f03f01f0370 100644
--- a/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiAdmBuilder.java
+++ b/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiAdmBuilder.java
@@ -192,7 +192,7 @@ private static String makeUrl(MonitorEventType eventType, String url) {
case CLICK -> "";
case IMP -> "";
case VAST_ERROR -> "";
- default -> "";
+ default -> StringUtils.EMPTY;
};
}
@@ -298,7 +298,7 @@ private static String makeDspClickTrackings(Content content) {
.filter(Objects::nonNull)
.map(tracking -> "\"" + tracking + "\"")
.collect(Collectors.joining(",")))
- .orElse("");
+ .orElse(StringUtils.EMPTY);
}
private static String makeDspImpTrackings(Content content) {
@@ -312,7 +312,7 @@ private static String makeDspImpTrackings(Content content) {
.map(list -> list.stream()
.map(tracking -> " ")
.collect(Collectors.joining()))
- .orElse("");
+ .orElse(StringUtils.EMPTY);
}
public HuaweiAdm buildNative(AdsType adType, Content content, Native xNative) {
diff --git a/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiAdsBidder.java b/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiAdsBidder.java
index eae6429b733..1c4ad601fce 100644
--- a/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiAdsBidder.java
+++ b/src/main/java/org/prebid/server/bidder/huaweiads/HuaweiAdsBidder.java
@@ -172,7 +172,7 @@ private Regs makeRegs(com.iab.openrtb.request.Regs regs) {
.map(com.iab.openrtb.request.Regs::getCoppa)
.filter(coppa -> coppa >= 0)
.map(Regs::of)
- .orElse(Regs.of(null));
+ .orElseGet(() -> Regs.of(null));
}
private Geo makeGeo(com.iab.openrtb.request.Device device) {
@@ -349,7 +349,7 @@ private String getNurl(List monitorList) {
.map(Monitor::getUrlList)
.flatMap(Collection::stream)
.findFirst()
- .orElse("");
+ .orElse(StringUtils.EMPTY);
}
}