Skip to content

Commit 5916943

Browse files
AntoxaAntoxicAntoxaAntoxic
committed
Dependencies: Update compatibility-breaking dependencies
1 parent 0495b1e commit 5916943

25 files changed

Lines changed: 43 additions & 46 deletions

‎extra/modules/optable-targeting/src/main/java/org/prebid/server/hooks/modules/optable/targeting/model/Id.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import lombok.Value;
44

5-
import javax.validation.constraints.NotNull;
5+
import jakarta.validation.constraints.NotNull;
66

77
@Value(staticConstructor = "of")
88
public class Id {

‎extra/pom.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<!-- Project production dependency versions -->
3636
<spring.boot.version>3.5.5</spring.boot.version>
3737
<vertx.version>4.5.20</vertx.version>
38-
<validation-api.version>2.0.1.Final</validation-api.version>
3938
<commons.collections.version>4.4</commons.collections.version>
4039
<commons.compress.version>1.27.1</commons.compress.version>
4140
<commons-math3.version>3.6.1</commons-math3.version>
@@ -52,7 +51,7 @@
5251
<iabtcf.version>2.0.10</iabtcf.version>
5352
<gpp-encoder.version>3.2.4</gpp-encoder.version>
5453
<maxmind-client.version>4.2.1</maxmind-client.version>
55-
<protobuf.version>3.25.6</protobuf.version>
54+
<protobuf.version>4.32.1</protobuf.version>
5655
<protoc.version>${protobuf.version}</protoc.version>
5756
<json-logic.version>1.0.9</json-logic.version>
5857
<aws.awssdk.version>2.31.22</aws.awssdk.version>
@@ -111,11 +110,6 @@
111110
<artifactId>wiremock-jetty12</artifactId>
112111
<version>${wiremock.version}</version>
113112
</dependency>
114-
<dependency>
115-
<groupId>javax.validation</groupId>
116-
<artifactId>validation-api</artifactId>
117-
<version>${validation-api.version}</version>
118-
</dependency>
119113
<dependency>
120114
<groupId>com.ongres.scram</groupId>
121115
<artifactId>client</artifactId>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
<artifactId>jakarta.annotation-api</artifactId>
4242
</dependency>
4343
<dependency>
44-
<groupId>javax.validation</groupId>
45-
<artifactId>validation-api</artifactId>
44+
<groupId>jakarta.validation</groupId>
45+
<artifactId>jakarta.validation-api</artifactId>
4646
</dependency>
4747
<dependency>
4848
<groupId>org.hibernate.validator</groupId>

‎src/main/java/org/prebid/server/bidder/consumable/ConsumableBidder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.fasterxml.jackson.core.type.TypeReference;
44
import com.fasterxml.jackson.databind.JsonNode;
55
import com.fasterxml.jackson.databind.node.ObjectNode;
6-
import com.google.common.base.Strings;
76
import com.iab.openrtb.request.App;
87
import com.iab.openrtb.request.BidRequest;
98
import com.iab.openrtb.request.Imp;
@@ -13,6 +12,7 @@
1312
import com.iab.openrtb.response.SeatBid;
1413
import io.vertx.core.MultiMap;
1514
import org.apache.commons.collections4.CollectionUtils;
15+
import org.apache.commons.lang3.StringUtils;
1616
import org.prebid.server.bidder.Bidder;
1717
import org.prebid.server.bidder.model.BidderBid;
1818
import org.prebid.server.bidder.model.BidderCall;
@@ -65,7 +65,7 @@ public Result<List<HttpRequest<BidRequest>>> makeHttpRequests(BidRequest bidRequ
6565
if (!isImpValid(bidRequest.getSite(), bidRequest.getApp(), impExt)) {
6666
continue;
6767
}
68-
if (Strings.isNullOrEmpty(placementId) && !Strings.isNullOrEmpty(impExt.getPlacementId())) {
68+
if (StringUtils.isBlank(placementId) && StringUtils.isNotBlank(impExt.getPlacementId())) {
6969
placementId = impExt.getPlacementId();
7070
}
7171

@@ -93,7 +93,7 @@ private ExtImpConsumable parseImpExt(Imp imp) {
9393
}
9494

9595
private boolean isImpValid(Site site, App app, ExtImpConsumable impExt) {
96-
return (app != null && !Strings.isNullOrEmpty(impExt.getPlacementId()))
96+
return (app != null && StringUtils.isNotBlank(impExt.getPlacementId()))
9797
|| (site != null && impExt.getSiteId() != 0 && impExt.getNetworkId() != 0 && impExt.getUnitId() != 0);
9898

9999
}
@@ -103,7 +103,7 @@ private BidRequest modifyBidRequest(BidRequest bidRequest, List<Imp> imps) {
103103
}
104104

105105
private String constructUri(String placementId) {
106-
final String uri = Strings.isNullOrEmpty(placementId) ? SITE_URI_PATH : (APP_URI_PATH + placementId);
106+
final String uri = StringUtils.isBlank(placementId) ? SITE_URI_PATH : (APP_URI_PATH + placementId);
107107
return this.endpointUrl + uri;
108108
}
109109

‎src/main/java/org/prebid/server/protobuf/request/ProtobufForwardExtensionMapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.prebid.server.protobuf.request;
22

3-
import com.google.protobuf.Extension;
3+
import com.google.protobuf.ExtensionLite;
44
import com.google.protobuf.Message;
55

66
/**
@@ -10,5 +10,5 @@ public interface ProtobufForwardExtensionMapper<ContainingType extends Message,
1010

1111
ToType map(FromType fromType);
1212

13-
Extension<ContainingType, ToType> extensionDescriptor();
13+
ExtensionLite<ContainingType, ToType> extensionDescriptor();
1414
}

‎src/main/java/org/prebid/server/protobuf/response/ProtobufBackwardExtensionMapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.prebid.server.protobuf.response;
22

3-
import com.google.protobuf.Extension;
3+
import com.google.protobuf.ExtensionLite;
44
import com.google.protobuf.Message;
55

66
/**
@@ -10,5 +10,5 @@ public interface ProtobufBackwardExtensionMapper<ContainingType extends Message,
1010

1111
ToType map(FromType fromType);
1212

13-
Extension<ContainingType, FromType> extensionDescriptor();
13+
ExtensionLite<ContainingType, FromType> extensionDescriptor();
1414
}

‎src/main/java/org/prebid/server/protobuf/response/ProtobufResponseUtils.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
44
import com.fasterxml.jackson.databind.ObjectMapper;
5-
import com.google.protobuf.GeneratedMessageV3;
5+
import com.google.protobuf.GeneratedMessage;
66
import com.iab.openrtb.response.Asset;
77
import com.iab.openrtb.response.Bid;
88
import com.iab.openrtb.response.BidResponse;
@@ -248,7 +248,7 @@ public static ProtobufMapper<OpenRtb.NativeResponse.Asset.Video, VideoObject> na
248248
.build();
249249
}
250250

251-
private static <ContainingType extends GeneratedMessageV3.ExtendableMessage<ContainingType>, FromType, ToType>
251+
private static <ContainingType extends GeneratedMessage.ExtendableMessage<ContainingType>, FromType, ToType>
252252
ToType extractExtension(
253253
ProtobufBackwardExtensionMapper<ContainingType, FromType, ToType> mapper, ContainingType value) {
254254

‎src/main/java/org/prebid/server/settings/SettingsCache.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import com.github.benmanes.caffeine.cache.Expiry;
55
import org.apache.commons.collections4.MapUtils;
66
import org.apache.commons.lang3.ObjectUtils;
7-
import org.checkerframework.checker.index.qual.NonNegative;
87
import org.prebid.server.settings.model.StoredItem;
98

9+
import jakarta.validation.constraints.PositiveOrZero;
1010
import java.util.Collections;
1111
import java.util.HashSet;
1212
import java.util.List;
@@ -108,12 +108,12 @@ public long expireAfterCreate(K key, V value, long currentTime) {
108108
}
109109

110110
@Override
111-
public long expireAfterUpdate(K key, V value, long currentTime, @NonNegative long currentDuration) {
111+
public long expireAfterUpdate(K key, V value, long currentTime, @PositiveOrZero long currentDuration) {
112112
return expireAfterNanos;
113113
}
114114

115115
@Override
116-
public long expireAfterRead(K key, V value, long currentTime, @NonNegative long currentDuration) {
116+
public long expireAfterRead(K key, V value, long currentTime, @PositiveOrZero long currentDuration) {
117117
return currentDuration;
118118
}
119119
}
@@ -134,12 +134,12 @@ public long expireAfterCreate(K key, V value, long currentTime) {
134134
}
135135

136136
@Override
137-
public long expireAfterUpdate(K key, V value, long currentTime, @NonNegative long currentDuration) {
137+
public long expireAfterUpdate(K key, V value, long currentTime, @PositiveOrZero long currentDuration) {
138138
return baseExpiry.expireAfterUpdate(key, value, currentTime, currentDuration) + jitter();
139139
}
140140

141141
@Override
142-
public long expireAfterRead(K key, V value, long currentTime, @NonNegative long currentDuration) {
142+
public long expireAfterRead(K key, V value, long currentTime, @PositiveOrZero long currentDuration) {
143143
return baseExpiry.expireAfterRead(key, value, currentTime, currentDuration);
144144
}
145145

‎src/main/java/org/prebid/server/spring/config/SettingsConfiguration.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
import software.amazon.awssdk.regions.Region;
5252
import software.amazon.awssdk.services.s3.S3AsyncClient;
5353

54-
import javax.validation.constraints.Min;
55-
import javax.validation.constraints.NotBlank;
56-
import javax.validation.constraints.NotNull;
54+
import jakarta.validation.constraints.Min;
55+
import jakarta.validation.constraints.NotBlank;
56+
import jakarta.validation.constraints.NotNull;
5757
import java.net.URI;
5858
import java.net.URISyntaxException;
5959
import java.time.Clock;
@@ -259,6 +259,9 @@ static class S3SettingsConfiguration {
259259

260260
@Component
261261
@ConfigurationProperties(prefix = "settings.s3")
262+
@ConditionalOnProperty(
263+
prefix = "settings.s3",
264+
name = {"accounts-dir", "stored-imps-dir", "stored-requests-dir"})
262265
@Validated
263266
@Data
264267
@NoArgsConstructor
@@ -294,7 +297,7 @@ private boolean useStaticCredentials() {
294297
@NotBlank
295298
private String bucket;
296299

297-
@NotBlank
300+
@NotNull
298301
private Boolean forcePathStyle;
299302

300303
@NotBlank

‎src/main/java/org/prebid/server/spring/config/bidder/AsoConfiguration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.springframework.context.annotation.Configuration;
1414
import org.springframework.context.annotation.PropertySource;
1515

16-
import javax.validation.constraints.NotBlank;
16+
import jakarta.validation.constraints.NotBlank;
1717

1818
@Configuration
1919
@PropertySource(value = "classpath:/bidder-config/aso.yaml", factory = YamlPropertySourceFactory.class)

0 commit comments

Comments
 (0)