Fix Sonar complains

[oam/nf-oam-adopter.git] / 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

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 2c0cab7..cbea02f 100644 (file)
--- 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;
@@ -105,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);
@@ -126,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))