X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Fservice%2FSdcConnectionJob.java;h=79cf5385aed952def4b7eae258b5cf9ac581f3ae;hb=refs%2Fheads%2Fmaster;hp=30c870941cd032eb0e4306779cde7d054f925b97;hpb=059f42e1a2289ecb2cb5835b8b14a0d098c9e1d3;p=aai%2Fmodel-loader.git

diff --git a/src/main/java/org/onap/aai/modelloader/service/SdcConnectionJob.java b/src/main/java/org/onap/aai/modelloader/service/SdcConnectionJob.java
index 30c8709..79cf538 100644
--- a/src/main/java/org/onap/aai/modelloader/service/SdcConnectionJob.java
+++ b/src/main/java/org/onap/aai/modelloader/service/SdcConnectionJob.java
@@ -2,15 +2,14 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
- * Copyright © 2017 Amdocs
- * All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 European Software Marketing Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *       http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -18,63 +17,58 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aai.modelloader.service;
 
-import java.util.Date;
 import java.util.Timer;
 import java.util.TimerTask;
-
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
 import org.onap.aai.modelloader.config.ModelLoaderConfig;
 import org.onap.aai.modelloader.notification.EventCallback;
-import org.openecomp.cl.api.Logger;
-import org.openecomp.cl.eelf.LoggerFactory;
-import org.openecomp.sdc.api.IDistributionClient;
-import org.openecomp.sdc.api.results.IDistributionClientResult;
-import org.openecomp.sdc.utils.DistributionActionResultEnum;
+import org.onap.sdc.api.IDistributionClient;
+import org.onap.sdc.api.results.IDistributionClientResult;
+import org.onap.sdc.utils.DistributionActionResultEnum;
 
 public class SdcConnectionJob extends TimerTask {
-  static Logger logger = LoggerFactory.getInstance().getLogger(SdcConnectionJob.class.getName());
-
-  private IDistributionClient client;
-  private ModelLoaderConfig config;
-  private EventCallback callback; 
-  private Timer timer;
+    private static final Logger logger = LoggerFactory.getInstance().getLogger(SdcConnectionJob.class.getName());
 
-  public SdcConnectionJob(IDistributionClient client, 
-      ModelLoaderConfig config, 
-      EventCallback callback, 
-      Timer timer) {
-    this.client = client;
-    this.timer = timer;
-    this.callback = callback;
-    this.config = config;
-  }
+    private final IDistributionClient client;
+    private final ModelLoaderConfig config;
+    private final EventCallback callback;
+    private final Timer timer;
 
-  @Override
-  public void run() {
-
-    IDistributionClientResult initResult = client.init(config, callback);
+    public SdcConnectionJob(IDistributionClient client, ModelLoaderConfig config, EventCallback callback, Timer timer) {
+        this.client = client;
+        this.timer = timer;
+        this.callback = callback;
+        this.config = config;
+    }
 
-    if (initResult.getDistributionActionResult() != DistributionActionResultEnum.SUCCESS) {
-      String errorMsg = "Failed to initialize distribution client: "
-          + initResult.getDistributionMessageResult();
-      logger.error(ModelLoaderMsgs.ASDC_CONNECTION_ERROR, errorMsg);
-      return;
+    @Override
+    public void run() {
+        if (!config.getASDCConnectionDisabled()) {
+            final IDistributionClientResult initResult = client.init(config, callback);
+            if (initResult.getDistributionActionResult() == DistributionActionResultEnum.SUCCESS) {
+                startClient();
+            } else {
+                logConnectionError("Failed to initialize", initResult);
+            }
+        }
     }
 
-    IDistributionClientResult startResult = client.start();
-    if (startResult.getDistributionActionResult() != DistributionActionResultEnum.SUCCESS) {
-      String errorMsg = "Failed to start distribution client: "
-          + startResult.getDistributionMessageResult();
-      logger.error(ModelLoaderMsgs.ASDC_CONNECTION_ERROR, errorMsg);
-      return;
+    private void startClient() {
+        final IDistributionClientResult startResult = client.start();
+        if (startResult.getDistributionActionResult() == DistributionActionResultEnum.SUCCESS) {
+            timer.cancel();
+            logger.info(ModelLoaderMsgs.INITIALIZING, "Connection to SDC established");
+        } else {
+            logConnectionError("Failed to start", startResult);
+        }
     }
 
-    // Success.  Cancel the timer job
-    timer.cancel();
-    logger.info(ModelLoaderMsgs.INITIALIZING, "Connection to SDC established");
-  }
+    private void logConnectionError(String msgPrefix, IDistributionClientResult result) {
+        final String errorMsg = msgPrefix + " distribution client: " + result.getDistributionMessageResult();
+        logger.error(ModelLoaderMsgs.ASDC_CONNECTION_ERROR, errorMsg);
+    }
 }