Merge "Sonar fix too many method param"

5 files changed, 459 insertions, 463 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/asdc/beans/Service.java b/vid-app-common/src/main/java/org/onap/vid/asdc/beans/Service.java
index c3d571825..ca151a731 100644
--- a/vid-app-common/src/main/java/org/onap/vid/asdc/beans/Service.java
+++ b/vid-app-common/src/main/java/org/onap/vid/asdc/beans/Service.java
@@ -22,347 +22,425 @@ package org.onap.vid.asdc.beans;
 
 import java.util.Collection;
 import java.util.UUID;
+
 /**
  * The Class Service.
  */
 public class Service {
 
-	/**
-	 * The Enum DistributionStatus.
-	 */
-	public enum DistributionStatus {
+    /**
+     * The Enum DistributionStatus.
+     */
+    public enum DistributionStatus {
+
+    /** The distribution not approved. */
+    DISTRIBUTION_NOT_APPROVED,
+
+    /** The distribution approved. */
+    DISTRIBUTION_APPROVED,
+
+    /** The distributed. */
+    DISTRIBUTED,
+
+    /** The distribution rejected. */
+    DISTRIBUTION_REJECTED,
+
+    /** The destributed for tenant isolation. */
+    DISTRIBUTION_COMPLETE_OK
+    }
+
+    /**
+     * The Enum LifecycleState.
+     */
+    public enum LifecycleState {
 
-		/** The distribution not approved. */
-		DISTRIBUTION_NOT_APPROVED,
+        /** The not certified checkout. */
+        NOT_CERTIFIED_CHECKOUT,
 
-		/** The distribution approved. */
-		DISTRIBUTION_APPROVED,
+        /** The not certified checkin. */
+        NOT_CERTIFIED_CHECKIN,
 
-		/** The distributed. */
-		DISTRIBUTED,
+        /** The ready for certification. */
+        READY_FOR_CERTIFICATION,
+
+        /** The certification in progress. */
+        CERTIFICATION_IN_PROGRESS,
 
-		/** The distribution rejected. */
-		DISTRIBUTION_REJECTED,
+        /** The certified. */
+        CERTIFIED
+    }
 
-		/** The destributed for tenant isolation. */
-		DISTRIBUTION_COMPLETE_OK
-	}
-
-	/**
-	 * The Enum LifecycleState.
-	 */
-	public enum LifecycleState {
-
-		/** The not certified checkout. */
-		NOT_CERTIFIED_CHECKOUT,
-
-		/** The not certified checkin. */
-		NOT_CERTIFIED_CHECKIN,
-
-		/** The ready for certification. */
-		READY_FOR_CERTIFICATION,
-
-		/** The certification in progress. */
-		CERTIFICATION_IN_PROGRESS,
-
-		/** The certified. */
-		CERTIFIED
-	}
-
-	/** The uuid. */
-	private String uuid;
-
-	/** The invariant UUID. */
-	private String invariantUUID;
-
-	/** The name. */
-	private String name;
-
-	/** The version. */
-	private String version;
-
-	/** The tosca model URL. */
-	private String toscaModelURL;
-
-	/** The category. */
-	private String category;
-
-	/** The lifecycle state. */
-	private Service.LifecycleState lifecycleState;
-
-	/** The last updater user uid. */
-	private String lastUpdaterUserId;
-
-	/** The last updater full name. */
-	private String lastUpdaterFullName;
-
-	/** The distribution status. */
-	private String distributionStatus;
-
-	/** The artifacts. */
-	private Collection<Artifact> artifacts;
-
-	/** The resources. */
-	private Collection<SubResource> resources;
-
-	/**
-	 * Gets the uuid.
-	 *
-	 * @return the uuid
-	 */
-	public String getUuid() {
-		return uuid;
-	}
-
-	/**
-	 * Gets the invariant UUID.
-	 *
-	 * @return the invariant UUID
-	 */
-	public String getInvariantUUID() {
-		return invariantUUID;
-	}
-
-	/**
-	 * Gets the name.
-	 *
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * Gets the version.
-	 *
-	 * @return the version
-	 */
-	public String getVersion() {
-		return version;
-	}
-
-	/**
-	 * Gets the tosca model URL.
-	 *
-	 * @return the tosca model URL
-	 */
-	public String getToscaModelURL() {
-		return toscaModelURL;
-	}
-
-	/**
-	 * Gets the category.
-	 *
-	 * @return the category
-	 */
-	public String getCategory() {
-		return category;
-	}
-
-	/**
-	 * Gets the lifecycle state.
-	 *
-	 * @return the lifecycle state
-	 */
-	public Service.LifecycleState getLifecycleState() {
-		return lifecycleState;
-	}
-
-	/**
-	 * Gets the last updater user uid.
-	 *
-	 * @return the last updater user uid
-	 */
-	public String getLastUpdaterUserId() {
-		return lastUpdaterUserId;
-	}
-
-	/**
-	 * Gets the last updater full name.
-	 *
-	 * @return the last updater full name
-	 */
-	public String getLastUpdaterFullName() {
-		return lastUpdaterFullName;
-	}
-
-	/**
-	 * Gets the distribution status.
-	 *
-	 * @return the distribution status
-	 */
-	public String getDistributionStatus() {
-		return distributionStatus;
-	}
-
-	/**
-	 * Gets the artifacts.
-	 *
-	 * @return the artifacts
-	 */
-	public Collection<Artifact> getArtifacts() {
-		return artifacts;
-	}
-
-	/**
-	 * Gets the resources.
-	 *
-	 * @return the resources
-	 */
-	public Collection<SubResource> getResources() {
-		return resources;
-	}
-
-	/**
-	 * Sets the uuid.
-	 *
-	 * @param uuid the new uuid
-	 */
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
-	/**
-	 * Sets the invariant UUID.
-	 *
-	 * @param invariantUUID the new invariant UUID
-	 */
-	public void setInvariantUUID(String invariantUUID) {
-		this.invariantUUID = invariantUUID;
-	}
-
-	/**
-	 * Sets the name.
-	 *
-	 * @param name the new name
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * Sets the version.
-	 *
-	 * @param version the new version
-	 */
-	public void setVersion(String version) {
-		this.version = version;
-	}
-
-	/**
-	 * Sets the tosca model URL.
-	 *
-	 * @param toscaModelURL the new tosca model URL
-	 */
-	public void setToscaModelURL(String toscaModelURL) {
-		this.toscaModelURL = toscaModelURL;
-	}
-
-	/**
-	 * Sets the category.
-	 *
-	 * @param category the new category
-	 */
-	public void setCategory(String category) {
-		this.category = category;
-	}
-
-	/**
-	 * Sets the lifecycle state.
-	 *
-	 * @param lifecycleState the new lifecycle state
-	 */
-	public void setLifecycleState(Service.LifecycleState lifecycleState) {
-		this.lifecycleState = lifecycleState;
-	}
-
-	/**
-	 * Sets the last updater user uid.
-	 *
-	 * @param lastUpdaterUserId the new last updater user uid
-	 */
-	public void set(String lastUpdaterUserId) {
-		this.lastUpdaterUserId = lastUpdaterUserId;
-	}
-
-	/**
-	 * Sets the last updater full name.
-	 *
-	 * @param lastUpdaterFullName the new last updater full name
-	 */
-	public void setLastUpdaterFullName(String lastUpdaterFullName) {
-		this.lastUpdaterFullName = lastUpdaterFullName;
-	}
-
-	/**
-	 * Sets the distribution status.
-	 *
-	 * @param distributionStatus the new distribution status
-	 */
-	public void setDistributionStatus(String distributionStatus) {
-		this.distributionStatus = distributionStatus;
-	}
-
-	/**
-	 * Sets the artifacts.
-	 *
-	 * @param artifacts the new artifacts
-	 */
-	public void setArtifacts(Collection<Artifact> artifacts) {
-		this.artifacts = artifacts;
-	}
-
-	/**
-	 * Sets the resources.
-	 *
-	 * @param resources the new resources
-	 */
-	public void setResources(Collection<SubResource> resources) {
-		this.resources = resources;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return uuid;
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return UUID.fromString(getUuid()).hashCode();
-	}
-
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object o) {
-		if (o == this) return true;
-		if (!(o instanceof Service)) return false;
-
-		final Service service = (Service) o;
-
-		return (service.getUuid().equals(getUuid()));
-	}
-
-	public Service(String uuid, String invariantUUID, String category, String version, String name, String distributionStatus, String toscaModelURL, LifecycleState lifecycleState, Collection<Artifact> artifacts, Collection<SubResource> resources) {
-		this.uuid = uuid;
-		this.invariantUUID = invariantUUID;
-		this.name = name;
-		this.version = version;
-		this.toscaModelURL = toscaModelURL;
-		this.category = category;
-		this.lifecycleState = lifecycleState;
-		this.distributionStatus = distributionStatus;
-		this.artifacts = artifacts;
-		this.resources = resources;
-	}
-
-	public Service() {
-	}
+    /** The uuid. */
+    private String uuid;
+
+    /** The invariant UUID. */
+    private String invariantUUID;
+
+    /** The name. */
+    private String name;
+
+    /** The version. */
+    private String version;
+
+    /** The tosca model URL. */
+    private String toscaModelURL;
+
+    /** The category. */
+    private String category;
+
+    /** The lifecycle state. */
+    private Service.LifecycleState lifecycleState;
+
+    /** The last updater user uid. */
+    private String lastUpdaterUserId;
+
+    /** The last updater full name. */
+    private String lastUpdaterFullName;
+
+    /** The distribution status. */
+    private String distributionStatus;
+
+    /** The artifacts. */
+    private Collection<Artifact> artifacts;
+
+    /** The resources. */
+    private Collection<SubResource> resources;
+    
+    
+    public static class ServiceBuilder {
+       private String uuid;
+       private String invariantUUID;
+       private String name;
+       private String version;
+       private String toscaModelURL;
+       private String category;
+       private Service.LifecycleState lifecycleState;
+       private String distributionStatus;
+       private Collection<Artifact> artifacts;
+       private Collection<SubResource> resources;
+
+        public ServiceBuilder setUuid(String uuid) {
+            this.uuid = uuid;
+            return this;
+        }
+
+        public ServiceBuilder setInvariantUUID(String invariantUUID) {
+            this.invariantUUID = invariantUUID;
+            return this;
+        }
+
+        public ServiceBuilder setName(String name) {
+            this.name = name;
+            return this;
+        }
+
+        public ServiceBuilder setVersion(String version) {
+            this.version = version;
+            return this;
+        }
+
+        public ServiceBuilder setToscaModelURL(String toscaModelURL) {
+            this.toscaModelURL = toscaModelURL;
+            return this;
+        }
+
+        public ServiceBuilder setCategory(String category) {
+            this.category = category;
+            return this;
+        }
+
+        public ServiceBuilder setLifecycleState(Service.LifecycleState lifecycleState) {
+            this.lifecycleState = lifecycleState;
+            return this;
+        }
+
+        public ServiceBuilder setDistributionStatus(String distributionStatus) {
+            this.distributionStatus = distributionStatus;
+            return this;
+        }
+
+        public ServiceBuilder setArtifacts(Collection<Artifact> artifacts) {
+            this.artifacts = artifacts;
+            return this;
+        }
+
+        public ServiceBuilder setResources(Collection<SubResource> resources) {
+            this.resources = resources;
+            return this;
+        }
+
+        public Service build() {
+            return new Service(this);
+        }
+    }
+    
+
+    /**
+     * Gets the uuid.
+     *
+     * @return the uuid
+     */
+    public String getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Gets the invariant UUID.
+     *
+     * @return the invariant UUID
+     */
+    public String getInvariantUUID() {
+        return invariantUUID;
+    }
+
+    /**
+     * Gets the name.
+     *
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Gets the version.
+     *
+     * @return the version
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * Gets the tosca model URL.
+     *
+     * @return the tosca model URL
+     */
+    public String getToscaModelURL() {
+        return toscaModelURL;
+    }
+
+    /**
+     * Gets the category.
+     *
+     * @return the category
+     */
+    public String getCategory() {
+        return category;
+    }
+
+    /**
+     * Gets the lifecycle state.
+     *
+     * @return the lifecycle state
+     */
+    public Service.LifecycleState getLifecycleState() {
+        return lifecycleState;
+    }
+
+    /**
+     * Gets the last updater user uid.
+     *
+     * @return the last updater user uid
+     */
+    public String getLastUpdaterUserId() {
+        return lastUpdaterUserId;
+    }
+
+    /**
+     * Gets the last updater full name.
+     *
+     * @return the last updater full name
+     */
+    public String getLastUpdaterFullName() {
+        return lastUpdaterFullName;
+    }
+
+    /**
+     * Gets the distribution status.
+     *
+     * @return the distribution status
+     */
+    public String getDistributionStatus() {
+        return distributionStatus;
+    }
+
+    /**
+     * Gets the artifacts.
+     *
+     * @return the artifacts
+     */
+    public Collection<Artifact> getArtifacts() {
+        return artifacts;
+    }
+
+    /**
+     * Gets the resources.
+     *
+     * @return the resources
+     */
+    public Collection<SubResource> getResources() {
+        return resources;
+    }
+
+    /**
+     * Sets the uuid.
+     *
+     * @param uuid the new uuid
+     */
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    /**
+     * Sets the invariant UUID.
+     *
+     * @param invariantUUID the new invariant UUID
+     */
+    public void setInvariantUUID(String invariantUUID) {
+        this.invariantUUID = invariantUUID;
+    }
+
+    /**
+     * Sets the name.
+     *
+     * @param name the new name
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * Sets the version.
+     *
+     * @param version the new version
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * Sets the tosca model URL.
+     *
+     * @param toscaModelURL the new tosca model URL
+     */
+    public void setToscaModelURL(String toscaModelURL) {
+        this.toscaModelURL = toscaModelURL;
+    }
+
+    /**
+     * Sets the category.
+     *
+     * @param category the new category
+     */
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    /**
+     * Sets the lifecycle state.
+     *
+     * @param lifecycleState the new lifecycle state
+     */
+    public void setLifecycleState(Service.LifecycleState lifecycleState) {
+        this.lifecycleState = lifecycleState;
+    }
+
+    /**
+     * Sets the last updater user uid.
+     *
+     * @param lastUpdaterUserId the new last updater user uid
+     */
+    public void set(String lastUpdaterUserId) {
+        this.lastUpdaterUserId = lastUpdaterUserId;
+    }
+
+    /**
+     * Sets the last updater full name.
+     *
+     * @param lastUpdaterFullName the new last updater full name
+     */
+    public void setLastUpdaterFullName(String lastUpdaterFullName) {
+        this.lastUpdaterFullName = lastUpdaterFullName;
+    }
+
+    /**
+     * Sets the distribution status.
+     *
+     * @param distributionStatus the new distribution status
+     */
+    public void setDistributionStatus(String distributionStatus) {
+        this.distributionStatus = distributionStatus;
+    }
+
+    /**
+     * Sets the artifacts.
+     *
+     * @param artifacts the new artifacts
+     */
+    public void setArtifacts(Collection<Artifact> artifacts) {
+        this.artifacts = artifacts;
+    }
+
+    /**
+     * Sets the resources.
+     *
+     * @param resources the new resources
+     */
+    public void setResources(Collection<SubResource> resources) {
+        this.resources = resources;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        return uuid;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return UUID.fromString(getUuid()).hashCode();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object o) {
+        if (o == this)
+            return true;
+        if (!(o instanceof Service))
+            return false;
+
+        final Service service = (Service) o;
+
+        return (service.getUuid().equals(getUuid()));
+    }
+
+    public Service() {}
+
+    public Service(ServiceBuilder serviceBuilder) {
+
+        this.uuid = serviceBuilder.uuid;
+        this.invariantUUID = serviceBuilder.invariantUUID;
+        this.name = serviceBuilder.name;
+        this.version = serviceBuilder.version;
+        this.toscaModelURL = serviceBuilder.toscaModelURL;
+        this.category = serviceBuilder.category;
+        this.lifecycleState = serviceBuilder.lifecycleState;
+        this.distributionStatus = serviceBuilder.distributionStatus;
+        this.artifacts = serviceBuilder.artifacts;
+        this.resources = serviceBuilder.resources;
+    }
 }
