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;fp=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Fentity%2Fmodel%2FAbstractModelArtifact.java;h=eebead31743dd85a5daa5679b807e6537cd247d5;hb=93a7defb8a10ac29f97d3cfd860ca12a629bdc41;hp=7d5cafb2eb5a16b4caff67b7946af1d5bd566b81;hpb=8204d232f8cc37e28561ee18b60806c7b3f5f783;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 7d5cafb..eebead3 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 @@ -25,7 +25,6 @@ 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; @@ -34,8 +33,9 @@ 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.modelloader.util.GizmoTranslator; -import org.onap.aai.restclient.client.OperationResult; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; public abstract class AbstractModelArtifact extends Artifact implements IModelArtifact { @@ -85,10 +85,11 @@ public abstract class AbstractModelArtifact extends Artifact implements IModelAr 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); + // TODO: Use correct responseType here + ResponseEntity postResponse = aaiClient.postResource(config.getAaiBaseUrl().trim(), gizmoPayload, distId, + MediaType.APPLICATION_JSON, String.class); - if (postResponse.getResultCode() != HttpStatus.OK.value()) { + if (postResponse.getStatusCode() != HttpStatus.OK) { return false; } } catch (IOException e) {