Containerization feature of SO

Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18
Issue-ID: SO-670
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

12 files changed, 0 insertions, 1522 deletions

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/CatalogDbAdapterRest.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/CatalogDbAdapterRest.java
deleted file mode 100644
index c1c5aee8f1..0000000000
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/CatalogDbAdapterRest.java
+++ /dev/null
@@ -1,573 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.mso.adapters.catalogdb;
-
-/*
-Create an initial query to retrieve a VNF Resource definition (including a list of possible module types)
-within the context of a given service. Input is a vnf resource model customization ID (new field for 1702),
-or a composite key (from 1610) of service name, service version, vnf instance name
-
-Returns a structure (JSON?) containing VNF RESOURCE attributes, plus a list of VF Module structures.
-
-Query a NETWORK_RESOURCE from the MSO Catalog, based on a networkModelCustomizationUUID (new for 1702),
-a network type (unique type identifier in 1610), or based on network role within a service.
-
-Create Adapter framework for access to Catalog DB, including connection management,
-login/password access, transaction logic, etc. This can be modeled after the Request DB Adapter
-
-Update the MSO Catalog DB schema to include the new fields defined in this user story.
-
-Note that the resourceModelCustomizationUUID (or vfModuleModelCustomizationUUID) will be unique keys (indexes)
-on the VNF_RESOURCE and VF_MODULE tables respectively.
-The previously constructed "vnf-type" and "vf-module-type" field may continue to be populated,
-but should no longer be needed and can deprecate in future release.
-
-For migration, a new randomly generated UUID field may be generated for the *ModelCustomizationUUID" fields
-until such time that the model is redistributed from ASDC.
-
-All other fields Check with Mike Z for appropriate value for the vfModuleLabel.
-We might be able to derive it's value from the current vnf-type (using the "middle" piece that identifies the module type).
-
-min and initial counts can be 0. max can be null to indicate no maximum.
-
-Once the network-level distribution artifacts are defined, similar updates can be made to the NETWORK_RESOURCE table.
-*/
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.HEAD;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.GenericEntity;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.http.HttpStatus;
-import org.openecomp.mso.adapters.catalogdb.catalogrest.CatalogQuery;
-import org.openecomp.mso.adapters.catalogdb.catalogrest.CatalogQueryException;
-import org.openecomp.mso.adapters.catalogdb.catalogrest.CatalogQueryExceptionCategory;
-import org.openecomp.mso.adapters.catalogdb.catalogrest.QueryAllottedResourceCustomization;
-import org.openecomp.mso.adapters.catalogdb.catalogrest.QueryResourceRecipe;
-import org.openecomp.mso.adapters.catalogdb.catalogrest.QueryServiceCsar;
-import org.openecomp.mso.adapters.catalogdb.catalogrest.QueryServiceMacroHolder;
-import org.openecomp.mso.adapters.catalogdb.catalogrest.QueryServiceNetworks;
-import org.openecomp.mso.adapters.catalogdb.catalogrest.QueryServiceVnfs;
-import org.openecomp.mso.adapters.catalogdb.catalogrest.QueryVfModule;
-import org.openecomp.mso.db.catalog.CatalogDatabase;
-import org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization;
-import org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization;
-import org.openecomp.mso.db.catalog.beans.Recipe;
-import org.openecomp.mso.db.catalog.beans.ServiceMacroHolder;
-import org.openecomp.mso.db.catalog.beans.ToscaCsar;
-import org.openecomp.mso.db.catalog.beans.VfModuleCustomization;
-import org.openecomp.mso.db.catalog.beans.VnfResourceCustomization;
-import org.openecomp.mso.logger.MessageEnum;
-import org.openecomp.mso.logger.MsoLogger;
-
-/**
- * This class services calls to the REST interface for VF Modules (http://host:port/ecomp/mso/catalog/v1)
- * Both XML and JSON can be produced/consumed.  Set Accept: and Content-Type: headers appropriately.  XML is the default.
- * Requests respond synchronously only
- */
-@Path("/{version: v[0-9]+}")
-public class CatalogDbAdapterRest {
-	private static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
-	private static final boolean IS_ARRAY = true;
-
-	public Response respond(String version, int respStatus, boolean isArray, CatalogQuery qryResp) {
-		return Response
-				.status(respStatus)
-				//.entity(new GenericEntity<QueryServiceVnfs>(qryResp) {})
-				.entity(qryResp.toJsonString(version, isArray))
-				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-				.build();
-	}
-
-	@HEAD
-	@GET
-	@Path("healthcheck")
-	@Produces(MediaType.TEXT_HTML)
-	public Response healthcheck (
-			@PathParam("version") String version
-	) {
-		String CHECK_HTML = "<!DOCTYPE html><html><head><meta charset=\"ISO-8859-1\"><title>Health Check</title></head><body>Application "+ version+ " ready</body></html>";
-		return Response.ok().entity(CHECK_HTML).build();
-	}
-
-	@GET
-	@Path("vnfResources/{vnfModelCustomizationUuid}")
-	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-	public Response serviceVnfs (
-			@PathParam("version") String version,
-			@PathParam("vnfModelCustomizationUuid") String vnfUuid
-	) {
-		return serviceVnfsImpl (version, !IS_ARRAY, vnfUuid, null, null, null, null);
-	}
-
-	@GET
-	@Path("serviceVnfs")
-	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-	public Response serviceVnfs(
-			@PathParam("version") String version,
-			@QueryParam("vnfModelCustomizationUuid") String vnfUuid,
-			@QueryParam("serviceModelUuid") String smUuid,
-			@QueryParam("serviceModelInvariantUuid") String smiUuid,
-			@QueryParam("serviceModelVersion") String smVer,
-			@QueryParam("serviceModelName") String smName
-	) {
-		return serviceVnfsImpl (version, IS_ARRAY, vnfUuid, smUuid, smiUuid, smVer, smName);
-	}
-
-	public Response serviceVnfsImpl(String version, boolean isArray, String vnfUuid, String smUuid, String smiUuid, String smVer, String smName) {
-		QueryServiceVnfs qryResp;
-		int respStatus = HttpStatus.SC_OK;
-		String uuid = "";
-		List<VnfResourceCustomization> ret;
-
-		try (CatalogDatabase db = CatalogDatabase.getInstance()) {
-			if (vnfUuid != null && !"".equals(vnfUuid)) {
-				uuid = vnfUuid;
-				LOGGER.debug ("Query serviceVnfs getAllVnfsByVnfModelCustomizationUuid vnfModelCustomizationUuid: " + uuid);
-				ret = db.getAllVnfsByVnfModelCustomizationUuid(uuid);
-			}
-			else if (smUuid != null && !"".equals(smUuid)) {
-				uuid = smUuid;
-				LOGGER.debug ("Query serviceVnfs getAllVnfsByServiceModelUuid serviceModelUuid: " + uuid);
-				ret = db.getAllVnfsByServiceModelUuid(uuid);
-			}
-			else if (smiUuid != null && !"".equals(smiUuid)) {
-				uuid = smiUuid;
-				if (smVer != null && !"".equals(smVer)) {
-					LOGGER.debug ("Query serviceVnfs getAllNetworksByServiceModelInvariantUuid serviceModelInvariantUuid: " + uuid+ " serviceModelVersion: "+ smVer);
-					ret = db.getAllVnfsByServiceModelInvariantUuid(uuid, smVer);
-				}
-				else {
-					LOGGER.debug ("Query serviceVnfs getAllNetworksByServiceModelInvariantUuid serviceModelUuid: " + uuid);
-					ret = db.getAllVnfsByServiceModelInvariantUuid(uuid);
-				}
-			}
-			else if (smName != null && !"".equals(smName)) {
-				if (smVer != null && !"".equals(smVer)) {
-					LOGGER.debug ("Query serviceVnfs getAllVnfsByServiceName serviceModelInvariantName: " + smName+ " serviceModelVersion: "+ smVer);
-					ret = db.getAllVnfsByServiceName(smName, smVer);
-				}
-				else {
-					LOGGER.debug ("Query serviceVnfs getAllVnfsByServiceName serviceModelName: " + smName);
-					ret = db.getAllVnfsByServiceName(smName);
-				}
-			}
-			else {
-				throw(new Exception("no matching parameters"));
-			}
-
-			if (ret == null || ret.isEmpty()) {
-				LOGGER.debug ("serviceVnfs not found");
-				respStatus = HttpStatus.SC_NOT_FOUND;
-				qryResp = new QueryServiceVnfs();
-			} else {
-				LOGGER.debug ("serviceVnfs found");
-				qryResp = new QueryServiceVnfs(ret);
-				LOGGER.debug ("serviceVnfs qryResp="+ qryResp);
-			}
-			LOGGER.debug ("Query serviceVnfs exit");
-			return respond(version, respStatus, isArray, qryResp);
-		} catch (Exception e) {
-			LOGGER.error (MessageEnum.RA_QUERY_VNF_ERR,  uuid, "", "queryServiceVnfs", MsoLogger.ErrorCode.BusinessProcesssError, "Exception - queryServiceVnfs", e);
-			CatalogQueryException excResp = new CatalogQueryException(e.getMessage(), CatalogQueryExceptionCategory.INTERNAL, Boolean.FALSE, null);
-			return Response
-				.status(HttpStatus.SC_INTERNAL_SERVER_ERROR)
-				.entity(new GenericEntity<CatalogQueryException>(excResp) {})
-				.build();
-		}
-	}
-
-	@GET
-	@Path("networkResources/{networkModelCustomizationUuid}")
-	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-	public Response serviceNetworks (
-			@PathParam("version") String version,
-			@PathParam("networkModelCustomizationUuid") String nUuid
-	) {
-		return serviceNetworksImpl (version, !IS_ARRAY, nUuid, null, null, null, null);
-	}
-
-	@GET
-	@Path("serviceNetworks")
-	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-	public Response serviceNetworks (
-			@PathParam("version") String version,
-			@QueryParam("networkModelCustomizationUuid") String nUuid,
-			@QueryParam("networkType") String nType,
-		@QueryParam("networkModelName") String nModelName,
-			@QueryParam("serviceModelUuid") String smUuid,
-			@QueryParam("serviceModelInvariantUuid") String smiUuid,
-		@QueryParam("serviceModelVersion") String smVer,
-		@QueryParam("networkModelVersion") String nmVer
-	) {
-		if (nModelName != null && !"".equals(nModelName)) {
-			nType = nModelName;
-		}
-		return serviceNetworksImpl (version, IS_ARRAY, nUuid, nType, smUuid, smiUuid, smVer);
-	}
-
-	public Response serviceNetworksImpl (String version, boolean isArray, String nUuid, String nType, String smUuid, String smiUuid, String smVer) {
-		QueryServiceNetworks qryResp;
-		int respStatus = HttpStatus.SC_OK;
-		String uuid = "";
-		List<NetworkResourceCustomization> ret;
-
-		try (CatalogDatabase db = CatalogDatabase.getInstance()) {
-			if (nUuid != null && !"".equals(nUuid)) {
-				uuid = nUuid;
-				LOGGER.debug ("Query serviceNetworks getAllNetworksByNetworkModelCustomizationUuid networkModelCustomizationUuid: " + uuid);
-				ret = db.getAllNetworksByNetworkModelCustomizationUuid(uuid);
-			}
-			else if (smUuid != null && !"".equals(smUuid)) {
-				uuid = smUuid;
-				LOGGER.debug ("Query serviceNetworks getAllNetworksByServiceModelUuid serviceModelUuid: " + uuid);
-				ret = db.getAllNetworksByServiceModelUuid(uuid);
-			}
-			else if (nType != null && !"".equals(nType)) {
-				uuid = nType;
-				LOGGER.debug ("Query serviceNetworks getAllNetworksByNetworkType serviceModelUuid: " + uuid);
-				ret = db.getAllNetworksByNetworkType(uuid);
-			}
-			else if (smiUuid != null && !"".equals(smiUuid)) {
-				uuid = smiUuid;
-				if (smVer != null && !"".equals(smVer)) {
-					LOGGER.debug ("Query serviceNetworks getAllNetworksByServiceModelInvariantUuid serviceModelInvariantUuid: " + uuid+ " serviceModelVersion: "+ smVer);
-					ret = db.getAllNetworksByServiceModelInvariantUuid(uuid, smVer);
-				}
-				else {
-					LOGGER.debug ("Query serviceNetworks getAllNetworksByServiceModelInvariantUuid serviceModelUuid: " + uuid);
-					ret = db.getAllNetworksByServiceModelInvariantUuid(uuid);
-				}
-			}
-			else {
-				throw(new Exception("no matching parameters"));
-			}
-
-			if (ret == null || ret.isEmpty()) {
-				LOGGER.debug ("serviceNetworks not found");
-				respStatus = HttpStatus.SC_NOT_FOUND;
-				qryResp = new QueryServiceNetworks();
-			} else {
-				LOGGER.debug ("serviceNetworks found");
-				qryResp = new QueryServiceNetworks(ret);
-				LOGGER.debug ("serviceNetworks qryResp="+ qryResp);
-			}
-			LOGGER.debug ("Query serviceNetworks exit");
-			return respond(version, respStatus, isArray, qryResp);
-		} catch (Exception e) {
-			LOGGER.error (MessageEnum.RA_QUERY_VNF_ERR,  uuid, "", "queryServiceNetworks", MsoLogger.ErrorCode.BusinessProcesssError, "Exception - queryServiceNetworks", e);
-			CatalogQueryException excResp = new CatalogQueryException(e.getMessage(), CatalogQueryExceptionCategory.INTERNAL, Boolean.FALSE, null);
-			return Response
-				.status(HttpStatus.SC_INTERNAL_SERVER_ERROR)
-				.entity(new GenericEntity<CatalogQueryException>(excResp) {})
-				.build();
-		}
-	}
-
-	@GET
-	@Path("serviceResources")
-	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-	public Response serviceResources(
-			@PathParam("version") String version,
-			@QueryParam("serviceModelUuid") String smUuid,
-			@QueryParam("serviceModelInvariantUuid") String smiUuid,
-			@QueryParam("serviceModelVersion") String smVer) {
-		QueryServiceMacroHolder qryResp;
-		int respStatus = HttpStatus.SC_OK;
-		String uuid = "";
-		ServiceMacroHolder ret;
-
-		try (CatalogDatabase db = CatalogDatabase.getInstance()) {
-			if (smUuid != null && !"".equals(smUuid)) {
-				uuid = smUuid;
-				LOGGER.debug ("Query serviceMacroHolder getAllResourcesByServiceModelUuid serviceModelUuid: " + uuid);
-				ret = db.getAllResourcesByServiceModelUuid(uuid);
-			}
-			else if (smiUuid != null && !"".equals(smiUuid)) {
-				uuid = smiUuid;
-				if (smVer != null && !"".equals(smVer)) {
-					LOGGER.debug ("Query serviceMacroHolder getAllResourcesByServiceModelInvariantUuid serviceModelInvariantUuid: " + uuid+ " serviceModelVersion: "+ smVer);
-					ret = db.getAllResourcesByServiceModelInvariantUuid(uuid, smVer);
-				}
-				else {
-					LOGGER.debug ("Query serviceMacroHolder getAllResourcesByServiceModelInvariantUuid serviceModelUuid: " + uuid);
-					ret = db.getAllResourcesByServiceModelInvariantUuid(uuid);
-				}
-			}
-			else {
-				throw(new Exception("no matching parameters"));
-			}
-
-			if (ret == null) {
-				LOGGER.debug ("serviceMacroHolder not found");
-				respStatus = HttpStatus.SC_NOT_FOUND;
-				qryResp = new QueryServiceMacroHolder();
-			} else {
-				LOGGER.debug ("serviceMacroHolder found");
-				qryResp = new QueryServiceMacroHolder(ret);
-				LOGGER.debug ("serviceMacroHolder qryResp="+ qryResp);
-			}
-			LOGGER.debug ("Query serviceMacroHolder exit");
-			return respond(version, respStatus, IS_ARRAY, qryResp);
-		} catch (Exception e) {
-			LOGGER.error (MessageEnum.RA_QUERY_VNF_ERR,  uuid, "", "queryServiceMacroHolder", MsoLogger.ErrorCode.BusinessProcesssError, "Exception - queryServiceMacroHolder", e);
-			CatalogQueryException excResp = new CatalogQueryException(e.getMessage(), CatalogQueryExceptionCategory.INTERNAL, Boolean.FALSE, null);
-			return Response
-				.status(HttpStatus.SC_INTERNAL_SERVER_ERROR)
-				.entity(new GenericEntity<CatalogQueryException>(excResp) {})
-				.build();
-		}
-	}
-
-	@GET
-	@Path("allottedResources/{arModelCustomizationUuid}")
-	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-	public Response serviceAllottedResources (
-			@PathParam("version") String version,
-			@PathParam("arModelCustomizationUuid") String aUuid
-	) {
-		return serviceAllottedResourcesImpl(version, !IS_ARRAY, aUuid, null, null, null);
-	}
-
-	@GET
-	@Path("serviceAllottedResources")
-	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-	public Response serviceAllottedResources(
-			@PathParam("version") String version,
-			@QueryParam("serviceModelUuid") String smUuid,
-			@QueryParam("serviceModelInvariantUuid") String smiUuid,
-			@QueryParam("serviceModelVersion") String smVer,
-			@QueryParam("arModelCustomizationUuid") String aUuid
-	) {
-		return serviceAllottedResourcesImpl(version, IS_ARRAY, aUuid, smUuid, smiUuid, smVer);
-	}
-
-	public Response serviceAllottedResourcesImpl(String version, boolean isArray, String aUuid, String smUuid, String smiUuid, String smVer) {
-		QueryAllottedResourceCustomization qryResp;
-		int respStatus = HttpStatus.SC_OK;
-		String uuid = "";
-		List<AllottedResourceCustomization > ret;
-
-		try (CatalogDatabase db = CatalogDatabase.getInstance()) {
-			if (smUuid != null && !"".equals(smUuid)) {
-				uuid = smUuid;
-				LOGGER.debug ("Query AllottedResourceCustomization getAllAllottedResourcesByServiceModelUuid serviceModelUuid: " + uuid);
-				ret = db.getAllAllottedResourcesByServiceModelUuid(uuid);
-			}
-			else if (smiUuid != null && !"".equals(smiUuid)) {
-				uuid = smiUuid;
-				if (smVer != null && !"".equals(smVer)) {
-					LOGGER.debug ("Query AllottedResourceCustomization getAllAllottedResourcesByServiceModelInvariantUuid serviceModelInvariantUuid: " + uuid+ " serviceModelVersion: "+ smVer);
-					ret = db.getAllAllottedResourcesByServiceModelInvariantUuid(uuid, smVer);
-				}
-				else {
-					LOGGER.debug ("Query AllottedResourceCustomization getAllAllottedResourcesByServiceModelInvariantUuid serviceModelUuid: " + uuid);
-					ret = db.getAllAllottedResourcesByServiceModelInvariantUuid(uuid);
-				}
-			}
-			else if (aUuid != null && !"".equals(aUuid)) {
-				uuid = aUuid;
-				LOGGER.debug ("Query AllottedResourceCustomization getAllAllottedResourcesByArModelCustomizationUuid serviceModelUuid: " + uuid);
-				ret = db.getAllAllottedResourcesByArModelCustomizationUuid(uuid);
-			}
-			else {
-				throw(new Exception("no matching parameters"));
-			}
-
-			if (ret == null || ret.isEmpty()) {
-				LOGGER.debug ("AllottedResourceCustomization not found");
-				respStatus = HttpStatus.SC_NOT_FOUND;
-				qryResp = new QueryAllottedResourceCustomization();
-			} else {
-				LOGGER.debug ("AllottedResourceCustomization found");
-				qryResp = new QueryAllottedResourceCustomization(ret);
-				LOGGER.debug ("AllottedResourceCustomization qryResp="+ qryResp);
-			}
-			LOGGER.debug ("Query AllottedResourceCustomization exit");
-			return respond(version, respStatus, isArray, qryResp);
-		} catch (Exception e) {
-			LOGGER.error (MessageEnum.RA_QUERY_VNF_ERR,  uuid, "", "queryAllottedResourceCustomization", MsoLogger.ErrorCode.BusinessProcesssError, "Exception - queryAllottedResourceCustomization", e);
-			CatalogQueryException excResp = new CatalogQueryException(e.getMessage(), CatalogQueryExceptionCategory.INTERNAL, Boolean.FALSE, null);
-			return Response
-				.status(HttpStatus.SC_INTERNAL_SERVER_ERROR)
-				.entity(new GenericEntity<CatalogQueryException>(excResp) {})
-				.build();
-		}
-	}
-	
-	// Added for DHV in 1702.  Might be a temporary solution!
-	// Changing to use QueryVfModule so the modelCustomizationUuid is included in response
-	@GET
-	@Path("vfModules")
-	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-	public Response vfModules(@QueryParam("vfModuleModelName") String vfModuleModelName) {
-		QueryVfModule qryResp;
-		int respStatus = HttpStatus.SC_OK;
-		List<VfModuleCustomization> ret = null;
-
-        try (CatalogDatabase db = CatalogDatabase.getInstance()) {
-            if (vfModuleModelName != null && !"".equals(vfModuleModelName)) {
-                LOGGER.debug("Query vfModules by vfModuleModuleName: " + vfModuleModelName);
-                VfModuleCustomization vfModule = db.getVfModuleCustomizationByModelName(vfModuleModelName);
-                if (vfModule != null) {
-                    ret = new ArrayList<>(1);
-                    ret.add(vfModule);
-                }
-            } else {
-                throw (new Exception("Incoming parameter is null or blank"));
-            }
-            if (ret == null || ret.isEmpty()) {
-                LOGGER.debug("vfModules not found");
-                respStatus = HttpStatus.SC_NOT_FOUND;
-                qryResp = new QueryVfModule();
-            } else {
-                LOGGER.debug("vfModules found");
-                qryResp = new QueryVfModule(ret);
-                LOGGER.debug("vfModules query Results is: " + qryResp);
-                LOGGER.debug("vfModules tojsonstring is: " + qryResp.JSON2(false, false));
-            }
-            LOGGER.debug("Query vfModules exit");
-            return Response
-                .status(respStatus)
-                .entity(qryResp.JSON2(false, false))
-                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                .build();
-        } catch (Exception e) {
-            LOGGER.error(MessageEnum.RA_QUERY_VNF_ERR, vfModuleModelName, "", "queryVfModules",
-                MsoLogger.ErrorCode.BusinessProcesssError, "Exception during query VfModules by vfModuleModuleName: ",
-                e);
-            CatalogQueryException excResp = new CatalogQueryException(e.getMessage(),
-                CatalogQueryExceptionCategory.INTERNAL, Boolean.FALSE, null);
-            return Response
-                .status(HttpStatus.SC_INTERNAL_SERVER_ERROR)
-                .entity(new GenericEntity<CatalogQueryException>(excResp) {
-                })
-                .build();
-        }
-	}
-
-	/**
-	 * Get the tosca csar info from catalog
-	 * <br>
-	 * 
-	 * @param smUuid service model uuid
-	 * @return the tosca csar information of the serivce.
-	 * @since ONAP Beijing Release
-	 */
-    @GET
-    @Path("serviceToscaCsar")
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public Response serviceToscaCsar(@QueryParam("serviceModelUuid") String smUuid) {
-        int respStatus = HttpStatus.SC_OK;
-        String entity = "";
-        try (CatalogDatabase db = CatalogDatabase.getInstance()) {
-            if (smUuid != null && !"".equals(smUuid)) {
-                LOGGER.debug("Query Csar by service model uuid: " + smUuid);
-                ToscaCsar toscaCsar = db.getToscaCsarByServiceModelUUID(smUuid);
-                if (toscaCsar != null) {
-                    QueryServiceCsar serviceCsar = new QueryServiceCsar(toscaCsar);
-                    entity = serviceCsar.JSON2(false, false);
-                } else {
-                    respStatus = HttpStatus.SC_NOT_FOUND;
-                }
-            } else {
-                throw (new Exception("Incoming parameter is null or blank"));
-            }
-            LOGGER.debug("Query Csar exit");
-            return Response
-                .status(respStatus)
-                .entity(entity)
-                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-                .build();
-        } catch (Exception e) {
-            LOGGER.error(MessageEnum.RA_QUERY_VNF_ERR, smUuid, "", "ServiceToscaCsar",
-                MsoLogger.ErrorCode.BusinessProcesssError, "Exception during query csar by service model uuid: ", e);
-            CatalogQueryException excResp = new CatalogQueryException(e.getMessage(),
-                CatalogQueryExceptionCategory.INTERNAL, Boolean.FALSE, null);
-            return Response
-                .status(HttpStatus.SC_INTERNAL_SERVER_ERROR)
-                .entity(new GenericEntity<CatalogQueryException>(excResp) {
-                })
-                .build();
-        }
-    }
-    
-    /**
-     * Get the resource recipe info from catalog
-     * <br>
-     * 
-     * @param rmUuid resource model uuid
-     * @return the recipe information of the resource.
-     * @since ONAP Beijing Release
-     */
-    @GET
-    @Path("resourceRecipe")
-    @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-    public Response resourceRecipe(@QueryParam("resourceModelUuid") String rmUuid, @QueryParam("action") String action) {
-        int respStatus = HttpStatus.SC_OK;
-		String entity = "";
-		try (CatalogDatabase db = CatalogDatabase.getInstance()) {
-			if (rmUuid != null && !"".equals(rmUuid)) {
-				LOGGER.debug("Query recipe by resource model uuid: " + rmUuid);
-				//check vnf and network and ar, the resource could be any resource.
-				Recipe recipe = db.getVnfRecipeByModuleUuid(rmUuid, action);
-				if (null == recipe) {
-					recipe = db.getNetworkRecipeByModuleUuid(rmUuid, action);
-				}
-				if (null == recipe) {
-					recipe = db.getArRecipeByModuleUuid(rmUuid, action);
-				}
-				if (recipe != null) {
-					QueryResourceRecipe resourceRecipe = new QueryResourceRecipe(recipe);
-					entity = resourceRecipe.JSON2(false, false);
-				} else {
-					respStatus = HttpStatus.SC_NOT_FOUND;
-				}
-			} else {
-				throw (new Exception("Incoming parameter is null or blank"));
-			}
-			LOGGER.debug("Query recipe exit");
-			return Response
-				.status(respStatus)
-				.entity(entity)
-				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
-				.build();
-		} catch (Exception e) {
-			LOGGER.error(MessageEnum.RA_QUERY_VNF_ERR, rmUuid, "", "resourceRecipe",
-				MsoLogger.ErrorCode.BusinessProcesssError, "Exception during query recipe by resource model uuid: ", e);
-			CatalogQueryException excResp = new CatalogQueryException(e.getMessage(),
-				CatalogQueryExceptionCategory.INTERNAL, Boolean.FALSE, null);
-			return Response
-				.status(HttpStatus.SC_INTERNAL_SERVER_ERROR)
-				.entity(new GenericEntity<CatalogQueryException>(excResp) {
-				})
-				.build();
-		}
-    }
-}
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQuery.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQuery.java
deleted file mode 100644
index 10d76f145b..0000000000
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQuery.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.openecomp.mso.adapters.catalogdb.catalogrest;
-
-import org.openecomp.mso.logger.MsoLogger;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public abstract class CatalogQuery {
-	protected static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
-	private static final boolean IS_EMBED = true;
-
-	public abstract String JSON2(boolean isArray, boolean isEmbed);
-
-	protected void put(Map<String, String> valueMap, String key, String value) {
-		valueMap.put(key, value == null? "null": '"'+ value+ '"');
-	}
-
-	protected void put(Map<String, String> valueMap, String key, Integer value) {
-		valueMap.put(key, value == null? "null": value.toString());
-	}
-
-	protected void put(Map<String, String> valueMap, String key, Boolean value) {
-		valueMap.put(key, value == null? "null": value? "true": "false");
-	}
-
-	protected String setTemplate(String template, Map<String, String> valueMap) {
-		LOGGER.debug("CatalogQuery setTemplate");
-		StringBuffer result = new StringBuffer();
-
-		String pattern = "<.*>";
-		Pattern r = Pattern.compile(pattern);
-		Matcher m = r.matcher(template);
-
-		LOGGER.debug("CatalogQuery template:" + template);
-		while (m.find()) {
-			String key = template.substring(m.start() + 1, m.end() - 1);
-			LOGGER.debug("CatalogQuery key:" + key + " contains key? " + valueMap.containsKey(key));
-			m.appendReplacement(result, valueMap.getOrDefault(key, "\"TBD\""));
-		}
-		m.appendTail(result);
-		LOGGER.debug("CatalogQuery return:" + result.toString());
-		return result.toString();
-	}
-
-	/**
-	 * The simple, clean, generic way to handle the interface
-	 */
- 	protected String smartToJSON() {
-		String jsonString = null;
-		try {
-			ObjectMapper mapper = new ObjectMapper();
-			jsonString = mapper.writeValueAsString(this);
-		}
-		catch (Exception e) {
-		    LOGGER.debug("Exception:", e);
-			LOGGER.debug ("jsonString exception:"+e.getMessage());
-			jsonString = "invalid"; //throws instead?
-		}
-		return jsonString;
-	}
-
-	public String toJsonString(String version, boolean isArray) {
-		switch(version) {
-		case "v1": return smartToJSON();
-		case "v2": return JSON2(isArray, !IS_EMBED);
-		default:
-			return "invalid version: "+ version;
-		}
-	}
-}
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryException.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryException.java
deleted file mode 100644
index a35bc78229..0000000000
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryException.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.mso.adapters.catalogdb.catalogrest;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import java.io.Serializable;
-
-@XmlRootElement(name = "catalogQueryException")
-public class CatalogQueryException extends CatalogQueryExceptionCommon implements Serializable {
-    private static final long serialVersionUID = -9062290006520066109L;
-
-    private String message;
-	private CatalogQueryExceptionCategory category;
-	private Boolean rolledBack;
-
-	public CatalogQueryException () {}
-
-	public CatalogQueryException (String message) {
-		this.message = message;
-	}
-
-	public CatalogQueryException (String message, CatalogQueryExceptionCategory category, boolean rolledBack, String messageid) {
-		super(messageid);
-		this.message = message;
-		this.category = category;
-		this.rolledBack = rolledBack;
-	}
-
-	public String getMessage() { return message; }
-	public void setMessage(String message) { this.message = message; }
-
-	public CatalogQueryExceptionCategory getCategory () { return category; }
-	public void setCategory (CatalogQueryExceptionCategory category) { this.category = category; }
-
-	public Boolean getRolledBack() { return rolledBack; }
-	public void setRolledBack(Boolean rolledBack) { this.rolledBack = rolledBack; }
-}
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCategory.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCategory.java
deleted file mode 100644
index 2364ccc667..0000000000
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCategory.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.mso.adapters.catalogdb.catalogrest;
-
-public enum CatalogQueryExceptionCategory { OPENSTACK, IO, INTERNAL, USERDATA }
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCommon.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCommon.java
deleted file mode 100644
index a1414e08bd..0000000000
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/CatalogQueryExceptionCommon.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.openecomp.mso.adapters.catalogdb.catalogrest;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import java.io.ByteArrayOutputStream;
-import org.openecomp.mso.logger.MsoLogger;
-
-public abstract class CatalogQueryExceptionCommon {
-	private String messageId;
-	protected static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA);
-
-	public CatalogQueryExceptionCommon() { messageId = null; }
-	public CatalogQueryExceptionCommon(String messageId) { this.messageId = messageId; }
-
-	public String getMessageId() { return messageId; }
-	public void setMessageId(String messageId) { this.messageId = messageId; }
-
-	public String toJsonString() {
-		try {
-			String jsonString;
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
-			jsonString = mapper.writeValueAsString(this);
-			return jsonString;
-		} catch (Exception e) {
-		    LOGGER.debug ("Exception:", e);
-			return "";
-		}
-	}
-
-	public String toXmlString() {
-		try {
-			ByteArrayOutputStream bs = new ByteArrayOutputStream();
-			JAXBContext context = JAXBContext.newInstance(this.getClass());
-			Marshaller marshaller = context.createMarshaller();
-			marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); //pretty print XML
-			marshaller.marshal(this, bs);
-			return bs.toString();
-		} catch (Exception e) {
-		    LOGGER.debug ("Exception:", e);
-			return "";
-		}
-	}
-}
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java
deleted file mode 100644
index b249b58d48..0000000000
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.mso.adapters.catalogdb.catalogrest;
-
-import org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@XmlRootElement(name = "serviceAllottedResources")
-public class QueryAllottedResourceCustomization extends CatalogQuery {
-	private List<AllottedResourceCustomization> allottedResourceCustomization;
-	private final String template =
-		"\t{\n"+
-//		"\t{ \"allottedResource\"       : {\n"+
-		"\t\t\"modelInfo\"       : {\n"+
-			"\t\t\t\"modelName\"              : <MODEL_NAME>,\n"+
-			"\t\t\t\"modelUuid\"              : <MODEL_UUID>,\n"+
-			"\t\t\t\"modelInvariantUuid\"     : <MODEL_INVARIANT_ID>,\n"+
-			"\t\t\t\"modelVersion\"           : <MODEL_VERSION>,\n"+
-			"\t\t\t\"modelCustomizationUuid\" : <MODEL_CUSTOMIZATION_UUID>,\n"+
-			"\t\t\t\"modelInstanceName\"      : <MODEL_INSTANCE_NAME>\n"+
-	        "\t\t},\n"+
-	        "\t\t\"toscaNodeType\"                      : <TOSCA_NODE_TYPE>,\n"+ 
-	        "\t\t\"allottedResourceType\"               : <ALLOTTED_RESOURCE_TYPE>,\n"+ 
-	        "\t\t\"allottedResourceRole\"               : <ALLOTTED_RESOURCE_ROLE>,\n"+ 
-	        "\t\t\"providingServiceModelName\"          : <PROVIDING_SERVICE_MODEL_NAME>,\n"+ 
-	        "\t\t\"providingServiceModelInvariantUuid\" : <PROVIDING_SERVICE_MODEL_INVARIANT_UUID>,\n"+ 
-	        "\t\t\"providingServiceModelUuid\"          : <PROVIDING_SERVICE_MODEL_UUID>,\n"+ 
-	        "\t\t\"nfFunction\"                         : <NF_FUNCTION>,\n"+ 
-	        "\t\t\"nfType\"                             : <NF_TYPE>,\n"+ 
-	        "\t\t\"nfRole\"                             : <NF_ROLE>,\n"+ 
-	        "\t\t\"nfNamingCode\"                       : <NF_NAMING_CODE>\n"+ 
-	    "\t}";			
-//		"\t}}";
-
-	public QueryAllottedResourceCustomization() { super(); allottedResourceCustomization = new ArrayList<>(); }
-	public QueryAllottedResourceCustomization(List<AllottedResourceCustomization> vlist) { allottedResourceCustomization = vlist; }
-
-	public List<AllottedResourceCustomization> getServiceAllottedResources(){ return this.allottedResourceCustomization; }
-	public void setServiceAllottedResources(List<AllottedResourceCustomization> v) { this.allottedResourceCustomization = v; }
-
-	@Override
-	public String toString () {
-		StringBuilder sb = new StringBuilder();
-
-		boolean first = true;
-		int i = 1;
-		for (AllottedResourceCustomization o : allottedResourceCustomization) {
-			sb.append(i).append("\t");
-			if (!first) sb.append("\n"); first = false;
-			sb.append(o);
-		}
-		return sb.toString();
-    }
-
-	@Override
-	public String JSON2(boolean isArray, boolean isEmbed) {
-		StringBuilder sb = new StringBuilder();
-		if (!isEmbed && isArray) sb.append("{ ");
-		if (isArray) sb.append("\"serviceAllottedResources\": [");
-		Map<String, String> valueMap = new HashMap<>();
-		String sep = "";
-		boolean first = true;
-
-		if (this.allottedResourceCustomization != null) {
-		for (AllottedResourceCustomization o : allottedResourceCustomization) {
-			if (first) sb.append("\n"); first = false;
-
-				boolean arNull = o.getAllottedResource() == null ? true : false;
-	
-			    put(valueMap, "MODEL_NAME",               arNull ? null : o.getAllottedResource().getModelName());
-			    put(valueMap, "MODEL_UUID",               arNull ? null : o.getAllottedResource().getModelUuid());
-			    put(valueMap, "MODEL_INVARIANT_ID",       arNull ? null : o.getAllottedResource().getModelInvariantUuid());
-			    put(valueMap, "MODEL_VERSION",            arNull ? null : o.getAllottedResource().getModelVersion());
-		    put(valueMap, "MODEL_CUSTOMIZATION_UUID", o.getModelCustomizationUuid());
-		    put(valueMap, "MODEL_INSTANCE_NAME",      o.getModelInstanceName());
-			    put(valueMap, "TOSCA_NODE_TYPE",      arNull ? null : o.getAllottedResource().getToscaNodeType());
-			    put(valueMap, "ALLOTTED_RESOURCE_TYPE",     o.getNfType());
-			    put(valueMap, "ALLOTTED_RESOURCE_ROLE",     o.getNfRole());
-			    put(valueMap, "NF_TYPE",     o.getNfType());
-			    put(valueMap, "NF_ROLE",     o.getNfRole());
-			    put(valueMap, "NF_FUNCTION",     o.getNfFunction());
-			    put(valueMap, "NF_NAMING_CODE",     o.getNfNamingCode());
-			    put(valueMap, "PROVIDING_SERVICE_MODEL_INVARIANT_UUID",     o.getProvidingServiceModelInvariantUuid());
-			    put(valueMap, "PROVIDING_SERVICE_MODEL_UUID",     o.getProvidingServiceModelUuid());
-			    put(valueMap, "PROVIDING_SERVICE_MODEL_NAME",     o.getProvidingServiceModelName());
-
-            sb.append(sep).append(this.setTemplate(template, valueMap));
-            sep = ",\n";
-		}
-		}
-		if (!first) sb.append("\n");
-		if (isArray) sb.append("]");
-		if (!isEmbed && isArray) sb.append("}");
-		return sb.toString();
-	}
-
-}
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryResourceRecipe.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryResourceRecipe.java
deleted file mode 100644
index 4d8b65a0c8..0000000000
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryResourceRecipe.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * Copyright (C) 2018 Huawei Technologies Co., Ltd. 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.openecomp.mso.adapters.catalogdb.catalogrest;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.openecomp.mso.db.catalog.beans.Recipe;

