Fix Sonar code smells

[aai/model-loader.git] / src / main / java / org / onap / aai / modelloader / entity / model / ModelArtifact.java

diff --git a/src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifact.java b/src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifact.java
index 896167a..6974625 100644 (file)
--- a/src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifact.java
+++ b/src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifact.java
@@ -1,22 +1,22 @@
 /**
- * ============LICENSE_START==========================================
+ * ============LICENSE_START=======================================================
  * org.onap.aai
- * ===================================================================
+ * ================================================================================
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 Amdocs
- * ===================================================================
+ * 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,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ============LICENSE_END============================================
+ * ============LICENSE_END=========================================================
  */
 package org.onap.aai.modelloader.entity.model;
 
@@ -35,14 +35,12 @@ import javax.xml.transform.stream.StreamResult;
 import org.onap.aai.modelloader.config.ModelLoaderConfig;
 import org.onap.aai.modelloader.entity.ArtifactType;
 import org.onap.aai.modelloader.restclient.AaiRestClient;
-import org.onap.aai.modelloader.service.ModelLoaderMsgs;
-import org.onap.aai.cl.api.Logger;
-import org.onap.aai.cl.eelf.LoggerFactory;
 import org.onap.aai.modelloader.entity.Artifact;
 import org.onap.aai.restclient.client.OperationResult;
 
 import org.w3c.dom.Node;
 
+
 public class ModelArtifact extends AbstractModelArtifact {
 
     private static final String AAI_MODEL_VER_SUB_URL = "/model-vers/model-ver";
@@ -50,7 +48,6 @@ public class ModelArtifact extends AbstractModelArtifact {
     private static final String FAILURE_MSG_PREFIX = "Ingestion failed for ";
     private static final String ROLLBACK_MSG_SUFFIX = ". Rolling back distribution.";
 
-    private static Logger logger = LoggerFactory.getInstance().getLogger(ModelArtifact.class.getName());
 
     private String modelVerId;
     private String modelInvariantId;
@@ -121,6 +118,15 @@ public class ModelArtifact extends AbstractModelArtifact {
 
     @Override
     public boolean push(AaiRestClient aaiClient, ModelLoaderConfig config, String distId,
+            List<Artifact> completedArtifacts) {        
+        if (config.useGizmo()) {
+            return pushToGizmo(aaiClient, config, distId);
+        }
+
+        return pushToResources(aaiClient, config, distId, completedArtifacts);
+    }
+    
+    private boolean pushToResources(AaiRestClient aaiClient, ModelLoaderConfig config, String distId,
             List<Artifact> completedArtifacts) {
         boolean success;
 
@@ -147,7 +153,7 @@ public class ModelArtifact extends AbstractModelArtifact {
         }
 
         return success;
-    }
+    }    
 
     /**
      * @param aaiClient
@@ -186,6 +192,12 @@ public class ModelArtifact extends AbstractModelArtifact {
 
     @Override
     public void rollbackModel(AaiRestClient aaiClient, ModelLoaderConfig config, String distId) {
+        // Gizmo is resilient and doesn't require a rollback.  A redistribution will work fine even if 
+        // the model is partially loaded.
+        if (config.useGizmo()) {
+            return;
+        }
+        
         String url = getModelVerUrl(config);
         if (firstVersionOfModel) {
             // If this was the first version of the model which was added, we want to remove the entire
@@ -197,21 +209,12 @@ public class ModelArtifact extends AbstractModelArtifact {
         aaiClient.getAndDeleteResource(url, distId);
     }
 
-
-    private void logInfoMsg(String infoMsg) {
-        logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, infoMsg);
-    }
-
-    private void logErrorMsg(String errorMsg) {
-        logger.error(ModelLoaderMsgs.DISTRIBUTION_EVENT_ERROR, errorMsg);
-    }
-
     private String getModelUrl(ModelLoaderConfig config) {
         String baseURL = config.getAaiBaseUrl().trim();
         String subURL = config.getAaiModelUrl(getModelNamespaceVersion()).trim();
         String instance = getModelInvariantId();
 
-        if ((!baseURL.endsWith("/")) && (!subURL.startsWith("/"))) {
+        if (!baseURL.endsWith("/") && !subURL.startsWith("/")) {
             baseURL = baseURL + "/";
         }
 
@@ -232,7 +235,7 @@ public class ModelArtifact extends AbstractModelArtifact {
                 + AAI_MODEL_VER_SUB_URL;
         String instance = getModelVerId();
 
-        if ((!baseURL.endsWith("/")) && (!subURL.startsWith("/"))) {
+        if (!baseURL.endsWith("/") && !subURL.startsWith("/")) {
             baseURL = baseURL + "/";
         }