1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

1 files changed, 11 insertions, 5 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkTypesHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkTypesHandler.java
index 3bdb745b15..bd47c8a4dd 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkTypesHandler.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkTypesHandler.java
@@ -26,28 +26,34 @@ import java.util.List;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
 import javax.ws.rs.core.Response;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 
 import org.apache.http.HttpStatus;
-
 import org.openecomp.mso.apihandlerinfra.networkbeans.NetworkType;
 import org.openecomp.mso.apihandlerinfra.networkbeans.NetworkTypes;
 import org.openecomp.mso.apihandlerinfra.networkbeans.ObjectFactory;
 import org.openecomp.mso.db.catalog.CatalogDatabase;
 import org.openecomp.mso.db.catalog.beans.NetworkResource;
 import org.openecomp.mso.logger.MsoLogger;
+import org.openecomp.mso.requestsdb.RequestsDatabase;
 import org.openecomp.mso.utils.UUIDChecker;
 
+import com.wordnik.swagger.annotations.Api;
+import com.wordnik.swagger.annotations.ApiOperation;
+
 @Path(Constants.NETWORK_TYPES_PATH)
+@Api(value="/{version: v1|v2|v3}/network-types",description="API Requests to find Network Types")
 public class NetworkTypesHandler {
 
     private static MsoLogger msoLogger = MsoLogger.getMsoLogger (MsoLogger.Catalog.APIH);
 
     @GET
-    public Response getNetworkTypes () {
+    @ApiOperation(value="Finds Network Types",response=Response.class)
+    public Response getNetworkTypes (@PathParam("version") String version) {
         long startTime = System.currentTimeMillis ();
         MsoLogger.setServiceName ("getNetworkTypes");
         // Generate a Request Id
@@ -55,7 +61,7 @@ public class NetworkTypesHandler {
         msoLogger.debug ("Incoming request received for getNetworkTypes");
 
         List <NetworkResource> networkResources = null;
-        try (CatalogDatabase db = new CatalogDatabase()){
+        try (CatalogDatabase db = CatalogDatabase.getInstance()){
             networkResources = db.getAllNetworkResources ();
         } catch (Exception e) {
             msoLogger.debug ("No connection to catalog DB", e);
@@ -75,9 +81,9 @@ public class NetworkTypesHandler {
         for (int i = 0; i < networkResources.size (); i++) {
             NetworkType networkType = beansObjectFactory.createNetworkType ();
             NetworkResource vr = networkResources.get (i);
-            networkType.setType (vr.getNetworkType ());
+            networkType.setType (vr.getModelName());
             networkType.setDescription (vr.getDescription ());
-            networkType.setId (String.valueOf (vr.getId ()));
+            networkType.setId (String.valueOf (vr.getModelUUID()));
             networkTypes.getNetworkType ().add (networkType);
         }