From d39d85bd6fc7ad50747c910758815f8600bab444 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Wed, 18 Sep 2019 12:23:42 -0400 Subject: Optimizing Imports and Formatting code No Business logic change, no code change.. just optimizing imports and reformatting code Issue-ID: CCSDK-1744 Signed-off-by: Singal, Kapil (ks220y) Change-Id: I1fb2ed10525a6f392f3c0d963c2ed03cfe8dec7e --- .../client/SdcListenerAuthClientInterceptor.java | 8 +------- .../onap/ccsdk/cds/sdclistener/util/FileUtil.java | 10 +++++---- .../application/src/main/resources/logback.xml | 24 +++++++++++----------- .../cds/sdclistener/SdcListenerClientTest.java | 7 +------ .../service/ListenerServiceImplTest.java | 18 ++++++++-------- 5 files changed, 30 insertions(+), 37 deletions(-) (limited to 'ms/sdclistener/application/src') diff --git a/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerAuthClientInterceptor.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerAuthClientInterceptor.java index 5866a63e0..b981b806c 100644 --- a/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerAuthClientInterceptor.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerAuthClientInterceptor.java @@ -15,14 +15,8 @@ */ package org.onap.ccsdk.cds.sdclistener.client; -import io.grpc.CallOptions; -import io.grpc.Channel; -import io.grpc.ClientCall; -import io.grpc.ClientInterceptor; -import io.grpc.ForwardingClientCall; -import io.grpc.Metadata; +import io.grpc.*; import io.grpc.Metadata.Key; -import io.grpc.MethodDescriptor; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/util/FileUtil.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/util/FileUtil.java index b6d0e4809..42b795634 100644 --- a/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/util/FileUtil.java +++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/util/FileUtil.java @@ -15,7 +15,10 @@ */ package org.onap.ccsdk.cds.sdclistener.util; -import static java.nio.file.Files.walk; +import org.apache.commons.io.FileUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -24,9 +27,8 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.apache.commons.io.FileUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import static java.nio.file.Files.walk; public final class FileUtil { private static final Logger LOGGER = LoggerFactory.getLogger(FileUtils.class); diff --git a/ms/sdclistener/application/src/main/resources/logback.xml b/ms/sdclistener/application/src/main/resources/logback.xml index b26cbcbe4..62465fde9 100644 --- a/ms/sdclistener/application/src/main/resources/logback.xml +++ b/ms/sdclistener/application/src/main/resources/logback.xml @@ -16,18 +16,18 @@ limitations under the License. --> - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + + - - - + + + + + + + - - - - diff --git a/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerClientTest.java b/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerClientTest.java index c9f2c5a39..1e6d7cbae 100644 --- a/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerClientTest.java +++ b/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/SdcListenerClientTest.java @@ -15,12 +15,7 @@ */ package org.onap.ccsdk.cds.sdclistener; -import mockit.Expectations; -import mockit.Injectable; -import mockit.Mock; -import mockit.MockUp; -import mockit.Tested; -import mockit.VerificationsInOrder; +import mockit.*; import mockit.integration.junit4.JMockit; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/service/ListenerServiceImplTest.java b/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/service/ListenerServiceImplTest.java index aa8f8e4e8..25b5098ab 100644 --- a/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/service/ListenerServiceImplTest.java +++ b/ms/sdclistener/application/src/test/java/org/onap/ccsdk/cds/sdclistener/service/ListenerServiceImplTest.java @@ -15,14 +15,6 @@ */ package org.onap.ccsdk.cds.sdclistener.service; -import static junit.framework.TestCase.assertTrue; -import static org.onap.ccsdk.cds.sdclistener.status.SdcListenerStatus.NotificationType.SDC_LISTENER_COMPONENT; -import static org.onap.sdc.utils.DistributionStatusEnum.COMPONENT_DONE_OK; -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; import org.apache.commons.io.FileUtils; import org.junit.Before; import org.junit.Rule; @@ -46,6 +38,16 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.context.junit4.SpringRunner; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +import static junit.framework.TestCase.assertTrue; +import static org.onap.ccsdk.cds.sdclistener.status.SdcListenerStatus.NotificationType.SDC_LISTENER_COMPONENT; +import static org.onap.sdc.utils.DistributionStatusEnum.COMPONENT_DONE_OK; + @RunWith(SpringRunner.class) @EnableConfigurationProperties({SdcListenerAuthClientInterceptor.class, BluePrintProcesssorHandler.class, SdcListenerDto.class, ListenerServiceImpl.class, SdcListenerStatus.class, -- cgit 1.2.3-korg