SDC Listner Docker touchup

[ccsdk/cds.git] / ms / sdclistener / application / src / main / java / org / onap / ccsdk / cds / sdclistener / client / SdcListenerClient.java

diff --git a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/client/CdsSdcListenerClient.java b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerClient.java
similarity index 73%
rename from ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/client/CdsSdcListenerClient.java
rename to ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerClient.java
index 8d6aca5..973f950 100644 (file)
--- a/ms/cds-sdc-listener/application/src/main/java/org/onap/ccsdk/cds/cdssdclistener/client/CdsSdcListenerClient.java
+++ b/ms/sdclistener/application/src/main/java/org/onap/ccsdk/cds/sdclistener/client/SdcListenerClient.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onap.ccsdk.cds.cdssdclistener.client;
+package org.onap.ccsdk.cds.sdclistener.client;
 
 import java.util.Optional;
-import org.onap.ccsdk.cds.cdssdclistener.CdsSdcListenerConfiguration;
-import org.onap.ccsdk.cds.cdssdclistener.dto.CdsSdcListenerDto;
-import org.onap.ccsdk.cds.cdssdclistener.CdsSdcListenerNotificationCallback;
-import org.onap.ccsdk.cds.cdssdclistener.exceptions.CdsSdcListenerException;
+import org.onap.ccsdk.cds.sdclistener.SdcListenerConfiguration;
+import org.onap.ccsdk.cds.sdclistener.dto.SdcListenerDto;
+import org.onap.ccsdk.cds.sdclistener.SdcListenerNotificationCallback;
+import org.onap.ccsdk.cds.sdclistener.exceptions.SdcListenerException;
 import org.onap.sdc.api.IDistributionClient;
 import org.onap.sdc.api.results.IDistributionClientResult;
 import org.onap.sdc.impl.DistributionClientFactory;
@@ -34,18 +34,18 @@ import org.springframework.stereotype.Component;
 
 @Component
 @ComponentScan("org.onap.ccsdk.cds.cdssdclistener.dto")
-public class CdsSdcListenerClient {
+public class SdcListenerClient {
 
-    private static Logger LOG = LoggerFactory.getLogger(CdsSdcListenerClient.class);
+    private static Logger LOG = LoggerFactory.getLogger(SdcListenerClient.class);
 
     @Autowired
-    private CdsSdcListenerConfiguration configuration;
+    private SdcListenerConfiguration configuration;
 
     @Autowired
-    private CdsSdcListenerNotificationCallback notification;
+    private SdcListenerNotificationCallback notification;
 
     @Autowired
-    private CdsSdcListenerDto listenerDto;
+    private SdcListenerDto listenerDto;
 
     private IDistributionClient distributionClient;
 
@@ -53,11 +53,11 @@ public class CdsSdcListenerClient {
      * This method initializes the SDC Distribution client.
      */
     @EventListener(ApplicationReadyEvent.class)
-    public void initSdcClient() throws CdsSdcListenerException {
+    public void initSdcClient() throws SdcListenerException {
         LOG.info("Initialize the SDC distribution client");
 
         distributionClient = Optional.of(DistributionClientFactory.createDistributionClient())
-            .orElseThrow(() -> new CdsSdcListenerException("Could not able to create SDC Distribution client"));
+            .orElseThrow(() -> new SdcListenerException("Could not able to create SDC Distribution client"));
 
         listenerDto.setManagedChannelForGrpc();
 
@@ -67,9 +67,9 @@ public class CdsSdcListenerClient {
         startSdcClientBasedOnTheResult(result);
     }
 
-    private void startSdcClientBasedOnTheResult(IDistributionClientResult result) throws CdsSdcListenerException {
+    private void startSdcClientBasedOnTheResult(IDistributionClientResult result) throws SdcListenerException {
         if (!result.getDistributionActionResult().equals(DistributionActionResultEnum.SUCCESS)) {
-            throw new CdsSdcListenerException(
+            throw new SdcListenerException(
                 "SDC distribution client init failed with reason:" + result.getDistributionMessageResult());
         }
 
@@ -79,16 +79,16 @@ public class CdsSdcListenerClient {
         result = this.distributionClient.start();
 
         if (!result.getDistributionActionResult().equals(DistributionActionResultEnum.SUCCESS)) {
-            throw new CdsSdcListenerException(
+            throw new SdcListenerException(
                 "Startup of the SDC distribution client failed with reason: " + result.getDistributionMessageResult());
         }
     }
 
-    private void closeSdcDistributionclient() throws CdsSdcListenerException {
+    private void closeSdcDistributionclient() throws SdcListenerException {
         LOG.info("Closing SDC distribution client");
         IDistributionClientResult status = this.distributionClient.stop();
         if (status.getDistributionActionResult().equals(DistributionActionResultEnum.SUCCESS)) {
-            throw new CdsSdcListenerException(
+            throw new SdcListenerException(
                 "Failed to close the SDC distribution client due to : " + status.getDistributionMessageResult());
         }
     }