From a50be482f7f5fccf4898e622b83563a5f6365c29 Mon Sep 17 00:00:00 2001
From: RehanRaza <muhammad.rehan.raza@est.tech>
Date: Mon, 16 Mar 2020 16:26:25 +0100
Subject: [PATCH] Remove sonar code smells from sdnc-a1-controller

Change-Id: I85344bad6ac1a9205320d5b158040c5d94e56ea2
Issue-ID: NONRTRIC-142
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>
---
 .../northbound/provider/NonrtRicApiProvider.java    | 21 ++-------------------
 .../northbound/restadapter/NearRicUrlProvider.java  |  3 ---
 .../northbound/restadapter/RestAdapterImpl.java     |  6 +-----
 3 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/provider/NonrtRicApiProvider.java b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/provider/NonrtRicApiProvider.java
index c0c46a79..95acacb2 100644
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/provider/NonrtRicApiProvider.java
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/provider/NonrtRicApiProvider.java
@@ -23,11 +23,7 @@ package org.onap.sdnc.northbound.provider;
 import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
-import java.util.TimeZone;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -74,6 +70,7 @@ import org.springframework.http.ResponseEntity;
  *
  */
 
+@SuppressWarnings("squid:S1874") // "@Deprecated" code should not be used
 public class NonrtRicApiProvider implements AutoCloseable, A1ADAPTERAPIService {
 
   protected static final String APP_NAME = "nonrt-ric-api";
@@ -123,20 +120,6 @@ public class NonrtRicApiProvider implements AutoCloseable, A1ADAPTERAPIService {
     log.info("Successfully closed provider for {}", APP_NAME);
   }
 
-  private static class Iso8601Util {
-
-    private static TimeZone timeZone = TimeZone.getTimeZone("UTC");
-    private DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
-
-    private Iso8601Util() {
-      dateFormat.setTimeZone(timeZone);
-    }
-
-    private String now() {
-      return dateFormat.format(new Date());
-    }
-  }
-
   public void setDataBroker(DataBroker dataBroker) {
     this.dataBroker = dataBroker;
     if (log.isDebugEnabled()) {
@@ -249,7 +232,7 @@ public class NonrtRicApiProvider implements AutoCloseable, A1ADAPTERAPIService {
     DeletePolicyOutputBuilder responseBuilder = new DeletePolicyOutputBuilder();
     String uri = nearRicUrlProvider.deletePolicyUrl(String.valueOf(input.getNearRtRicUrl()),
             String.valueOf(input.getPolicyId()));
-    ResponseEntity<Void> response = restAdapter.delete(uri);
+    restAdapter.delete(uri);
     log.info("End of deletePolicy");
     RpcResult<DeletePolicyOutput> rpcResult = RpcResultBuilder
         .<DeletePolicyOutput>status(true).withResult(responseBuilder.build()).build();
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/NearRicUrlProvider.java b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/NearRicUrlProvider.java
index bb73dbad..b74d1031 100644
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/NearRicUrlProvider.java
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/NearRicUrlProvider.java
@@ -31,9 +31,6 @@ import org.springframework.web.util.UriComponentsBuilder;
 
 public class NearRicUrlProvider {
 
-  public NearRicUrlProvider() {
-  }
-
   /**
    * Retrieve the base url of the Near-RIC
    *
diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/RestAdapterImpl.java b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/RestAdapterImpl.java
index afa1d9f3..9e9d28a0 100644
--- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/RestAdapterImpl.java
+++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/src/main/java/org/onap/sdnc/northbound/restadapter/RestAdapterImpl.java
@@ -20,8 +20,6 @@
 
 package org.onap.sdnc.northbound.restadapter;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -38,8 +36,6 @@ import org.springframework.web.client.RestTemplate;
 
 public class RestAdapterImpl implements RestAdapter {
 
-  private final Logger log = LoggerFactory.getLogger(RestAdapterImpl.class);
-
   private RestTemplate restTemplate;
 
   public RestAdapterImpl() {
@@ -60,7 +56,7 @@ public class RestAdapterImpl implements RestAdapter {
   public <T> ResponseEntity<T> put(String uri, String body, Class<T> clazz) {
     HttpHeaders headers = new HttpHeaders();
     headers.setContentType(MediaType.APPLICATION_JSON);
-    HttpEntity<String> entity = new HttpEntity<String>(body, headers);
+    HttpEntity<String> entity = new HttpEntity<>(body, headers);
     return invokeHttpRequest(uri, HttpMethod.PUT, clazz, entity);
   }
 
-- 
2.16.6