diff --git a/vid-app-common/src/main/java/org/onap/vid/asdc/beans/ServiceBuilder.java b/vid-app-common/src/main/java/org/onap/vid/asdc/beans/ServiceBuilder.java
deleted file mode 100644
index d2b7ffb84..000000000
--- a/vid-app-common/src/main/java/org/onap/vid/asdc/beans/ServiceBuilder.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * 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
- * 
- * 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=========================================================
- */
-
-package org.onap.vid.asdc.beans;
-
-import java.util.Collection;
-
-public class ServiceBuilder {
-    private String uuid;
-    private String invariantUUID;
-    private String name;
-    private String version;
-    private String toscaModelURL;
-    private String category;
-    private Service.LifecycleState lifecycleState;
-    private String distributionStatus;
-    private Collection<Artifact> artifacts;
-    private Collection<SubResource> resources;
-
-    public ServiceBuilder setUuid(String uuid) {
-        this.uuid = uuid;
-        return this;
-    }
-
-    public ServiceBuilder setInvariantUUID(String invariantUUID) {
-        this.invariantUUID = invariantUUID;
-        return this;
-    }
-
-    public ServiceBuilder setName(String name) {
-        this.name = name;
-        return this;
-    }
-
-    public ServiceBuilder setVersion(String version) {
-        this.version = version;
-        return this;
-    }
-
-    public ServiceBuilder setToscaModelURL(String toscaModelURL) {
-        this.toscaModelURL = toscaModelURL;
-        return this;
-    }
-
-    public ServiceBuilder setCategory(String category) {
-        this.category = category;
-        return this;
-    }
-
-    public ServiceBuilder setLifecycleState(Service.LifecycleState lifecycleState) {
-        this.lifecycleState = lifecycleState;
-        return this;
-    }
-
-    public ServiceBuilder setDistributionStatus(String distributionStatus) {
-        this.distributionStatus = distributionStatus;
-        return this;
-    }
-
-    public ServiceBuilder setArtifacts(Collection<Artifact> artifacts) {
-        this.artifacts = artifacts;
-        return this;
-    }
-
-    public ServiceBuilder setResources(Collection<SubResource> resources) {
-        this.resources = resources;
-        return this;
-    }
-
-    public Service build() {
-        return new Service(uuid, invariantUUID, category, version, name, distributionStatus, toscaModelURL, lifecycleState, artifacts, resources);
-    }
-}
-
-
diff --git a/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java
index 83757f2fb..83832bfd0 100644
--- a/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java
@@ -96,13 +96,18 @@ public class AaiServiceImpl implements AaiService {
             }
 
             for (ModelVer modelVer: model.getModelVers().getModelVer()) {
-                Service service = new Service(
-                        modelVer.getModelVersionId(),
-                        model.getModelInvariantId(),
-                        category, modelVer.getModelVersion(), modelVer.getModelName(),
-                        modelVer.getDistributionStatus(),
-                        null, null, null, null
-                );
+                Service service = new Service.ServiceBuilder().setUuid(modelVer.getModelVersionId())
+                        .setInvariantUUID(model.getModelInvariantId())
+                        .setCategory(category)
+                        .setVersion(modelVer.getModelVersion())
+                        .setName( modelVer.getModelName())
+                        .setDistributionStatus(modelVer.getDistributionStatus())
+                        .setToscaModelURL(null)
+                        .setLifecycleState(null)
+                        .setArtifacts(null)
+                        .setResources(null).build();
+
+
 
                 services.add(service);
             }