-

-import com.fasterxml.jackson.core.JsonProcessingException;

-import com.fasterxml.jackson.databind.ObjectMapper;

-import com.fasterxml.jackson.databind.SerializationFeature;

-

-/**

- * serivce csar query support 

- * <br>

- * <p>

- * </p>

- * 

- * @author

- * @version     ONAP Beijing Release  2018-02-28

- */

-public class QueryResourceRecipe extends CatalogQuery{

-    

-    private Recipe resourceRecipe;

-    

-    public QueryResourceRecipe(Recipe resourceRecipe){

-        this.resourceRecipe =resourceRecipe;

-    }

-

-    @Override

-    public String toString() {

-

-        return resourceRecipe.toString();

-    }

-

-    @Override

-    public String JSON2(boolean isArray, boolean isEmbed) {    	

-    	

-        Map<String, String> valueMap = new HashMap<>();

-        valueMap.put("id",  null == resourceRecipe ? null :String.valueOf(resourceRecipe.getId()));

-        valueMap.put("action",  null == resourceRecipe ? null :resourceRecipe.getAction());

-        valueMap.put("orchestrationUri", null == resourceRecipe ? null : resourceRecipe.getOrchestrationUri());

-        valueMap.put("recipeTimeout", null == resourceRecipe ? null : String.valueOf(resourceRecipe.getRecipeTimeout()));

-        valueMap.put("paramXSD", null == resourceRecipe ? null : resourceRecipe.getParamXSD());

-        valueMap.put("description", null == resourceRecipe ? null : resourceRecipe.getDescription());

-        ObjectMapper mapper = new ObjectMapper();

-        mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false);

-        String jsonStr = "";

-        try {

-            jsonStr = mapper.writeValueAsString(valueMap);

-        } catch(JsonProcessingException e) {

-            LOGGER.error("JsonProcessingException", e);

-        }

-        return jsonStr;

-    }

