Remove unused import statement and import specific classes

Issue-ID: SO-3911

Signed-off-by: MD IRSHAD SHEIKH <md.irshad.sheikh@huawei.com>
Change-Id: I481ce54feb31e320066a962e3028f658e2cd330c

14 files changed, 69 insertions, 21 deletions

diff --git a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/controller/NssmfAdapterController.java b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/controller/NssmfAdapterController.java
index ded0d17..f8886aa 100644
--- a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/controller/NssmfAdapterController.java
+++ b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/controller/NssmfAdapterController.java
@@ -2,10 +2,14 @@ package org.onap.so.adapters.nssmf.controller;
 

 import org.onap.so.adapters.nssmf.annotation.RequestLogger;

 import org.onap.so.adapters.nssmf.service.NssmfManagerService;

-import org.onap.so.beans.nsmf.*;

+import org.onap.so.beans.nsmf.NssmfAdapterNBIRequest;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.http.ResponseEntity;

-import org.springframework.web.bind.annotation.*;

+import org.springframework.web.bind.annotation.PathVariable;

+import org.springframework.web.bind.annotation.PostMapping;

+import org.springframework.web.bind.annotation.RequestBody;

+import org.springframework.web.bind.annotation.RequestMapping;

+import org.springframework.web.bind.annotation.RestController;

 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;

 

 @RestController

diff --git a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/interceptor/RequestLogAspect.java b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/interceptor/RequestLogAspect.java
index 908cf91..839a450 100644
--- a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/interceptor/RequestLogAspect.java
+++ b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/interceptor/RequestLogAspect.java
@@ -23,7 +23,10 @@ import lombok.Data;
 import lombok.ToString;

 import org.aspectj.lang.JoinPoint;

 import org.aspectj.lang.ProceedingJoinPoint;

-import org.aspectj.lang.annotation.*;

+import org.aspectj.lang.annotation.Pointcut;

+import org.aspectj.lang.annotation.AfterThrowing;

+import org.aspectj.lang.annotation.Aspect;

+import org.aspectj.lang.annotation.Around;

 import org.aspectj.lang.reflect.MethodSignature;

 import org.onap.so.adapters.nssmf.annotation.RequestLogger;

 import org.onap.so.adapters.nssmf.annotation.ServiceLogger;

diff --git a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/NssmfManager.java b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/NssmfManager.java
index 8923a1c..3f69dbc 100644
--- a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/NssmfManager.java
+++ b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/NssmfManager.java
@@ -22,7 +22,7 @@ package org.onap.so.adapters.nssmf.manager;
 

 import org.onap.so.adapters.nssmf.exceptions.ApplicationException;

 import org.onap.so.adapters.nssmf.entity.RestResponse;

-import org.onap.so.beans.nsmf.*;

