X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Fentity%2Fmodel%2FAbstractModelArtifact.java;h=7d5cafb2eb5a16b4caff67b7946af1d5bd566b81;hb=b984f4c39231a32dd53d02e60741c7d32822aad0;hp=f310ae3e14c52d99fbb8479840536b007f8ff583;hpb=270656abb1ed24930b2f9e57f5bef659494f5e8e;p=aai%2Fmodel-loader.git

diff --git a/src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifact.java b/src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifact.java
index f310ae3..7d5cafb 100644
--- a/src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifact.java
+++ b/src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifact.java
@@ -2,8 +2,8 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017-2018 European Software Marketing Ltd.
+ * Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (c) 2017-2019 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.
@@ -18,14 +18,14 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.aai.modelloader.entity.model;
 
+import java.io.IOException;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import javax.ws.rs.core.MediaType;
-
 import org.onap.aai.cl.api.Logger;
 import org.onap.aai.cl.eelf.LoggerFactory;
 import org.onap.aai.modelloader.config.ModelLoaderConfig;
@@ -37,16 +37,15 @@ import org.onap.aai.modelloader.util.GizmoTranslator;
 import org.onap.aai.restclient.client.OperationResult;
 import org.springframework.http.HttpStatus;
 
-
 public abstract class AbstractModelArtifact extends Artifact implements IModelArtifact {
 
     private static Logger logger = LoggerFactory.getInstance().getLogger(AbstractModelArtifact.class.getName());
-    
+
     private String modelNamespace;
     private String modelNamespaceVersion;
     private Set<String> referencedModelIds = new HashSet<>();
 
-    public AbstractModelArtifact(ArtifactType type) {
+    protected AbstractModelArtifact(ArtifactType type) {
         super(type);
     }
 
@@ -67,7 +66,7 @@ public abstract class AbstractModelArtifact extends Artifact implements IModelAr
     public void setModelNamespace(String modelNamespace) {
         this.modelNamespace = modelNamespace;
 
-        // Get the version from the namespace (in format 'http://org.openecomp.aai.inventory/v9')
+        // Get the version from the namespace (in format 'http://org.onap.aai.inventory/v14')
         String[] parts = modelNamespace.split("/");
         modelNamespaceVersion = parts[parts.length - 1].trim();
     }
@@ -83,24 +82,23 @@ public abstract class AbstractModelArtifact extends Artifact implements IModelAr
 
     public abstract void rollbackModel(AaiRestClient aaiClient, ModelLoaderConfig config, String distId);
 
-    protected boolean pushToGizmo(AaiRestClient aaiClient, ModelLoaderConfig config, String distId, List<Artifact> completedArtifacts) { 
+    protected boolean pushToGizmo(AaiRestClient aaiClient, ModelLoaderConfig config, String distId) {
         try {
             String gizmoPayload = GizmoTranslator.translate(getPayload());
-            OperationResult postResponse =
-                    aaiClient.postResource(config.getAaiBaseUrl().trim(), gizmoPayload, distId, MediaType.APPLICATION_JSON_TYPE);
-            
+            OperationResult postResponse = aaiClient.postResource(config.getAaiBaseUrl().trim(), gizmoPayload, distId,
+                    MediaType.APPLICATION_JSON_TYPE);
+
             if (postResponse.getResultCode() != HttpStatus.OK.value()) {
                 return false;
             }
-            
-        } catch (Exception e) {
-            logErrorMsg("Ingest failed for " + getType().toString() + " " + getUniqueIdentifier() + ": " + e.getMessage());
+        } catch (IOException e) {
+            logErrorMsg("Ingest failed for " + getType() + " " + getUniqueIdentifier() + ": " + e.getMessage());
             return false;
         }
 
         return true;
     }
-    
+
     protected void logInfoMsg(String infoMsg) {
         logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, infoMsg);
     }
@@ -108,15 +106,16 @@ public abstract class AbstractModelArtifact extends Artifact implements IModelAr
     protected void logErrorMsg(String errorMsg) {
         logger.error(ModelLoaderMsgs.DISTRIBUTION_EVENT_ERROR, errorMsg);
     }
-    
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("\nType=" + getType().toString() + "\nId=" + getUniqueIdentifier() + "\nVersion="
-                + getModelNamespaceVersion() + "\nDependant models: ");
-        for (String dep : referencedModelIds) {
-            sb.append(dep + "  ");
-        }
+        sb.append("\n").append("Type=").append(getType()) //
+                .append("\n").append("Id=").append(getUniqueIdentifier()) //
+                .append("\n").append("Version=").append(getModelNamespaceVersion());
+
+        sb.append("\n").append("Dependant models: ");
+        referencedModelIds.forEach(dep -> sb.append(dep).append("  "));
 
         return sb.toString();
     }