diff --git a/vid-app-common/src/test/java/org/onap/vid/asdc/rest/SdcRestClientITTest.java b/vid-app-common/src/test/java/org/onap/vid/asdc/rest/SdcRestClientITTest.java
index 12a327af8..126f30067 100644
--- a/vid-app-common/src/test/java/org/onap/vid/asdc/rest/SdcRestClientITTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/asdc/rest/SdcRestClientITTest.java
@@ -20,8 +20,25 @@
 
 package org.onap.vid.asdc.rest;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.xebialabs.restito.semantics.Call;
+import static com.xebialabs.restito.semantics.Action.ok;
+import static com.xebialabs.restito.semantics.Action.stringContent;
+import static org.apache.http.client.config.RequestConfig.custom;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItems;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.matchesPattern;
+import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
+import static org.junit.Assert.assertTrue;
+import static org.onap.vid.client.SyncRestClientInterface.HEADERS.X_ECOMP_INSTANCE_ID;
+import static org.onap.vid.utils.Logging.REQUEST_ID_HEADER_KEY;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.GeneralSecurityException;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.UUID;
+import javax.net.ssl.SSLContext;
 import org.apache.http.config.Registry;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
@@ -38,27 +55,8 @@ import org.onap.vid.asdc.AsdcCatalogException;
 import org.onap.vid.asdc.beans.Service;
 import org.onap.vid.client.SyncRestClient;
 import org.onap.vid.testUtils.StubServerUtil;
