From 1b2cece141147ae3ccb41f3d0031c116c6e7c247 Mon Sep 17 00:00:00 2001 From: Michiel Meeuwissen Date: Tue, 10 Oct 2023 09:51:07 +0200 Subject: [PATCH] Resolved some deprecation. --- .../nl/vpro/api/client/frontend/NpoApiClients.java | 2 ++ .../nl/vpro/api/client/media/MediaRestClient.java | 13 +++++-------- .../vpro/api/client/pages/PageUpdateApiClient.java | 3 +++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/frontend-api-client/src/main/java/nl/vpro/api/client/frontend/NpoApiClients.java b/frontend-api-client/src/main/java/nl/vpro/api/client/frontend/NpoApiClients.java index b61769e6..bf8f155f 100644 --- a/frontend-api-client/src/main/java/nl/vpro/api/client/frontend/NpoApiClients.java +++ b/frontend-api-client/src/main/java/nl/vpro/api/client/frontend/NpoApiClients.java @@ -220,6 +220,7 @@ protected NpoApiClients( Duration countWindow, Integer bucketCount, Duration warnThreshold, + Level warnLevel, @Singular List acceptableLanguages, MediaType accept, MediaType contentType, @@ -252,6 +253,7 @@ protected NpoApiClients( countWindow, bucketCount, warnThreshold, + warnLevel, acceptableLanguages, accept, contentType, diff --git a/media-backend-api-client/src/main/java/nl/vpro/api/client/media/MediaRestClient.java b/media-backend-api-client/src/main/java/nl/vpro/api/client/media/MediaRestClient.java index 6f5f03cd..b6bf836b 100644 --- a/media-backend-api-client/src/main/java/nl/vpro/api/client/media/MediaRestClient.java +++ b/media-backend-api-client/src/main/java/nl/vpro/api/client/media/MediaRestClient.java @@ -117,6 +117,9 @@ public class MediaRestClient extends AbstractApiClient implements MediaRestClien @Setter @Getter protected String errors; + + @Getter + @Setter @lombok.Builder.Default protected boolean waitForRetry = false; @@ -243,6 +246,7 @@ protected MediaRestClient( Duration countWindow, Integer bucketCount, Duration warnThreshold, + nl.vpro.logging.simple.Level warnLevel, List acceptableLanguages, Boolean trustAll, Integer defaultMax, @@ -281,6 +285,7 @@ protected MediaRestClient( countWindow, bucketCount, warnThreshold, + warnLevel, acceptableLanguages, null, null, @@ -393,14 +398,6 @@ public void setUserNamePassword(String semicolonSeperated) { } } - public boolean isWaitForRetry() { - return waitForRetry; - } - - public void setWaitForRetry(boolean waitForRetry) { - this.waitForRetry = waitForRetry; - } - public void setHeaders(Map headers) { this.headers = headers; } diff --git a/pages-backend-api-client/src/main/java/nl/vpro/api/client/pages/PageUpdateApiClient.java b/pages-backend-api-client/src/main/java/nl/vpro/api/client/pages/PageUpdateApiClient.java index d6fa1f22..45d01b2f 100644 --- a/pages-backend-api-client/src/main/java/nl/vpro/api/client/pages/PageUpdateApiClient.java +++ b/pages-backend-api-client/src/main/java/nl/vpro/api/client/pages/PageUpdateApiClient.java @@ -33,6 +33,7 @@ import nl.vpro.domain.page.PageIdMatch; import nl.vpro.domain.page.update.PageUpdate; import nl.vpro.jmx.MBeans; +import nl.vpro.logging.simple.Level; import nl.vpro.rs.client.VersionResult; import nl.vpro.rs.converters.ConditionalBasicAuthentication; import nl.vpro.rs.pages.update.PageUpdateRestService; @@ -145,6 +146,7 @@ protected PageUpdateApiClient( Duration countWindow, Integer bucketCount, Duration warnThreshold, + Level warnLevel, List acceptableLanguages, MediaType accept, Boolean trustAll, @@ -173,6 +175,7 @@ protected PageUpdateApiClient( countWindow, bucketCount, warnThreshold, + warnLevel, acceptableLanguages, accept, null,