X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Fentity%2Fmodel%2FAbstractModelArtifact.java;h=35c672a55f84bb754326887d3a680a2e5dd6edc3;hb=6e4f04afea4c2d07fdd9c15eda38438c7baeb308;hp=889db552fccc6e77940110f9f811e10248eea95b;hpb=4dd316529148d07059d844197cdb676806bdc0c6;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 889db55..35c672a 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
@@ -1,83 +1,86 @@
 /**
- * ============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;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import org.onap.aai.modelloader.config.ModelLoaderConfig;
 import org.onap.aai.modelloader.entity.Artifact;
 import org.onap.aai.modelloader.entity.ArtifactType;
 import org.onap.aai.modelloader.restclient.AaiRestClient;
 
-public abstract class AbstractModelArtifact extends Artifact {
-		 
-  private String modelNamespace;
-  private String modelNamespaceVersion;
-	private Set<String> referencedModelIds = new HashSet<>(); 
-
-	public AbstractModelArtifact(ArtifactType type) {
-	  super(type);
-	}
-	
-	public Set<String> getDependentModelIds() {
-		return referencedModelIds;
-	}
-	
-	public void addDependentModelId(String dependentModelId) {
-		this.referencedModelIds.add(dependentModelId);
-	}
-	
-  public String getModelNamespace() {
-    return modelNamespace;
-  }
-  
-  public void setModelNamespace(String modelNamespace) {
-    this.modelNamespace = modelNamespace;
-    
-    // Get the version from the namespace (in format 'http://org.openecomp.aai.inventory/v9')
-    String[] parts = modelNamespace.split("/");
-    modelNamespaceVersion = parts[parts.length-1].trim();
-  }
-  
-  public String getModelNamespaceVersion() {
-    return modelNamespaceVersion;
-  }
-  
-  public abstract String getUniqueIdentifier();
-  
-  public abstract boolean push(AaiRestClient aaiClient, ModelLoaderConfig config, String distId, List<AbstractModelArtifact> addedModels);
-  
-  public abstract void rollbackModel(AaiRestClient aaiClient, ModelLoaderConfig config, String distId);
+public abstract class AbstractModelArtifact extends Artifact implements IModelArtifact {
+
+    private String modelNamespace;
+    private String modelNamespaceVersion;
+    private Set<String> referencedModelIds = new HashSet<>();
+
+    public AbstractModelArtifact(ArtifactType type) {
+        super(type);
+    }
+
+    public Set<String> getDependentModelIds() {
+        return referencedModelIds;
+    }
+
     @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 + "  ");
-		}
-		
-		return sb.toString();
-	}
-	
-	
+    public void addDependentModelId(String dependentModelId) {
+        this.referencedModelIds.add(dependentModelId);
+    }
+
+    public String getModelNamespace() {
+        return modelNamespace;
+    }
+
+    @Override
+    public void setModelNamespace(String modelNamespace) {
+        this.modelNamespace = modelNamespace;
+
+        // Get the version from the namespace (in format 'http://org.openecomp.aai.inventory/v9')
+        String[] parts = modelNamespace.split("/");
+        modelNamespaceVersion = parts[parts.length - 1].trim();
+    }
+
+    public String getModelNamespaceVersion() {
+        return modelNamespaceVersion;
+    }
+
+    public abstract String getUniqueIdentifier();
+
+    public abstract boolean push(AaiRestClient aaiClient, ModelLoaderConfig config, String distId,
+            List<Artifact> completedArtifacts);
+
+    public abstract void rollbackModel(AaiRestClient aaiClient, ModelLoaderConfig config, String distId);
+
+    @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 + "  ");
+        }
+
+        return sb.toString();
+    }
+
 }