X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ves-nf-oam-adopter%2Fves-nf-oam-adopter-pm-sb-rest-client%2Fsrc%2Fmain%2Fjava%2Forg%2Fo%2Fran%2Foam%2Fnf%2Foam%2Fadopter%2Fpm%2Fsb%2Frest%2Fclient%2FDefaultHttpRestClient.java;h=cbea02f712f214ff09e9d165a16b973bee1d3666;hb=723c84531a12d8ceff53444a7cdb37589f6e32ad;hp=a99fedd55d780d9898f931439b7794cd47cb43a8;hpb=3b1e9c1e2ea636b0c90da826ecf37147a9b5f23d;p=oam%2Fnf-oam-adopter.git

diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-sb-rest-client/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/sb/rest/client/DefaultHttpRestClient.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-sb-rest-client/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/sb/rest/client/DefaultHttpRestClient.java
index a99fedd..cbea02f 100644
--- a/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-sb-rest-client/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/sb/rest/client/DefaultHttpRestClient.java
+++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-pm-sb-rest-client/src/main/java/org/o/ran/oam/nf/oam/adopter/pm/sb/rest/client/DefaultHttpRestClient.java
@@ -34,7 +34,6 @@ import java.time.format.DateTimeFormatter;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.zip.ZipInputStream;
-import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
 import org.apache.hc.client5.http.async.methods.SimpleHttpRequests;
 import org.apache.hc.client5.http.async.methods.SimpleHttpResponse;
 import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
@@ -65,13 +64,8 @@ public final class DefaultHttpRestClient implements HttpRestClient {
             CacheBuilder.newBuilder().refreshAfterWrite(59, TimeUnit.MINUTES).build(new CacheLoader<>() {
                 @Override
                 public String load(final Adapter adapter) throws ExecutionException, InterruptedException {
-                    try {
-                        return returnToken(DefaultHttpRestClient.this.client, DefaultHttpRestClient.this.tokenEndpoint,
-                                adapter);
-                    } catch (final Exception error) {
-                        LOG.error("Failed to read time zone", error);
-                        throw error;
-                    }
+                    return returnToken(DefaultHttpRestClient.this.client, DefaultHttpRestClient.this.tokenEndpoint,
+                            adapter);
                 }
             });
 
@@ -110,7 +104,7 @@ public final class DefaultHttpRestClient implements HttpRestClient {
     @Override
     public Single<ZoneId> getTimeZone(final Adapter adapter) {
         try {
-            final ZoneId zoneId = zoneIdCache.get(adapter);
+            final var zoneId = zoneIdCache.get(adapter);
             final String offset = OFFSET_FORMATTER.format(zoneId.getRules().getOffset(Instant.now()));
             LOG.info("Adapter {} has offset {}", adapter.getHostIpAddress(), offset);
             return Single.just(zoneId);
@@ -131,8 +125,7 @@ public final class DefaultHttpRestClient implements HttpRestClient {
      */
     public Single<SimpleHttpResponse> get(final Adapter adapter, final String url) {
         return getToken(adapter).flatMap(token -> {
-            final SimpleHttpRequest request =
-                SimpleHttpRequests.get(HTTPS + adapter.getHostIpAddress() + url);
+            final var request = SimpleHttpRequests.get(HTTPS + adapter.getHostIpAddress() + url);
             request.addHeader(HttpHeaders.CONTENT_TYPE, APPLICATION_JSON_VALUE);
             request.addHeader(HttpHeaders.AUTHORIZATION, BEARER + token);
             return Single.fromFuture(client.execute(request, null))