-
-import javax.net.ssl.SSLContext;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.security.GeneralSecurityException;
-import java.util.Collections;
-import java.util.Optional;
-import java.util.UUID;
-
-import static com.xebialabs.restito.semantics.Action.ok;
-import static com.xebialabs.restito.semantics.Action.stringContent;
-import static org.apache.http.client.config.RequestConfig.custom;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItems;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.matchesPattern;
-import static org.hamcrest.collection.IsIterableContainingInOrder.contains;
-import static org.junit.Assert.assertTrue;
-import static org.onap.vid.client.SyncRestClientInterface.HEADERS.X_ECOMP_INSTANCE_ID;
-import static org.onap.vid.utils.Logging.REQUEST_ID_HEADER_KEY;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.xebialabs.restito.semantics.Call;
 
 
 public class SdcRestClientITTest {
@@ -124,15 +122,23 @@ public class SdcRestClientITTest {
 
         assertTrue(first.isPresent());
 
-        assertThat(first.get().getHeaders().keySet(), hasItems(X_ECOMP_INSTANCE_ID.toLowerCase(), REQUEST_ID_HEADER_KEY.toLowerCase()));
-        assertThat(first.get().getHeaders().get(REQUEST_ID_HEADER_KEY.toLowerCase()).get(0), matchesPattern(UUID_REGEX));
+        assertThat(first.get().getHeaders().keySet(),
+                hasItems(X_ECOMP_INSTANCE_ID.toLowerCase(), REQUEST_ID_HEADER_KEY.toLowerCase()));
+        assertThat(first.get().getHeaders().get(REQUEST_ID_HEADER_KEY.toLowerCase()).get(0),
+                matchesPattern(UUID_REGEX));
     }
 
     private Service getExpectedService(String stringId) {
-        return new Service(stringId, stringId,
-                "sampleCategory", "sampleVersion",
-                "sampleName", "sampleDistStatus",
-                "sampleToscaUrl", Service.LifecycleState.CERTIFIED, Collections.emptyList(), Collections.emptyList());
+        return new Service.ServiceBuilder().setUuid(stringId)
+                .setInvariantUUID(stringId)
+                .setCategory("sampleCategory")
+                .setVersion("sampleVersion")
+                .setName( "sampleName")
+                .setDistributionStatus("sampleDistStatus")
+                .setToscaModelURL("sampleToscaUrl")
+                .setLifecycleState(Service.LifecycleState.CERTIFIED)
+                .setArtifacts(Collections.emptyList())
+                .setResources(Collections.emptyList()).build();
     }
 
 
diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/VidControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/VidControllerTest.java
index 2c6963147..39d3cddc7 100644
--- a/vid-app-common/src/test/java/org/onap/vid/controller/VidControllerTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/controller/VidControllerTest.java
@@ -35,7 +35,6 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.vid.asdc.AsdcCatalogException;
 import org.onap.vid.asdc.beans.SecureServices;
 import org.onap.vid.asdc.beans.Service;
-import org.onap.vid.asdc.beans.ServiceBuilder;
 import org.onap.vid.model.*;
 import org.onap.vid.model.PombaInstance.PombaRequest;
 import org.onap.vid.model.PombaInstance.ServiceInstance;
@@ -171,7 +170,7 @@ public class VidControllerTest {
     }
 
     private Service createService(String uuid, int i) {
-        return new ServiceBuilder().setUuid(uuid).setInvariantUUID("invariantUUID" + i)
+        return new Service.ServiceBuilder().setUuid(uuid).setInvariantUUID("invariantUUID" + i)
             .setCategory("category" + i).setVersion("version" + i).setName("name" + i)
             .setDistributionStatus("distStatus" + i).setToscaModelURL("toscaModelUrl" + i).build();
     }