X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Fentity%2Fcatalog%2FVnfCatalogArtifactHandler.java;h=9b05024258798598f1056abf1ddc9e53fbaf7345;hb=refs%2Fheads%2Fmaster;hp=c54d7b2df5f7b079624679e3b0fd3123f0a689e9;hpb=7e6fe8c29c5a5cfa5caf6ab47b30280e1fc20432;p=aai%2Fmodel-loader.git

diff --git a/src/main/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandler.java b/src/main/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandler.java
index c54d7b2..9b05024 100644
--- a/src/main/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandler.java
+++ b/src/main/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandler.java
@@ -30,8 +30,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.UUID;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import org.apache.commons.text.StringEscapeUtils;
@@ -41,9 +39,13 @@ import org.onap.aai.cl.eelf.LoggerFactory;
 import org.onap.aai.modelloader.config.ModelLoaderConfig;
 import org.onap.aai.modelloader.entity.Artifact;
 import org.onap.aai.modelloader.entity.ArtifactHandler;
+import org.onap.aai.modelloader.entity.vnf.VnfImages;
 import org.onap.aai.modelloader.restclient.AaiRestClient;
 import org.onap.aai.modelloader.service.ModelLoaderMsgs;
-import org.onap.aai.restclient.client.OperationResult;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -53,6 +55,7 @@ import org.xml.sax.InputSource;
 /**
  * VNF Catalog specific handling
  */
+@Component
 public class VnfCatalogArtifactHandler extends ArtifactHandler {
 
     private static Logger logger = LoggerFactory.getInstance().getLogger(VnfCatalogArtifactHandler.class.getName());
@@ -145,7 +148,7 @@ public class VnfCatalogArtifactHandler extends ArtifactHandler {
             String imageId = imageIdBuilder.toString();
             int resultCode = getVnfImage(restClient, distributionId, imageId, dataItem);
 
-            if (resultCode == Response.Status.NOT_FOUND.getStatusCode()) {
+            if (resultCode == HttpStatus.NOT_FOUND.value()) {
                 // This vnf-image is missing, so add it
                 boolean success = putVnfImage(restClient, dataItem, distributionId);
                 if (success) {
@@ -154,7 +157,7 @@ public class VnfCatalogArtifactHandler extends ArtifactHandler {
                 } else {
                     throw new VnfImageException(imageId);
                 }
-            } else if (resultCode == Response.Status.OK.getStatusCode()) {
+            } else if (resultCode == HttpStatus.OK.value()) {
                 logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, imageId + " already exists. Skipping ingestion.");
             } else {
                 // if other than 404 or 200, something went wrong
@@ -170,12 +173,12 @@ public class VnfCatalogArtifactHandler extends ArtifactHandler {
             for (Entry<String, String> entry : dataItem.entrySet()) {
                 b.addParameter(entry.getKey(), entry.getValue());
             }
-            OperationResult tryGet =
-                    restClient.getResource(b.build().toString(), distributionId, MediaType.APPLICATION_JSON_TYPE);
+            ResponseEntity<VnfImages> tryGet =
+                    restClient.getResource(b.build().toString(), distributionId, MediaType.APPLICATION_JSON, VnfImages.class);
             if (tryGet == null) {
                 throw new VnfImageException(imageId);
             }
-            return tryGet.getResultCode();
+            return tryGet.getStatusCodeValue();
         } catch (URISyntaxException ex) {
             throw new VnfImageException(ex);
         }
@@ -186,11 +189,12 @@ public class VnfCatalogArtifactHandler extends ArtifactHandler {
         String uuid = UUID.randomUUID().toString();
         dataItem.put(ATTR_UUID, uuid);
 
+        // TODO: Get rid of the dataItem map and replace it with the VnfImage object
         String payload = new Gson().toJson(dataItem);
         String putUrl = config.getAaiBaseUrl() + config.getAaiVnfImageUrl() + "/vnf-image/" + uuid;
-        OperationResult putResp =
-                restClient.putResource(putUrl, payload, distributionId, MediaType.APPLICATION_JSON_TYPE);
-        return putResp != null && putResp.getResultCode() == Response.Status.CREATED.getStatusCode();
+        ResponseEntity<String> putResp =
+                restClient.putResource(putUrl, payload, distributionId, MediaType.APPLICATION_JSON, String.class);
+        return putResp != null && putResp.getStatusCode() == HttpStatus.CREATED;
     }
 
     private List<Map<String, String>> unmarshallVnfcData(Artifact vnfcArtifact) {