diff options
Diffstat (limited to 'src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifact.java')
-rw-r--r-- | src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifact.java | 21 |
1 files changed, 10 insertions, 11 deletions
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..c21a285 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 @@ -23,9 +23,7 @@ package org.onap.aai.modelloader.entity.model; 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; @@ -41,7 +39,7 @@ 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<>(); @@ -83,24 +81,25 @@ 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()); + logErrorMsg( + "Ingest failed for " + getType().toString() + " " + getUniqueIdentifier() + ": " + e.getMessage()); return false; } return true; } - + protected void logInfoMsg(String infoMsg) { logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, infoMsg); } @@ -108,7 +107,7 @@ 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(); |