-

-}

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceCsar.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceCsar.java
deleted file mode 100644
index 6b1eb836d9..0000000000
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceCsar.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * Copyright (C) 2018 Huawei Technologies Co., Ltd. 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.openecomp.mso.adapters.catalogdb.catalogrest;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.openecomp.mso.db.catalog.beans.ToscaCsar;

-

-/**

- * serivce csar query support 

- * <br>

- * <p>

- * </p>

- * 

- * @author

- * @version     ONAP Beijing Release  2018-02-28

- */

-public class QueryServiceCsar extends CatalogQuery{

-    

-    private ToscaCsar toscaCsar;

-    

-    public QueryServiceCsar(ToscaCsar toscaCsar){

-        this.toscaCsar = toscaCsar;

-    }

-    

-    private final String template =

-            "\t{\n"+

-            "\t\t\"artifactUUID\"         : <ARTIFACT_UUID>,\n"+

-            "\t\t\"name\"                 : <NAME>,\n"+

-            "\t\t\"version\"              : <VERSION>,\n"+

-            "\t\t\"artifactChecksum\"     : <ARTIFACT_CHECK_SUM>,\n"+

-            "\t\t\"url\"                  : <URL>,\n"+

-            "\t\t\"description\"          : <DESCRIPTION>\n"+

-            "\t}";

-    

-    @Override

-    public String toString() {

-

-        return toscaCsar.toString();

-    }

-

-    @Override

-    public String JSON2(boolean isArray, boolean isEmbed) {

-        Map<String, String> valueMap = new HashMap<>();

-        put(valueMap, "ARTIFACT_UUID", null == toscaCsar ? null : toscaCsar.getArtifactUUID());

-        put(valueMap, "NAME", null == toscaCsar ? null : toscaCsar.getName());

-        put(valueMap, "VERSION", null == toscaCsar ? null : toscaCsar.getVersion());

-        put(valueMap, "ARTIFACT_CHECK_SUM", null == toscaCsar ? null : toscaCsar.getArtifactChecksum());

-        put(valueMap, "URL", null == toscaCsar ? null : toscaCsar.getUrl());

-        put(valueMap, "DESCRIPTION", null == toscaCsar ? null : toscaCsar.getDescription());

-        return this.setTemplate(template, valueMap);

-    }

-

-}

diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceMacroHolder.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceMacroHolder.java
deleted file mode 100644
index e683a9fd8d..0000000000
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceMacroHolder.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.mso.adapters.catalogdb.catalogrest;
-
-import org.openecomp.mso.db.catalog.beans.Service;
-import org.openecomp.mso.db.catalog.beans.ServiceMacroHolder;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.HashMap;
-import java.util.Map;
-
-@XmlRootElement(name = "serviceResources")
-public class QueryServiceMacroHolder extends CatalogQuery {
-    private ServiceMacroHolder serviceMacroHolder;
-    private static final String LINE_BEGINNING = "(?m)^";
-	private static final String template =
-		"{ \"serviceResources\"    : {\n"+
-			"\t\"modelInfo\"       : {\n"+
-            "\t\t\"modelName\"          : <SERVICE_MODEL_NAME>,\n"+
-            "\t\t\"modelUuid\"          : <SERVICE_MODEL_UUID>,\n"+
-            "\t\t\"modelInvariantUuid\" : <SERVICE_MODEL_INVARIANT_ID>,\n"+
-            "\t\t\"modelVersion\"       : <SERVICE_MODEL_VERSION>\n"+	
-            "\t},\n"+
-            "\t\"serviceType\"        : <SERVICE_TYPE>,\n"+
-            "\t\"serviceRole\"        : <SERVICE_ROLE>,\n"+
-            "\t\"environmentContext\" : <ENVIRONMENT_CONTEXT>,\n"+
-            "\t\"workloadContext\"    : <WORKLOAD_CONTEXT>,\n"+
-            "<_SERVICEVNFS_>,\n"+
-            "<_SERVICENETWORKS_>,\n"+
-            "<_SERVICEALLOTTEDRESOURCES_>\n"+
-        "\t}}";
-
-	public QueryServiceMacroHolder() {
-	    super();
-	    serviceMacroHolder = new ServiceMacroHolder();
-	}
-	public QueryServiceMacroHolder(ServiceMacroHolder vlist) { serviceMacroHolder = vlist; }
-
-	public ServiceMacroHolder getServiceResources(){ return this.serviceMacroHolder; }
-	public void setServiceResources(ServiceMacroHolder v) { this.serviceMacroHolder = v; }
-
-	@Override
-	public String toString () { return serviceMacroHolder.toString(); }
-
-	@Override
-	public String JSON2(boolean isArray, boolean x) {
-		Service service = serviceMacroHolder.getService();
-		if (service == null) {
-            return "\"serviceResources\": null";
-		}
-
-		StringBuilder buf = new StringBuilder();
-		Map<String, String> valueMap = new HashMap<>();
-
-		put(valueMap, "SERVICE_MODEL_NAME",         service.getModelName()); //getServiceModelName());
-		put(valueMap, "SERVICE_MODEL_UUID",         service.getModelUUID()); //getServiceModelUuid());
-		put(valueMap, "SERVICE_MODEL_INVARIANT_ID", service.getModelInvariantUUID()); //getServiceModelInvariantId());
-		put(valueMap, "SERVICE_MODEL_VERSION",      service.getVersion()); //getServiceModelVersion());
-		put(valueMap, "SERVICE_TYPE",               service.getServiceType());
-		put(valueMap, "SERVICE_ROLE",               service.getServiceRole());
-		put(valueMap, "ENVIRONMENT_CONTEXT",        service.getEnvironmentContext());
-		put(valueMap, "WORKLOAD_CONTEXT",           service.getWorkloadContext());
-
-	    String subitem;
-	    subitem = new QueryServiceVnfs(serviceMacroHolder.getVnfResourceCustomizations()).JSON2(true, true); 
-	    valueMap.put("_SERVICEVNFS_",               subitem.replaceAll(LINE_BEGINNING, "\t"));
-
-		subitem = new QueryServiceNetworks(serviceMacroHolder.getNetworkResourceCustomization()).JSON2(true, true);
-		valueMap.put("_SERVICENETWORKS_",           subitem.replaceAll(LINE_BEGINNING, "\t"));
-
-		subitem = new QueryAllottedResourceCustomization(serviceMacroHolder.getAllottedResourceCustomization()).JSON2(true, true);
-		valueMap.put("_SERVICEALLOTTEDRESOURCES_",  subitem.replaceAll(LINE_BEGINNING, "\t"));
-
-        buf.append(this.setTemplate(template, valueMap));
-		return buf.toString();
-	}
-
-}
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceNetworks.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceNetworks.java
deleted file mode 100644
index 9795deec54..0000000000
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceNetworks.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.mso.adapters.catalogdb.catalogrest;
-
-import org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@XmlRootElement(name = "serviceNetworks")
-public class QueryServiceNetworks extends CatalogQuery {
-	private List<NetworkResourceCustomization> serviceNetworks;
-	private final String template =
-		"\t{\n"+
-//		"\t{ \"networkResource\"            : {\n"+
-			"\t\t\"modelInfo\"                : {\n"+
-			"\t\t\t\"modelName\"              : <MODEL_NAME>,\n"+
-			"\t\t\t\"modelUuid\"              : <MODEL_UUID>,\n"+
-			"\t\t\t\"modelInvariantUuid\"     : <MODEL_INVARIANT_ID>,\n"+
-			"\t\t\t\"modelVersion\"           : <MODEL_VERSION>,\n"+
-			"\t\t\t\"modelCustomizationUuid\" : <MODEL_CUSTOMIZATION_UUID>,\n"+
-			"\t\t\t\"modelInstanceName\"      : <MODEL_INSTANCE_NAME>\n"+
-		"\t},\n"+
-			"\t\t\"toscaNodeType\"            : <TOSCA_NODE_TYPE>,\n"+
-			"\t\t\"networkType\"              : <NETWORK_TYPE>,\n"+
-			"\t\t\"networkTechnology\"        : <NETWORK_TECHNOLOGY>,\n"+
-			"\t\t\"networkRole\"              : <NETWORK_ROLE>,\n"+
-			"\t\t\"networkScope\"             : <NETWORK_SCOPE>\n"+
-		"\t}";
-//		"\t}}";
-
-	public QueryServiceNetworks() { super(); serviceNetworks = new ArrayList<>(); }
-	public QueryServiceNetworks(List<NetworkResourceCustomization> vlist) {
-		LOGGER.debug ("QueryServiceNetworks:");
-		serviceNetworks = new ArrayList<>();
-		for (NetworkResourceCustomization o : vlist) {
-			LOGGER.debug (o.toString());
-			serviceNetworks.add(o);
-			LOGGER.debug ("-------------------");
-		}
-	}
-
-	public List<NetworkResourceCustomization> getServiceNetworks(){ return this.serviceNetworks; }
-	public void setServiceNetworks(List<NetworkResourceCustomization> v) { this.serviceNetworks = v; }
-
-	@Override
-	public String toString () {
-		StringBuilder sb = new StringBuilder();
-
-		boolean first = true;
-		int i = 1;
-		for (NetworkResourceCustomization o : serviceNetworks) {
-			sb.append(i).append("\t");
-			if (!first) sb.append("\n"); first = false;
-			sb.append(o);
-		}
-		return sb.toString();
-    }
-
-	@Override
-	public String JSON2(boolean isArray, boolean isEmbed) {
-		StringBuilder sb = new StringBuilder();
-		if (!isEmbed && isArray) sb.append("{ ");
-		if (isArray) sb.append("\"serviceNetworks\": [");
-
-		Map<String, String> valueMap = new HashMap<>();
-		String sep = "";
-		boolean first = true;
-
-		for (NetworkResourceCustomization o : serviceNetworks) {
-			if (first) sb.append("\n"); first = false;
-			boolean nrNull = o.getNetworkResource() == null ? true : false;
-		    put(valueMap, "MODEL_NAME",               nrNull ? null : o.getNetworkResource().getModelName());
-		    put(valueMap, "MODEL_UUID",               nrNull ? null : o.getNetworkResource().getModelUUID());
-		    put(valueMap, "MODEL_INVARIANT_ID",       nrNull ? null : o.getNetworkResource().getModelInvariantUUID());
-		    put(valueMap, "MODEL_VERSION",            nrNull ? null : o.getNetworkResource().getVersion());
-		    put(valueMap, "MODEL_CUSTOMIZATION_UUID", o.getModelCustomizationUuid());
-		    put(valueMap, "MODEL_INSTANCE_NAME",      o.getModelInstanceName());
-		    put(valueMap, "TOSCA_NODE_TYPE",             nrNull ? null : o.getNetworkResource().getToscaNodeType());
-		    put(valueMap, "NETWORK_TYPE",             o.getNetworkType());
-		    put(valueMap, "NETWORK_ROLE",             o.getNetworkRole());
-		    put(valueMap, "NETWORK_SCOPE",             o.getNetworkScope());
-		    put(valueMap, "NETWORK_TECHNOLOGY",             o.getNetworkTechnology());
-
-            sb.append(sep).append(this.setTemplate(template, valueMap));
-            sep = ",\n";
-		}
-		if (!first) sb.append("\n");
-		if (isArray) sb.append("]");
-		if (!isEmbed && isArray) sb.append("}");
-		return sb.toString();
-	}
-}
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceVnfs.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceVnfs.java
deleted file mode 100644
index 383a106b18..0000000000
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryServiceVnfs.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.mso.adapters.catalogdb.catalogrest;
-/* should be called QueryVnfResource.java */
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.openecomp.mso.db.catalog.beans.VnfResourceCustomization;
-
-@XmlRootElement(name = "serviceVnfs")
-public class QueryServiceVnfs extends CatalogQuery {
-	private List<VnfResourceCustomization> serviceVnfs;
-	private final String template =
-        "\n"+
-        "\t{ \"modelInfo\"                    : {\n"+
-			"\t\t\"modelName\"              : <MODEL_NAME>,\n"+
-			"\t\t\"modelUuid\"              : <MODEL_UUID>,\n"+
-			"\t\t\"modelInvariantUuid\"     : <MODEL_INVARIANT_ID>,\n"+
-			"\t\t\"modelVersion\"           : <MODEL_VERSION>,\n"+
-			"\t\t\"modelCustomizationUuid\" : <MODEL_CUSTOMIZATION_UUID>,\n"+
-			"\t\t\"modelInstanceName\"      : <MODEL_INSTANCE_NAME>\n"+
-        "\t\t},\n"+
-			"\t\"toscaNodeType\"            : <TOSCA_NODE_TYPE>,\n"+
-			"\t\"nfFunction\"           	: <NF_FUNCTION>,\n"+
-			"\t\"nfType\"              		: <NF_TYPE>,\n"+
-			"\t\"nfRole\"              		: <NF_ROLE>,\n"+
-			"\t\"nfNamingCode\"         	: <NF_NAMING_CODE>,\n"+
-			"\t\"multiStageDesign\"         : <MULTI_STEP_DESIGN>,\n"+
-			"<_VFMODULES_>\n" + 
-			"\t}";
-
-	public QueryServiceVnfs() { super(); serviceVnfs = new ArrayList<>(); }
-	public QueryServiceVnfs(List<VnfResourceCustomization> vlist) { 
-		LOGGER.debug ("QueryServiceVnfs:");
-		serviceVnfs = new ArrayList<>();
-		for (VnfResourceCustomization o : vlist) {
-			LOGGER.debug ("-- o is a  serviceVnfs ----");
-			LOGGER.debug (o.toString());
-			serviceVnfs.add(o);
-			LOGGER.debug ("-------------------");
-		}
-	}
-
-	public List<VnfResourceCustomization> getServiceVnfs(){ return this.serviceVnfs; }
-	public void setServiceVnfs(List<VnfResourceCustomization> v) { this.serviceVnfs = v; }
-
-	@Override
-	public String toString () {
-		StringBuilder sb = new StringBuilder();
-
-		boolean first = true;
-		int i = 1;
-		for (VnfResourceCustomization o : serviceVnfs) {
-			sb.append(i).append("\t");
-			if (!first) sb.append("\n"); first = false;
-			sb.append(o);
-		}
-		return sb.toString();
-    }
-
-	@Override
-	public String JSON2(boolean isArray, boolean isEmbed) {
-		StringBuilder sb = new StringBuilder();
-		if (!isEmbed && isArray) sb.append("{ ");
-		if (isArray) sb.append("\"serviceVnfs\": [");
-		Map<String, String> valueMap = new HashMap<>();
-		String sep = "";
-		boolean first = true;
-
-		for (VnfResourceCustomization o : serviceVnfs) {
-			if (first) sb.append("\n"); first = false;
-
-			boolean vrNull = o.getVnfResource() == null ? true : false;
-
-		    put(valueMap, "MODEL_NAME",               vrNull ? null : o.getVnfResource().getModelName());
-		    put(valueMap, "MODEL_UUID",               vrNull ? null : o.getVnfResource().getModelUuid());
-		    put(valueMap, "MODEL_INVARIANT_ID",       vrNull ? null : o.getVnfResource().getModelInvariantId());
-		    put(valueMap, "MODEL_VERSION",            vrNull ? null : o.getVnfResource().getVersion());
-		    put(valueMap, "MODEL_CUSTOMIZATION_UUID", o.getModelCustomizationUuid());
-		    put(valueMap, "MODEL_INSTANCE_NAME",      o.getModelInstanceName());
-		    put(valueMap, "TOSCA_NODE_TYPE",          vrNull ? null : o.getVnfResource().getToscaNodeType());
-		    put(valueMap, "NF_FUNCTION",              o.getNfFunction());
-		    put(valueMap, "NF_TYPE",                  o.getNfType());
-		    put(valueMap, "NF_ROLE",                  o.getNfRole());
-		    put(valueMap, "NF_NAMING_CODE",           o.getNfNamingCode());
-		    put(valueMap, "MULTI_STEP_DESIGN",        o.getMultiStageDesign());
-
-		    String subitem = new QueryVfModule(vrNull ? null : o.getVfModuleCustomizations()).JSON2(true, true); 
-		    valueMap.put("_VFMODULES_",               subitem.replaceAll("(?m)^", "\t\t"));
-
-            sb.append(sep).append(this.setTemplate(template, valueMap));
-            sep = ",\n";
-		}
-		if (!first) sb.append("\n");
-		if (isArray) sb.append("]");
-		if (!isEmbed && isArray) sb.append("}");
-		return sb.toString();
-	}
-}
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModule.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModule.java
deleted file mode 100644
index 9215c38706..0000000000
--- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryVfModule.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.mso.adapters.catalogdb.catalogrest;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.openecomp.mso.db.catalog.beans.VfModuleCustomization;
-
-@XmlRootElement(name = "vfModules")
-public class QueryVfModule extends CatalogQuery {
-	private List<VfModuleCustomization> vfModules;
-	private final String template =
-		"\t{\n"+
-//		"\t{ \"vfModule\"               : { \n"+
-		"\t\t\"modelInfo\"               : { \n"+
-			"\t\t\t\"modelName\"              : <MODEL_NAME>,\n"+
-			"\t\t\t\"modelUuid\"              : <MODEL_UUID>,\n"+
-			"\t\t\t\"modelInvariantUuid\"     : <MODEL_INVARIANT_ID>,\n"+
-			"\t\t\t\"modelVersion\"           : <MODEL_VERSION>,\n"+
-			"\t\t\t\"modelCustomizationUuid\" : <MODEL_CUSTOMIZATION_UUID>\n"+
-			"\t\t},"+
-			"\t\t\"isBase\"                 : <IS_BASE>,\n"+
-			"\t\t\"vfModuleLabel\"          : <VF_MODULE_LABEL>,\n"+
-			"\t\t\"initialCount\"           : <INITIAL_COUNT>,\n"+
-			"\t\t\"hasVolumeGroup\"           : <HAS_VOLUME_GROUP>\n"+
-		"\t}";
-//		"\t}}";
-
-	public QueryVfModule() { super(); vfModules = new ArrayList<>(); }
-	public QueryVfModule(List<VfModuleCustomization> vlist) { 
-		LOGGER.debug ("QueryVfModule:");
-		vfModules = new ArrayList<>();
-		if (vlist != null) {
-			for (VfModuleCustomization o : vlist) {
-			LOGGER.debug ("-- o is a  vfModules ----");
-			LOGGER.debug (o.toString());
-			vfModules.add(o);
-			LOGGER.debug ("-------------------");
-		}
-	}
-	}
-
-	public List<VfModuleCustomization> getVfModule(){ return this.vfModules; }
-	public void setVfModule(List<VfModuleCustomization> v) { this.vfModules = v; }
-
-	@Override
-	public String toString () {
-		StringBuilder sb = new StringBuilder();
-
-		boolean first = true;
-		int i = 1;
-		for (VfModuleCustomization o : vfModules) {
-			sb.append(i).append("\t");
-			if (!first) sb.append("\n"); first = false;
-			sb.append(o);
-		}
-		return sb.toString();
-    }
-
-	@Override
-	public String JSON2(boolean isArray, boolean isEmbed) {
-		StringBuilder sb = new StringBuilder();
-		if (!isEmbed && isArray) sb.append("{ ");
-		if (isArray) sb.append("\"vfModules\": [");
-		Map<String, String> valueMap = new HashMap<>();
-		String sep = "";
-		boolean first = true;
-
-		for (VfModuleCustomization o : vfModules) {
-			if (first) sb.append("\n"); first = false;
-
-			boolean vfNull = o.getVfModule() == null ? true : false;
-			boolean hasVolumeGroup = false;
-			String envt = o.getHeatEnvironmentArtifactUuid();
-			if (envt != null && !"".equals(envt)) {
-				hasVolumeGroup = true;
-			}
-
-		    put(valueMap, "MODEL_NAME",               vfNull ? null : o.getVfModule().getModelName());
-		    put(valueMap, "MODEL_UUID",               vfNull ? null : o.getVfModule().getModelUUID());
-		    put(valueMap, "MODEL_INVARIANT_ID",       vfNull ? null : o.getVfModule().getModelInvariantUuid());
-		    put(valueMap, "MODEL_VERSION",            vfNull ? null : o.getVfModule().getVersion());
-		    put(valueMap, "MODEL_CUSTOMIZATION_UUID", o.getModelCustomizationUuid());
-			put(valueMap, "IS_BASE", vfNull ? false : o.getVfModule().isBase() ? true : false);
-			put(valueMap, "VF_MODULE_LABEL",          o.getLabel());
-		    put(valueMap, "INITIAL_COUNT",            o.getInitialCount());
-		    put(valueMap, "HAS_VOLUME_GROUP", hasVolumeGroup);
-
-            sb.append(sep).append(this.setTemplate(template, valueMap));
-            sep = ",\n";
-		}
-		if (!first) sb.append("\n");
-		if (isArray) sb.append("]");
-		if (!isEmbed && isArray) sb.append("}");
-		return sb.toString();
-	}
-}