AT&T 1712 and 1802 release code

This is code from AT&T's 1712 and 1802 releases.

Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04
Issue-ID: SO-425
Signed-off-by: Rob Daugherty <rd472p@att.com>

1 files changed, 4 insertions, 16 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ServiceInstancesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ServiceInstancesTest.java
index 666da25fe7..a217922b4a 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ServiceInstancesTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ServiceInstancesTest.java
@@ -21,29 +21,17 @@ package org.openecomp.mso.apihandlerinfra;
 

 import static org.junit.Assert.assertEquals;

 

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertTrue;

-import static org.junit.Assert.fail;

-

 import java.io.IOException;

-import java.nio.charset.Charset;

-import java.util.HashMap;

 

-import javax.ws.rs.PathParam;

 import javax.ws.rs.core.Response;

 

-import org.apache.commons.io.IOUtils;

 import org.apache.http.HttpStatus;

-import org.codehaus.jackson.JsonParseException;

-import org.codehaus.jackson.map.JsonMappingException;

-import org.codehaus.jackson.map.ObjectMapper;

 import org.junit.Test;

 import org.mockito.Mockito;

-import org.openecomp.mso.HealthCheckUtils;

 import org.openecomp.mso.apihandler.common.ValidationException;

-import org.openecomp.mso.requestsdb.InfraActiveRequests;

-import org.openecomp.mso.apihandlerinfra.serviceinstancebeans.Request;

-import org.openecomp.mso.apihandlerinfra.serviceinstancebeans.ServiceInstancesRequest;

+

+import com.fasterxml.jackson.core.JsonParseException;

+import com.fasterxml.jackson.databind.JsonMappingException;

 

 public class ServiceInstancesTest {

 

@@ -143,4 +131,4 @@ public class ServiceInstancesTest {
 		}

 	}

 

-}

+}
\ No newline at end of file