From b3cf89a56cfeb30ec73e679927f6bcdba2702b38 Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Wed, 3 May 2017 03:56:00 -0700 Subject: [MSO-8] Remove files that crash the commonBPMN Some files in commonBPMN have been removed as they prevent the war to be successfully deployed on Jboss + Remove rest interfaces files for catalog that should not be there anymore Change-Id: Iaf83f8b60610624e160feac8a96b7eaed7f161d1 Signed-off-by: Determe, Sebastien (sd378r) --- .../QueryAllottedResourceCustomization.java | 69 ------------------- .../catalogrest/QueryServiceMacroHolder.java | 56 --------------- .../adapters/catalogrest/QueryServiceNetworks.java | 78 --------------------- .../mso/adapters/catalogrest/QueryServiceVnfs.java | 79 ---------------------- 4 files changed, 282 deletions(-) delete mode 100644 adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomization.java delete mode 100644 adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolder.java delete mode 100644 adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworks.java delete mode 100644 adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfs.java (limited to 'adapters/mso-adapters-rest-interface/src/main/java/org/openecomp') diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomization.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomization.java deleted file mode 100644 index fc4cec9201..0000000000 --- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryAllottedResourceCustomization.java +++ /dev/null @@ -1,69 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * OPENECOMP - MSO - * ================================================================================ - * 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.catalogrest; - -import org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization; -import org.openecomp.mso.logger.MsoLogger; -import org.codehaus.jackson.map.ObjectMapper; -import org.jboss.resteasy.annotations.providers.NoJackson; - -import javax.xml.bind.annotation.XmlRootElement; -import java.util.ArrayList; -import java.util.List; - -@XmlRootElement(name = "serviceAllottedResources") -@NoJackson -public class QueryAllottedResourceCustomization { - private static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA); - private List allottedResourceCustomization; - - public QueryAllottedResourceCustomization() { super(); allottedResourceCustomization = new ArrayList(); } - public QueryAllottedResourceCustomization(List vlist) { allottedResourceCustomization = vlist; } - - public List getServiceAllottedResources(){ return this.allottedResourceCustomization; } - public void setServiceAllottedResources(List v) { this.allottedResourceCustomization = v; } - - @Override - public String toString () { - StringBuffer buf = new StringBuffer(); - - boolean first = true; - int i = 1; - for (AllottedResourceCustomization o : allottedResourceCustomization) { - buf.append(i+"\t"); - if (!first) buf.append("\n"); first = false; - buf.append(o); - } - return buf.toString(); - } - - public String toJsonString() { - String jsonString = null; - try { - ObjectMapper mapper = new ObjectMapper(); - jsonString = mapper.writeValueAsString(this); - LOGGER.debug ("AllottedResourceCustomization jsonString: "+jsonString); - } - catch (Exception e) { - LOGGER.debug ("AllottedResourceCustomization jsonString exception:"+e.getMessage()); - } - return jsonString; - } -} \ No newline at end of file diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolder.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolder.java deleted file mode 100644 index 2cb756b856..0000000000 --- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceMacroHolder.java +++ /dev/null @@ -1,56 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * OPENECOMP - MSO - * ================================================================================ - * 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.catalogrest; - -import org.openecomp.mso.db.catalog.beans.ServiceMacroHolder; -import org.openecomp.mso.logger.MsoLogger; -import org.codehaus.jackson.map.ObjectMapper; -import org.jboss.resteasy.annotations.providers.NoJackson; - -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement(name = "serviceResources") -@NoJackson -public class QueryServiceMacroHolder { - private static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA); - private ServiceMacroHolder serviceMacroHolder; - - 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(); } - - public String toJsonString() { - String jsonString = null; - try { - ObjectMapper mapper = new ObjectMapper(); - jsonString = mapper.writeValueAsString(this); - LOGGER.debug ("QueryServiceMacroHolder jsonString: "+jsonString); - } - catch (Exception e) { - LOGGER.debug ("QueryServiceMacroHolder jsonString exception:"+e.getMessage()); - } - return jsonString; - } -} \ No newline at end of file diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworks.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworks.java deleted file mode 100644 index dfc3683fad..0000000000 --- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceNetworks.java +++ /dev/null @@ -1,78 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * OPENECOMP - MSO - * ================================================================================ - * 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.catalogrest; - -import org.openecomp.mso.db.catalog.beans.NetworkResourceCustomization; -import org.openecomp.mso.logger.MsoLogger; -import org.codehaus.jackson.map.ObjectMapper; -import org.jboss.resteasy.annotations.providers.NoJackson; - -import javax.xml.bind.annotation.XmlRootElement; -import java.util.ArrayList; -import java.util.List; - -@XmlRootElement(name = "serviceNetworks") -@NoJackson -public class QueryServiceNetworks { - private static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA); - private List serviceNetworks; - - public QueryServiceNetworks() { super(); serviceNetworks = new ArrayList(); } - public QueryServiceNetworks(List vlist) { - LOGGER.debug ("QueryServiceNetworks:"); - serviceNetworks = new ArrayList(); - for (NetworkResourceCustomization o : vlist) { - LOGGER.debug ("-- o is a serviceNetworks ----"); - LOGGER.debug (o.toString()); - serviceNetworks.add(o); - LOGGER.debug ("-------------------"); - } - } - - public List getServiceNetworks(){ return this.serviceNetworks; } - public void setServiceNetworks(List v) { this.serviceNetworks = v; } - - @Override - public String toString () { - StringBuffer buf = new StringBuffer(); - - boolean first = true; - int i = 1; - for (NetworkResourceCustomization o : serviceNetworks) { - buf.append(i+"\t"); - if (!first) buf.append("\n"); first = false; - buf.append(o); - } - return buf.toString(); - } - - public String toJsonString() { - String jsonString = null; - try { - ObjectMapper mapper = new ObjectMapper(); - jsonString = mapper.writeValueAsString(this); - LOGGER.debug ("QueryServiceNetworks jsonString: "+jsonString); - } - catch (Exception e) { - LOGGER.debug ("QueryServiceNetworks jsonString exception:"+e.getMessage()); - } - return jsonString; - } -} \ No newline at end of file diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfs.java b/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfs.java deleted file mode 100644 index 0ea054309b..0000000000 --- a/adapters/mso-adapters-rest-interface/src/main/java/org/openecomp/mso/adapters/catalogrest/QueryServiceVnfs.java +++ /dev/null @@ -1,79 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * OPENECOMP - MSO - * ================================================================================ - * 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.catalogrest; -/* should be called QueryVnfResource.java */ - -import org.openecomp.mso.db.catalog.beans.VnfResource; -import org.openecomp.mso.logger.MsoLogger; -import org.codehaus.jackson.map.ObjectMapper; -import org.jboss.resteasy.annotations.providers.NoJackson; - -import javax.xml.bind.annotation.XmlRootElement; -import java.util.ArrayList; -import java.util.List; - -@XmlRootElement(name = "serviceVnfs") -@NoJackson -public class QueryServiceVnfs { - private static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA); - private List serviceVnfs; - - public QueryServiceVnfs() { super(); serviceVnfs = new ArrayList(); } - public QueryServiceVnfs(List vlist) { - LOGGER.debug ("QueryServiceVnfs:"); - serviceVnfs = new ArrayList(); - for (VnfResource o : vlist) { - LOGGER.debug ("-- o is a serviceVnfs ----"); - LOGGER.debug (o.toString()); - serviceVnfs.add(o); - LOGGER.debug ("-------------------"); - } - } - - public List getServiceVnfs(){ return this.serviceVnfs; } - public void setServiceVnfs(List v) { this.serviceVnfs = v; } - - @Override - public String toString () { - StringBuffer buf = new StringBuffer(); - - boolean first = true; - int i = 1; - for (VnfResource o : serviceVnfs) { - buf.append(i+"\t"); - if (!first) buf.append("\n"); first = false; - buf.append(o); - } - return buf.toString(); - } - - public String toJsonString() { - String jsonString = null; - try { - ObjectMapper mapper = new ObjectMapper(); - jsonString = mapper.writeValueAsString(this); - LOGGER.debug ("QuerySrviceVnfs jsonString: "+jsonString); - } - catch (Exception e) { - LOGGER.debug ("QuerySrviceVnfs jsonString exception:"+e.getMessage()); - } - return jsonString; - } -} \ No newline at end of file -- cgit 1.2.3-korg