+import org.onap.so.beans.nsmf.NssmfAdapterNBIRequest;

 

 public interface NssmfManager {

 

diff --git a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/NssmfManagerBuilder.java b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/NssmfManagerBuilder.java
index 096d548..4eb3901 100644
--- a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/NssmfManagerBuilder.java
+++ b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/NssmfManagerBuilder.java
@@ -25,12 +25,12 @@ import org.onap.so.adapters.nssmf.consts.NssmfAdapterConsts;
 import org.onap.so.adapters.nssmf.enums.ActionType;

 import org.onap.so.adapters.nssmf.enums.ExecutorType;

 import org.onap.so.adapters.nssmf.exceptions.ApplicationException;

+import org.onap.so.adapters.nssmf.manager.impl.BaseNssmfManager;

 import org.onap.so.adapters.nssmf.manager.impl.external.ExternalAnNssmfManager;

 import org.onap.so.adapters.nssmf.manager.impl.external.ExternalCnNssmfManager;

 import org.onap.so.adapters.nssmf.manager.impl.internal.InternalAnNssmfManager;

 import org.onap.so.adapters.nssmf.manager.impl.internal.InternalCnNssmfManager;

 import org.onap.so.adapters.nssmf.manager.impl.internal.InternalTnNssmfManager;

-import org.onap.so.adapters.nssmf.manager.impl.*;

 import org.onap.so.adapters.nssmf.util.RestUtil;

 import org.onap.so.beans.nsmf.EsrInfo;

 import org.onap.so.beans.nsmf.NetworkType;

diff --git a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/BaseNssmfManager.java b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/BaseNssmfManager.java
index 3b75d22..064f7b1 100644
--- a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/BaseNssmfManager.java
+++ b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/BaseNssmfManager.java
@@ -20,24 +20,31 @@
 

 package org.onap.so.adapters.nssmf.manager.impl;

 

+import org.onap.so.adapters.nssmf.enums.ActionType;

+import org.onap.so.adapters.nssmf.enums.ExecutorType;

+import org.onap.so.adapters.nssmf.enums.HttpMethod;

+import org.onap.so.adapters.nssmf.enums.SelectionType;

 import org.onap.so.adapters.nssmf.config.NssmfAdapterConfig;

 import org.onap.so.adapters.nssmf.consts.NssmfAdapterConsts;

 import org.onap.so.adapters.nssmf.entity.NssmfUrlInfo;

-import org.onap.so.adapters.nssmf.enums.*;

 import org.onap.so.adapters.nssmf.exceptions.ApplicationException;

 import org.onap.so.adapters.nssmf.entity.RestResponse;

 import org.onap.so.adapters.nssmf.manager.NssmfManager;

 import org.onap.so.adapters.nssmf.util.RestUtil;

-import org.onap.so.beans.nsmf.*;

+import org.onap.so.beans.nsmf.ActDeActNssi;

+import org.onap.so.beans.nsmf.DeAllocateNssi;

+import org.onap.so.beans.nsmf.EsrInfo;

+import org.onap.so.beans.nsmf.QuerySubnetCapability;

+import org.onap.so.beans.nsmf.NetworkType;

+import org.onap.so.beans.nsmf.NssmfAdapterNBIRequest;

+import org.onap.so.beans.nsmf.ServiceInfo;

 import org.onap.so.db.request.beans.ResourceOperationStatus;

 import org.onap.so.db.request.data.repository.ResourceOperationStatusRepository;

 import org.slf4j.Logger;

 import org.slf4j.LoggerFactory;

-import org.springframework.data.domain.Example;

 import java.util.HashMap;

 import java.util.List;

 import java.util.Map;

-import java.util.Optional;

 import static org.onap.so.adapters.nssmf.util.NssmfAdapterUtil.marshal;

 

 public abstract class BaseNssmfManager implements NssmfManager {

diff --git a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/ExternalNssmfManager.java b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/ExternalNssmfManager.java
index b465230..cc733de 100644
--- a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/ExternalNssmfManager.java
+++ b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/ExternalNssmfManager.java
@@ -33,7 +33,13 @@ import org.onap.so.adapters.nssmf.enums.ActionType;
 import org.onap.so.adapters.nssmf.enums.JobStatus;

 import org.onap.so.adapters.nssmf.exceptions.ApplicationException;

 import org.onap.so.adapters.nssmf.util.NssmfAdapterUtil;

-import org.onap.so.beans.nsmf.*;

+import org.onap.so.beans.nsmf.ActDeActNssi;

+import org.onap.so.beans.nsmf.DeAllocateNssi;

+import org.onap.so.beans.nsmf.JobStatusResponse;

+import org.onap.so.beans.nsmf.QuerySubnetCapability;

+import org.onap.so.beans.nsmf.NssiResponse;

+import org.onap.so.beans.nsmf.NssmfAdapterNBIRequest;

+import org.onap.so.beans.nsmf.ResponseDescriptor;

 import org.onap.so.db.request.beans.ResourceOperationStatus;

 import org.slf4j.Logger;

 import org.slf4j.LoggerFactory;

@@ -42,7 +48,11 @@ import java.util.HashMap;
 import java.util.List;

 import java.util.Map;

 import static java.lang.String.valueOf;

-import static org.onap.so.adapters.nssmf.enums.JobStatus.*;

+import static org.onap.so.adapters.nssmf.enums.JobStatus.ERROR;

+import static org.onap.so.adapters.nssmf.enums.JobStatus.FINISHED;

+import static org.onap.so.adapters.nssmf.enums.JobStatus.fromString;

+import static org.onap.so.adapters.nssmf.enums.JobStatus.PROCESSING;

+import static org.onap.so.adapters.nssmf.enums.JobStatus.STARTED;

 import static org.onap.so.adapters.nssmf.util.NssmfAdapterUtil.StatusDesc.QUERY_JOB_STATUS_FAILED;

 import static org.onap.so.adapters.nssmf.util.NssmfAdapterUtil.StatusDesc.QUERY_JOB_STATUS_SUCCESS;

 import static org.onap.so.adapters.nssmf.util.NssmfAdapterUtil.marshal;

diff --git a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/InternalNssmfManager.java b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/InternalNssmfManager.java
index 49f1306..94b6957 100644
--- a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/InternalNssmfManager.java
+++ b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/InternalNssmfManager.java
@@ -26,7 +26,13 @@ import org.onap.so.adapters.nssmf.consts.NssmfAdapterConsts;
 import org.onap.so.adapters.nssmf.entity.RestResponse;

 import org.onap.so.adapters.nssmf.enums.SelectionType;

 import org.onap.so.adapters.nssmf.exceptions.ApplicationException;

-import org.onap.so.beans.nsmf.*;

+import org.onap.so.beans.nsmf.ActDeActNssi;

+import org.onap.so.beans.nsmf.DeAllocateNssi;

+import org.onap.so.beans.nsmf.JobStatusResponse;

+import org.onap.so.beans.nsmf.QuerySubnetCapability;

+import org.onap.so.beans.nsmf.NssmfAdapterNBIRequest;

+import org.onap.so.beans.nsmf.NssmfRequest;

+import org.onap.so.beans.nsmf.ResponseDescriptor;

 import org.onap.so.db.request.beans.ResourceOperationStatus;

 import static org.onap.so.adapters.nssmf.enums.JobStatus.PROCESSING;

 import static org.onap.so.adapters.nssmf.util.NssmfAdapterUtil.marshal;

diff --git a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/internal/InternalAnNssmfManager.java b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/internal/InternalAnNssmfManager.java
index de0f1c7..3b6f531 100644
--- a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/internal/InternalAnNssmfManager.java
+++ b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/internal/InternalAnNssmfManager.java
@@ -22,7 +22,10 @@ package org.onap.so.adapters.nssmf.manager.impl.internal;
 

 import org.onap.so.adapters.nssmf.exceptions.ApplicationException;

 import org.onap.so.adapters.nssmf.manager.impl.InternalNssmfManager;

-import org.onap.so.beans.nsmf.*;

+import org.onap.so.beans.nsmf.AllocateAnNssi;

+import org.onap.so.beans.nsmf.AnSliceProfile;

+import org.onap.so.beans.nsmf.NssmfAdapterNBIRequest;

+import org.onap.so.beans.nsmf.NssmfRequest;

 import java.util.HashMap;

 import java.util.Map;

 import static org.onap.so.adapters.nssmf.util.NssmfAdapterUtil.marshal;

diff --git a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/internal/InternalCnNssmfManager.java b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/internal/InternalCnNssmfManager.java
index 3f594cc..c602378 100644
--- a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/internal/InternalCnNssmfManager.java
+++ b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/internal/InternalCnNssmfManager.java
@@ -22,7 +22,10 @@ package org.onap.so.adapters.nssmf.manager.impl.internal;
 

 import org.onap.so.adapters.nssmf.exceptions.ApplicationException;

 import org.onap.so.adapters.nssmf.manager.impl.InternalNssmfManager;

-import org.onap.so.beans.nsmf.*;

+import org.onap.so.beans.nsmf.AllocateCnNssi;

+import org.onap.so.beans.nsmf.CnSliceProfile;

+import org.onap.so.beans.nsmf.NssmfAdapterNBIRequest;

+import org.onap.so.beans.nsmf.NssmfRequest;

 import java.util.HashMap;

 import java.util.Map;

 import static org.onap.so.adapters.nssmf.util.NssmfAdapterUtil.marshal;

diff --git a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/internal/InternalTnNssmfManager.java b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/internal/InternalTnNssmfManager.java
index 7240ac1..da1d9d8 100644
--- a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/internal/InternalTnNssmfManager.java
+++ b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/manager/impl/internal/InternalTnNssmfManager.java
@@ -22,7 +22,8 @@ package org.onap.so.adapters.nssmf.manager.impl.internal;
 

 import org.onap.so.adapters.nssmf.exceptions.ApplicationException;

 import org.onap.so.adapters.nssmf.manager.impl.InternalNssmfManager;

-import org.onap.so.beans.nsmf.*;

+import org.onap.so.beans.nsmf.NssmfAdapterNBIRequest;

+import org.onap.so.beans.nsmf.NssmfRequest;

 import static org.onap.so.adapters.nssmf.util.NssmfAdapterUtil.marshal;

 

 public class InternalTnNssmfManager extends InternalNssmfManager {

diff --git a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/service/NssmfManagerService.java b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/service/NssmfManagerService.java
index 8355fcf..52ecb14 100644
--- a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/service/NssmfManagerService.java
+++ b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/service/NssmfManagerService.java
@@ -21,7 +21,7 @@
 package org.onap.so.adapters.nssmf.service;

 

 import org.onap.so.adapters.nssmf.annotation.ServiceLogger;

-import org.onap.so.beans.nsmf.*;

+import org.onap.so.beans.nsmf.NssmfAdapterNBIRequest;

 import org.springframework.http.ResponseEntity;

 import org.springframework.stereotype.Service;

 

diff --git a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/service/impl/NssmfManagerServiceImpl.java b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/service/impl/NssmfManagerServiceImpl.java
index 960632a..ee44128 100644
--- a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/service/impl/NssmfManagerServiceImpl.java
+++ b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/service/impl/NssmfManagerServiceImpl.java
@@ -30,7 +30,9 @@ import org.onap.so.adapters.nssmf.entity.RestResponse;
 import org.onap.so.adapters.nssmf.manager.NssmfManager;

 import org.onap.so.adapters.nssmf.service.NssmfManagerService;

 import org.onap.so.adapters.nssmf.util.RestUtil;

-import org.onap.so.beans.nsmf.*;

+import org.onap.so.beans.nsmf.EsrInfo;

+import org.onap.so.beans.nsmf.NssmfAdapterNBIRequest;

+import org.onap.so.beans.nsmf.ServiceInfo;

 import org.onap.so.db.request.data.repository.ResourceOperationStatusRepository;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.http.ResponseEntity;

diff --git a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/util/NssmfAdapterUtil.java b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/util/NssmfAdapterUtil.java
index d45aac4..d4bf3a7 100644
--- a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/util/NssmfAdapterUtil.java
+++ b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/util/NssmfAdapterUtil.java
@@ -27,7 +27,6 @@ import org.onap.so.adapters.nssmf.exceptions.ApplicationException;
 import org.slf4j.Logger;

 import org.slf4j.LoggerFactory;

 import org.onap.logging.filter.base.ErrorCode;

-import org.springframework.stereotype.Component;

 import static org.onap.so.logger.LoggingAnchor.THREE;

 import static org.onap.so.logger.MessageEnum.RA_NS_EXC;

 

diff --git a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/util/RestUtil.java b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/util/RestUtil.java
index 9a23978..cc07db0 100644
--- a/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/util/RestUtil.java
+++ b/so-nssmf-adapter-application/src/main/java/org/onap/so/adapters/nssmf/util/RestUtil.java
@@ -20,7 +20,9 @@
 

 package org.onap.so.adapters.nssmf.util;

 

-import javax.net.ssl.*;

+import javax.net.ssl.SSLContext;

+import javax.net.ssl.TrustManager;

+import javax.net.ssl.X509TrustManager;

 import javax.ws.rs.core.UriBuilder;

 import java.net.SocketTimeoutException;

 import java.net.URI;

@@ -28,14 +30,22 @@ import org.apache.http.Header;
 import org.apache.http.HttpResponse;

 import org.apache.http.client.HttpClient;

 import org.apache.http.client.config.RequestConfig;

-import org.apache.http.client.methods.*;

+import org.apache.http.client.methods.HttpPatch;

+import org.apache.http.client.methods.HttpPost;

+import org.apache.http.client.methods.HttpPut;

+import org.apache.http.client.methods.HttpRequestBase;

+import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;

 import org.apache.http.conn.ConnectTimeoutException;

 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;

 import org.apache.http.entity.StringEntity;

 import org.apache.http.impl.client.HttpClients;

 import org.apache.http.message.BasicHeader;

 import org.apache.http.util.EntityUtils;

-import org.onap.aai.domain.yang.*;

+import org.onap.aai.domain.yang.EsrSystemInfo;

+import org.onap.aai.domain.yang.EsrSystemInfoList;

+import org.onap.aai.domain.yang.EsrThirdpartySdnc;

+import org.onap.aai.domain.yang.EsrThirdpartySdncList;

+import org.onap.aai.domain.yang.ServiceInstance;

 import org.onap.so.adapters.nssmf.exceptions.ApplicationException;

 import org.onap.so.adapters.nssmf.extclients.aai.AaiServiceProvider;

 import org.onap.so.adapters.nssmf.entity.TokenRequest;