diff options
Diffstat (limited to 'servicegateway/service')
27 files changed, 0 insertions, 2697 deletions
diff --git a/servicegateway/service/pom.xml b/servicegateway/service/pom.xml deleted file mode 100644 index 66cec613..00000000 --- a/servicegateway/service/pom.xml +++ /dev/null @@ -1,78 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2016 Huawei Technologies Co., Ltd. - - 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.openo.gso.gui</groupId> - <artifactId>service-gateway-root</artifactId> - <version>1.1.0-SNAPSHOT</version> - </parent> - - <artifactId>service-gateway-service</artifactId> - <name>gso-gui/servicegateway/service</name> - <packaging>war</packaging> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <cxf.version>3.1.6</cxf.version> - <slf4j.version>1.6.1</slf4j.version> - <maven.test.skip>false</maven.test.skip> - <maven.test.failure.ignore>false</maven.test.failure.ignore> - </properties> - - <profiles> - <profile> - <id>all-tests</id> - <properties> - <build.profile.id>all-tests</build.profile.id> - <skip.unit.tests>false</skip.unit.tests> - </properties> - </profile> - </profiles> - <build> - <finalName>ROOT</finalName> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.1</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - <!-- Used for unit tests --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> - <configuration> - <forkMode>always</forkMode> - <argLine>${surefireArgLine}</argLine> - <skip>${maven.test.skip}</skip> - <!-- - <testFailureIgnore>${maven.test.failure.ignore}</testFailureIgnore> - --> - <testFailureIgnore>true</testFailureIgnore> - <!-- Excludes integration tests when unit tests are run. --> - <excludes> - <exclude>**/IT*.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/activator/Activator.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/activator/Activator.java deleted file mode 100644 index 0055931d..00000000 --- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/activator/Activator.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (c) 2016, Huawei Technologies Co., Ltd. - * - * 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. - */ - -package org.openo.gso.gui.servicegateway.activator; - -import java.io.File; - -import org.apache.commons.lang3.StringUtils; -import org.openo.baseservice.util.impl.SystemEnvVariablesFactory; -import org.openo.gso.gui.servicegateway.constant.Constant; -import org.openo.gso.gui.servicegateway.util.register.RegisterUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Service Start <br/> - * - * @author - * @since GSO 0.5, 2016-8-10 - */ -public class Activator { - - private static final Logger LOGGER = LoggerFactory.getLogger(Activator.class); - - - /** - * start operation by spring <br/> - * - * @param context - * service context - * @author - * @since GSO 0.5, 2016-8-10 - */ - public void start() { - // register restful to M-Bus when starting service - registerService(); - } - - /** - * register the service to M-Bus<br/> - * - * @author - * @since GSO 0.5, 2016-8-10 - */ - private void registerService() { - // get the jsonString form the service file - String root = SystemEnvVariablesFactory.getInstance().getAppRoot(); - String serviceFilePath = root + File.separator + Constant.FILE_PATH_ETC + File.separator - + Constant.FILE_PATH_REGISTER + File.separator + Constant.FILE_PATH_JSON; - String jsonInfo = RegisterUtil.readFile(serviceFilePath); - - // check the jsonInfo - if(StringUtils.isEmpty(jsonInfo)) { - LOGGER.error("ServiceGateway ReadFile fail: jsonInfo is null. the serviceFilePath=" + serviceFilePath); - return; - } - - // register service by the jsonInfo - RegisterUtil.registerService(jsonInfo); - } - - /** - * stop operation by spring <br/> - * - * @param context - * service context - * @author - * @since GSO 0.5, 2016-8-10 - */ - public void stop() { - // no operation - } -} diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/constant/Constant.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/constant/Constant.java deleted file mode 100644 index 3a26a606..00000000 --- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/constant/Constant.java +++ /dev/null @@ -1,174 +0,0 @@ -/* - * Copyright (c) 2016, Huawei Technologies Co., Ltd. - * - * 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. - */ - -package org.openo.gso.gui.servicegateway.constant; - -/** - * Constant definition.<br/> - * <p> - * </p> - * - * @author - * @version GSO 0.5 2016/8/22 - */ -public class Constant { - - /** - * Service instance ID. - */ - public static final String SERVICE_INDENTIFY = "service"; - - /** - * Service instance ID. - */ - public static final String SERVICE_INSTANCE_ID = "serviceId"; - - /** - * Service package ID. - */ - public static final String SERVICE_DEF_ID = "serviceDefId"; - - /** - * Service gateway URL. - */ - public static final String SERVICE_GATEWAY_URI = "gatewayUri"; - - /** - * Service operation. - */ - public static final String SERVICE_OPERATION = "operation"; - - /** - * Service delete operation. - */ - public static final String SERVICE_DELETE_OPERATION = "delete"; - - /** - * Create workflow name. - */ - public static final String WORK_FLOW_PLAN_CREATE = "create"; - - /** - * Delete workflow name. - */ - public static final String WORK_FLOW_PLAN_DELETE = "delete"; - - /** - * filed in wso2 body. - */ - public static final String WSO_PROCESSID = "processId"; - - /** - * filed in wso2 body. - */ - public static final String WSO_PARAMS = "params"; - - /** - * Response result; - */ - public static final String RESPONSE_RESULT = "result"; - - /** - * Response status. - */ - public static final String RESPONSE_STATUS = "status"; - - /** - * Response status description. - */ - public static final String RESPONSE_STATUS_DESCRIPTION = "statusDescription"; - - /** - * Error code of response. - */ - public static final String RESPONSE_ERRORCODE = "errorCode"; - - /** - * Operations success. - */ - public static final String RESPONSE_STATUS_SUCCESS = "success"; - - /** - * Operation failed. - */ - public static final String RESPONSE_STATUS_FAIL = "fail"; - - /** - * ID of instance. - */ - public static final String NS_INSTANCE_ID = "nsInstanceId"; - - /** - * service identify. - */ - public static final String SERVICE_ID = "serviceId"; - - /** - * job Id - */ - public static final String JOB_ID = "jobId"; - - /** - * service file Path:etc - */ - public static final String FILE_PATH_ETC = "etc"; - - /** - * service file Path:register - */ - public static final String FILE_PATH_REGISTER = "register"; - - /** - * service file Path:file name - */ - public static final String FILE_PATH_JSON = "service.json"; - - /** - * the head type for Restful - */ - public static final String HEAD_ERMAP_TYPE = "Content-Type"; - - /** - * the head value for Restful - */ - public static final String HEAD_ERMAP_VALUE = "application/json;charset=UTF-8"; - - /** - * the URL for Register service to the M-service Bus - */ - public static final String M_BUS_REGISTER_URL = "/openoapi/microservices/v1/services"; - - /** - * the IP key for the service file - */ - public static final String SERVICE_KEY_IP = "getInputIP"; - - /** - * constant:0 - */ - public static final int ZERO = 0; - - /** - * Constructor<br/> - * <p> - * </p> - * - * @since GSO 0.5 - */ - private Constant() { - - } -} diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/exception/ErrorCode.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/exception/ErrorCode.java deleted file mode 100644 index d3519a05..00000000 --- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/exception/ErrorCode.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2016, Huawei Technologies Co., Ltd. - * - * 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. - */ - -package org.openo.gso.gui.servicegateway.exception; - -/** - * Constant Class.<br/> - * <p> - * Define constant for recording error. - * </p> - * - * @author - * @version GSO 0.5 2016/8/4 - */ -public class ErrorCode { - - /** - * Fail to operate database. - */ - public static final String SVCMGR_OPER_MYSQL_DB_ERROR = "servicemgr.mysql.oper_mysql_db_error"; - - /** - * Parameter is wrong. - */ - public static final String SVCMGR_SERVICEMGR_BAD_PARAM = "servicemgr.bad_param"; - - /** - * Operation is failure. - */ - public static final String SVCMGR_SERVICEMGR_FAIL_OPERATION = "servicemgr.fail.operation"; - - /** - * Package is being deleted. - */ - public static final String SVCMGR_PACKAGE_BEING_DELETED = "servicemgr.package.beingDelete"; - - /** - * operation fail - */ - public static final int FAIL = 3; - - /** - * operation partial success - */ - public static final int PARTIAL_SUCCESS = 1; - - /** - * operation success - */ - public static final int SUCCESS = 0; - - /** - * Constructor<br/> - * <p> - * </p> - * - * @since GSO 0.5 - */ - private ErrorCode() { - - } -} diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/exception/HttpCode.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/exception/HttpCode.java deleted file mode 100644 index 473de721..00000000 --- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/exception/HttpCode.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright (c) 2016, Huawei Technologies Co., Ltd. - * - * 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. - */ - -package org.openo.gso.gui.servicegateway.exception; - -/** - * Constant Class.<br/> - * <p> - * Define constant for http operation. - * </p> - * - * @author - * @version GSO 0.5 2016/8/4 - */ -public class HttpCode { - - /** - * Fail to request. - */ - public static final int BAD_REQUEST = 400; - - /** - * Inner error - */ - public static final int INTERNAL_SERVER_ERROR = 500; - - /** - * Not accept request. - */ - public static final int NOT_ACCEPTABLE = 406; - - /** - * Not found service. - */ - public static final int NOT_FOUND = 404; - - /** - * Accept request. - */ - public static final int RESPOND_ACCEPTED = 202; - - /** - * Http response is ok. - */ - public static final int RESPOND_OK = 200; - - public static final int CREATED_OK = 201; - - /** - * Conflict - */ - public static final int RESPOND_CONFLICT = 409; - - /** - * Constructor<br/> - * <p> - * </p> - * - * @since GSO 0.5 - */ - private HttpCode() { - - } - - /** - * Whether request is successful.<br/> - * - * @param httpCode response code - * @return true or false - * @since GSO 0.5 - */ - public static boolean isSucess(int httpCode) { - return httpCode / 100 == 2; - } -} diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/roa/impl/ServiceGatewayRoaModuleImpl.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/roa/impl/ServiceGatewayRoaModuleImpl.java deleted file mode 100644 index 059e6fdc..00000000 --- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/roa/impl/ServiceGatewayRoaModuleImpl.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright (c) 2016, Huawei Technologies Co., Ltd. - * - * 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. - */ - -package org.openo.gso.gui.servicegateway.roa.impl; - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Response; - -import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.baseservice.util.RestUtils; -import org.openo.gso.gui.servicegateway.constant.Constant; -import org.openo.gso.gui.servicegateway.exception.HttpCode; -import org.openo.gso.gui.servicegateway.roa.inf.IServiceGatewayRoaModule; -import org.openo.gso.gui.servicegateway.service.impl.ServiceGatewayImpl; -import org.openo.gso.gui.servicegateway.service.inf.IServiceGateway; -import org.openo.gso.gui.servicegateway.util.http.ResponseUtils; -import org.openo.gso.gui.servicegateway.util.validate.ValidateUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Implement class for restful interface.<br/> - * <p> - * </p> - * - * @author - * @version GSO 0.5 2016/8/4 - */ -public class ServiceGatewayRoaModuleImpl implements IServiceGatewayRoaModule { - - /** - * Log server. - */ - private static final Logger LOGGER = LoggerFactory.getLogger(ServiceGatewayRoaModuleImpl.class); - - /** - * Service manager. - */ - private IServiceGateway serviceGateway = new ServiceGatewayImpl(); - - /** - * Create service instance.<br/> - * - * @param servletReq http request - * @return response - * @throws ServiceException when operate database or parameter is wrong. - * @since GSO 0.5 - */ - @Override - public Response createService(HttpServletRequest servletReq) { - Map<String, Object> operateStatus = null; - Map<String, Object> result = null; - String serviceId = null; - try { - // 1. Check validation - String reqContent = RestUtils.getRequestBody(servletReq); - ValidateUtil.assertStringNotNull(reqContent); - LOGGER.info("Received a request form the NBI the reqContent is :"+ reqContent); - - // 2. Create service - serviceId = serviceGateway.createService(reqContent, servletReq); - } catch(ServiceException exception) { - LOGGER.error("Fail to create service instance."); - operateStatus = ResponseUtils.setOperateStatus(Constant.RESPONSE_STATUS_FAIL, exception, - String.valueOf(exception.getHttpCode())); - result = ResponseUtils.setResult(serviceId, operateStatus); - - return Response.accepted().entity(result).build(); - } - - operateStatus = ResponseUtils.setOperateStatus(Constant.RESPONSE_STATUS_SUCCESS, null, - String.valueOf(HttpCode.RESPOND_OK)); - result = ResponseUtils.setResult(serviceId, operateStatus); - - return Response.accepted().entity(result).build(); - } - - /** - * Delete service instance.<br/> - * - * @param serviceId service instance id - * @param servletReq http request - * @return response - * @throws ServiceException when operate database or parameter is wrong. - * @since GSO 0.5 - */ - @Override - public Response deleteService(String serviceId, HttpServletRequest servletReq) { - Map<String, Object> result = null; - try { - // 1. Check validation - String reqContent = RestUtils.getRequestBody(servletReq); - ValidateUtil.assertStringNotNull(reqContent); - - // 2. Delete service - result = serviceGateway.deleteService(serviceId, reqContent, servletReq); - } catch(ServiceException exception) { - LOGGER.error("Fail to delete service instance."); - return Response.serverError().build(); - } - return Response.accepted().entity(result).build(); - } - - public IServiceGateway getServiceGateway() - { - return serviceGateway; - } - - public void setServiceGateway(IServiceGateway serviceGateway) - { - this.serviceGateway = serviceGateway; - } - -} diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/roa/inf/IServiceGatewayRoaModule.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/roa/inf/IServiceGatewayRoaModule.java deleted file mode 100644 index 0e8b03ce..00000000 --- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/roa/inf/IServiceGatewayRoaModule.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2016, Huawei Technologies Co., Ltd. - * - * 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. - */ - -package org.openo.gso.gui.servicegateway.roa.inf; - -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.Response; - -import org.openo.baseservice.remoteservice.exception.ServiceException; - -/** - * API for restful interface.<br/> - * <p> - * </p> - * - * @author - * @version GSO 0.5 2016/8/4 - */ -@Path("/servicegateway/v1/services") -@Consumes({"application/json"}) -@Produces({"application/json"}) -public interface IServiceGatewayRoaModule { - - /** - * Create service instance.<br/> - * - * @param servletReq http request - * @return response - * @throws ServiceException when operate database or parameter is wrong. - * @since GSO 0.5 - */ - @POST - @Produces({"application/json"}) - @Consumes({"application/json"}) - Response createService(@Context HttpServletRequest servletReq) throws ServiceException; - - /** - * Delete service instance.<br/> - * - * @param serviceId service instance id - * @param servletReq http request - * @return response - * @throws ServiceException when operate database or parameter is wrong. - * @since GSO 0.5 - */ - @POST - @Produces({"application/json"}) - @Consumes({"application/json"}) - @Path("/{serviceId}/terminate") - Response deleteService(@PathParam("serviceId") String serviceId, @Context HttpServletRequest servletReq) - throws ServiceException; - -} diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImpl.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImpl.java deleted file mode 100644 index aea5ee98..00000000 --- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImpl.java +++ /dev/null @@ -1,196 +0,0 @@ -/* - * Copyright (c) 2016, Huawei Technologies Co., Ltd. - * - * 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. - */ - -package org.openo.gso.gui.servicegateway.service.impl; - -import java.util.HashMap; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang.StringUtils; -import org.openo.baseservice.remoteservice.exception.ExceptionArgs; -import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.baseservice.roa.util.restclient.RestfulFactory; -import org.openo.baseservice.roa.util.restclient.RestfulParametes; -import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.baseservice.util.RestUtils; -import org.openo.gso.gui.servicegateway.constant.Constant; -import org.openo.gso.gui.servicegateway.exception.HttpCode; -import org.openo.gso.gui.servicegateway.service.inf.IServiceGateway; -import org.openo.gso.gui.servicegateway.util.json.JsonUtil; -import org.openo.gso.gui.servicegateway.util.validate.ValidateUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * ServiceGateway service class.<br/> - * <p> - * </p> - * - * @author - * @version GSO 0.5 2016/8/4 - */ -public class ServiceGatewayImpl implements IServiceGateway { - - /** - * Log service. - */ - private static final Logger LOGGER = LoggerFactory.getLogger(ServiceGatewayImpl.class); - - - /** - * Create service instance.<br/> - * - * @param reqContent content of request - * @param httpRequest http request - * @throws ServiceException when operate DB or parameter is wrong. - * @since GSO 0.5 - */ - @SuppressWarnings("unchecked") - @Override - public String createService(String reqContent, HttpServletRequest httpRequest) throws ServiceException { - // check the value - if(StringUtils.isEmpty(reqContent)) - { - LOGGER.error("ServiceGatewayImpl createService reqContent is null."); - throw new ServiceException("ServiceGatewayImpl createService reqContent is null."); - } - - // Parse request - Map<String, Object> requestBody = JsonUtil.unMarshal(reqContent, Map.class); - Map<String, Object> service = (Map<String, Object>)requestBody.get(Constant.SERVICE_INDENTIFY); - if(null == service) - { - service = requestBody; - } - ValidateUtil.assertObjectNotNull(requestBody); - - // Validate data - String gatewayUri = (String)service.get(Constant.SERVICE_GATEWAY_URI); - ValidateUtil.assertStringNotNull(gatewayUri); - service.remove(Constant.SERVICE_GATEWAY_URI); - - // call the restful - String id = null; - try { - LOGGER.info("Send the cretation RESTful request to orchestrator.The Body is"+ requestBody.toString()); - RestfulResponse restfulRsp = RestfulFactory.getRestInstance("http").post(gatewayUri, - getRestfulParameters(JsonUtil.marshal(requestBody))); - LOGGER.info("Receive the cretation RESTful response from orchestrator.The status is:"+restfulRsp.getStatus()+" the content is:"+ - restfulRsp.getResponseContent()); - if (null != restfulRsp) - { - // Record the result of registration - // (201:success;415:Invalid Parameter;500:Internal Server Error) - LOGGER.info("restful call result:"+ restfulRsp.getStatus()); - if(restfulRsp.getStatus() == HttpCode.RESPOND_ACCEPTED || restfulRsp.getStatus() == HttpCode.RESPOND_OK || restfulRsp.getStatus() == HttpCode.CREATED_OK) - { - Map<String,Object> rspBody = JsonUtil.unMarshal(restfulRsp.getResponseContent(),Map.class); - id = (String)rspBody.get(Constant.SERVICE_ID); - id = (null == id) ? (String)rspBody.get(Constant.NS_INSTANCE_ID) : id; - id = (null == id) ? (String)rspBody.get(Constant.JOB_ID) : id; - } - else - { - ExceptionArgs args = new ExceptionArgs(); - args.setDescArgs(new String[] {"Fail to create service:" + restfulRsp.getResponseContent()}); - throw new ServiceException(ServiceException.DEFAULT_ID, restfulRsp.getStatus(), args); - } - } - } catch(ServiceException e) { - LOGGER.error("service gateway create restful call result:", e); - throw e; - } - - return id; - } - - /** - * get the parameters for restful<br/> - * - * @author - * @param bodyData - * Json Body - * @return the RestfulParametes Instance - * @since GSO 0.5, 2016-8-9 - */ - private static RestfulParametes getRestfulParameters(final String bodyData) { - RestfulParametes param = new RestfulParametes(); - param.putHttpContextHeader(Constant.HEAD_ERMAP_TYPE, Constant.HEAD_ERMAP_VALUE); - param.setRawData(bodyData); - return param; - } - - /** - * Delete service instances.<br/> - * - * @param serviceId service instance ID - * @param httpRequest http request - * @throws ServiceException operate DB or parameter is wrong. - * @since GSO 0.5 - */ - @Override - public Map<String, Object> deleteService(String serviceId, String reqContent, HttpServletRequest httpRequest) throws ServiceException { - if(httpRequest == null) - { - LOGGER.error("ServiceGatewayImpl.deleteService httpRequest is null"); - throw new ServiceException("ServiceGatewayImpl.deleteService httpRequest is null"); - } - // Parse request - Map<String, Object> requestBody = JsonUtil.unMarshal(reqContent, Map.class); - ValidateUtil.assertObjectNotNull(requestBody); - - // Validate data - String gatewayUri = (String)requestBody.get(Constant.SERVICE_GATEWAY_URI); - ValidateUtil.assertStringNotNull(gatewayUri); - requestBody.remove(Constant.SERVICE_GATEWAY_URI); - - String operation = (String) requestBody.get(Constant.SERVICE_OPERATION); - ValidateUtil.assertStringNotNull(operation); - requestBody.remove(Constant.SERVICE_OPERATION); - - // call the restful - try { - RestfulResponse restfulRsp = null; - Map<String, Object> result = new HashMap<String, Object>(); - if(Constant.SERVICE_DELETE_OPERATION.equalsIgnoreCase(operation)) { - restfulRsp = RestfulFactory.getRestInstance("http").delete(gatewayUri, - getRestfulParameters(JsonUtil.marshal(requestBody))); - result.put(Constant.RESPONSE_STATUS, "success"); - result.put(Constant.RESPONSE_STATUS_DESCRIPTION, "It is deleting."); - result.put(Constant.RESPONSE_ERRORCODE, "202"); - } else { - restfulRsp = RestfulFactory.getRestInstance("http").post(gatewayUri, - getRestfulParameters(JsonUtil.marshal(requestBody))); - if (null != restfulRsp) { - Map<String,Object> rspBody = JsonUtil.unMarshal(restfulRsp.getResponseContent(),Map.class); - String jobId = (String)rspBody.get(Constant.JOB_ID); - result.put(Constant.JOB_ID, jobId); - } - } - if (null != restfulRsp) { - LOGGER.info("restful call result: {}", restfulRsp.getStatus()); - LOGGER.info("restful call content:{}", restfulRsp.getResponseContent()); - } - return result; - } catch(ServiceException e) { - LOGGER.error("service gateway delete restful call result:", e); - throw e; - } - } - -} diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/inf/IServiceGateway.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/inf/IServiceGateway.java deleted file mode 100644 index a5f6b6fa..00000000 --- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/inf/IServiceGateway.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2016, Huawei Technologies Co., Ltd. - * - * 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. - */ - -package org.openo.gso.gui.servicegateway.service.inf; - - -import javax.servlet.http.HttpServletRequest; - -import org.openo.baseservice.remoteservice.exception.ServiceException; - -import java.util.Map; - -/** - * Interface to operate service.<br/> - * <p> - * </p> - * - * @author - * @version GSO 0.5 2016/8/4 - */ -public interface IServiceGateway { - - /** - * Create service instance.<br/> - * - * @param reqContent content of request - * @param httpRequest http request - * @return service instance - * @throws ServiceException when operate DB or parameter is wrong. - * @since GSO 0.5 - */ - String createService(String reqContent, HttpServletRequest httpRequest) throws ServiceException; - - /** - * Delete service instances.<br/> - * - * @param serviceId service instance ID - * @param httpRequest http request - * @throws ServiceException operate DB or parameter is wrong. - * @since GSO 0.5 - */ - Map<String, Object> deleteService(String serviceId, String reqContent, HttpServletRequest httpRequest) throws ServiceException; - -} diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/util/http/HttpUtil.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/util/http/HttpUtil.java deleted file mode 100644 index d255f31a..00000000 --- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/util/http/HttpUtil.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright (c) 2016, Huawei Technologies Co., Ltd. - * - * 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. - */ - -package org.openo.gso.gui.servicegateway.util.http; - -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.baseservice.roa.util.restclient.RestfulFactory; -import org.openo.baseservice.roa.util.restclient.RestfulParametes; -import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.gso.gui.servicegateway.util.json.JsonUtil; - -/** - * Method class that provides interface to do http request.<br/> - * <p> - * </p> - * - * @author - * @version GSO 0.5 2016/9/1 - */ -public class HttpUtil { - - /** - * Constructor<br/> - * <p> - * </p> - * - * @since GSO 0.5 - */ - private HttpUtil() { - - } - - /** - * Get operation.<br/> - * - * @param url request location - * @param httpHeaders request headers - * @param httpRequest http request - * @return response - * @throws ServiceException when request is failure. - * @since GSO 0.5 - */ - public static RestfulResponse get(final String url, final Map<String, String> httpHeaders, - HttpServletRequest httpRequest) throws ServiceException { - final RestfulParametes restfulParametes = getRestfulParametes(httpRequest); - for(Map.Entry<String, String> entry : httpHeaders.entrySet()) { - restfulParametes.putHttpContextHeader(entry.getKey(), entry.getValue()); - } - - return RestfulFactory.getRestInstance(RestfulFactory.PROTO_HTTP).get(url, restfulParametes); - } - - /** - * Post operation.<br/> - * - * @param url request location - * @param sendObj request body - * @param httpRequest http request - * @return response - * @throws ServiceException when request is failure. - * @since GSO 0.5 - */ - public static RestfulResponse post(final String url, Object sendObj, HttpServletRequest httpRequest) - throws ServiceException { - - final RestfulParametes restfulParametes = getRestfulParametes(httpRequest); - if(sendObj != null) { - String strJsonReq = JsonUtil.marshal(sendObj); - restfulParametes.setRawData(strJsonReq); - } - - return RestfulFactory.getRestInstance(RestfulFactory.PROTO_HTTP).post(url, restfulParametes); - } - - /** - * Delete operation.<br/> - * - * @param url request location - * @param httpRequest http request - * @return response - * @throws ServiceException when request is failure. - * @since GSO 0.5 - */ - public static RestfulResponse delete(final String url, HttpServletRequest httpRequest) throws ServiceException { - final RestfulParametes restfulParametes = getRestfulParametes(httpRequest); - return RestfulFactory.getRestInstance(RestfulFactory.PROTO_HTTP).delete(url, restfulParametes); - } - - /** - * Put operation.<br/> - * - * @param url request location - * @param httpHeaders request headers - * @param httpRequest http request - * @return response - * @throws ServiceException when request is failure. - * @since GSO 0.5 - */ - public static RestfulResponse put(final String url, final Map<String, String> httpHeaders, - HttpServletRequest httpRequest) throws ServiceException { - final RestfulParametes restfulParametes = getRestfulParametes(httpRequest); - for(Map.Entry<String, String> entry : httpHeaders.entrySet()) { - restfulParametes.putHttpContextHeader(entry.getKey(), entry.getValue()); - } - - return RestfulFactory.getRestInstance(RestfulFactory.PROTO_HTTP).put(url, restfulParametes); - } - - /** - * Fill in request parameters.<br/> - * - * @param httpRequest http request - * @return rest parameters - * @since GSO 0.5 - */ - public static RestfulParametes getRestfulParametes(HttpServletRequest httpRequest) { - final RestfulParametes restfulParametes = new RestfulParametes(); - restfulParametes.putHttpContextHeader("Content-Type", "application/json;charset=UTF-8"); - return restfulParametes; - } -} diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/util/http/ResponseUtils.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/util/http/ResponseUtils.java deleted file mode 100644 index eb753aa8..00000000 --- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/util/http/ResponseUtils.java +++ /dev/null @@ -1,175 +0,0 @@ -/* - * Copyright (c) 2016, Huawei Technologies Co., Ltd. - * - * 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. - */ - -package org.openo.gso.gui.servicegateway.util.http; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import org.codehaus.jackson.type.TypeReference; -import org.openo.baseservice.remoteservice.exception.ExceptionArgs; -import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.gso.gui.servicegateway.constant.Constant; -import org.openo.gso.gui.servicegateway.exception.ErrorCode; -import org.openo.gso.gui.servicegateway.exception.HttpCode; -import org.openo.gso.gui.servicegateway.util.json.JsonUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Interface to deal response result.<br/> - * <p> - * </p> - * - * @author - * @version GSO 0.5 2016/9/1 - */ -public class ResponseUtils { - - /** - * Log server - */ - private static final Logger LOGGER = LoggerFactory.getLogger(ResponseUtils.class); - - /** - * Constructor<br/> - * <p> - * </p> - * - * @since GSO 0.5 - */ - private ResponseUtils() { - } - - /** - * Check whether there is exception.<br/> - * <p> - * If fail, throw the exception. - * </p> - * - * @param response rest response - * @param function function name - * @throws ServiceException when the result of rest request is failure. - * @since GSO 0.5 - */ - public static void checkResonseAndThrowException(RestfulResponse response, String function) - throws ServiceException { - if(!HttpCode.isSucess(response.getStatus())) { - ServiceException roaExceptionInfo = null; - try { - roaExceptionInfo = JsonUtil.unMarshal(response.getResponseContent(), ServiceException.class); - } catch(ServiceException e) { - LOGGER.error("transfer the response json string has some error: {}", e); - - ExceptionArgs args = new ExceptionArgs(); - args.setDescArgs(new String[] {"Fail to " + function}); - - throw new ServiceException(ServiceException.DEFAULT_ID, response.getStatus(), args); - } - - throw roaExceptionInfo; - } - } - - /** - * Parse data to assigned type model.<br/> - * - * @param request restful request - * @param key key - * @param type type - * @return model data - * @throws ServiceException when transfer failed - * @since SDNO 0.5 - */ - @SuppressWarnings("unchecked") - public static <T> List<T> getDataModelFromRsp(String request, String key, Class<T> type) throws ServiceException { - //ValidateUtil.assertStringNotNull(request); - Map<String, Object> requestMap = JsonUtil.unMarshal(request, Map.class); - Object data = requestMap.get(key); - List<T> dataModelList = new LinkedList<T>(); - if(data instanceof List) { - for(Object model : (List<T>)data) { - if(!(model instanceof Map)) { - LOGGER.error("The format of response content is wrong! Not Map."); - throw new ServiceException(ErrorCode.SVCMGR_SERVICEMGR_BAD_PARAM, - "The format of response content is wrong."); - } - - dataModelList.add(JsonUtil.unMarshal(JsonUtil.marshal(model), type)); - } - } - - return dataModelList; - } - - /** - * Parse data to assigned type model.<br/> - * - * @param request restful request - * @param type type - * @return model data - * @throws ServiceException when transfer failed - * @since SDNO 0.5 - */ - public static <T> T getDataModelFromRspList(String request, TypeReference<T> type) throws ServiceException { - //ValidateUtil.assertStringNotNull(request); - return JsonUtil.unMarshal(request, type); - } - - /** - * Set operation result.<br/> - * - * @param status status fail or success - * @param exception operation exception information - * @param errorCode error code - * @return result in form of map - * @since GSO 0.5 - */ - public static Map<String, Object> setOperateStatus(String status, ServiceException exception, String errorCode) { - Map<String, Object> result = new HashMap<String, Object>(); - result.put(Constant.RESPONSE_STATUS, status); - if(null == exception) { - result.put(Constant.RESPONSE_STATUS_DESCRIPTION, status); - } else { - if((null != exception.getExceptionArgs()) && (null != exception.getExceptionArgs().getDescArgs())) { - result.put(Constant.RESPONSE_STATUS_DESCRIPTION, Arrays.asList(exception.getExceptionArgs().getDescArgs()).toString()); - } - } - result.put(Constant.RESPONSE_ERRORCODE, errorCode); - return result; - } - - /** - * Assemble operation result.<br/> - * - * @param objectId instance ID - * @param operateCode operation result - * @return Response result - * @since GSO 0.5 - */ - public static Map<String, Object> setResult(String objectId, Object operateCode) { - Map<String, Object> result = new HashMap<String, Object>(); - result.put(Constant.RESPONSE_RESULT, operateCode); - String serviceId = (null != objectId) ? objectId : null; - result.put(Constant.SERVICE_INSTANCE_ID, serviceId); - - return result; - } -} diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/util/json/JsonUtil.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/util/json/JsonUtil.java deleted file mode 100644 index 683f5d9b..00000000 --- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/util/json/JsonUtil.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright (c) 2016, Huawei Technologies Co., Ltd. - * - * 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. - */ - -package org.openo.gso.gui.servicegateway.util.json; - -import java.io.IOException; - -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; -import org.codehaus.jackson.type.TypeReference; -import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.gso.gui.servicegateway.exception.ErrorCode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import net.sf.json.JSON; - -/** - * Interface for json analyzing.<br/> - * <p> - * </p> - * - * @author - * @version GSO 0.5 2016/9/1 - */ -public class JsonUtil { - - /** - * Log service - */ - private static final Logger LOGGER = LoggerFactory.getLogger(JsonUtil.class); - - /** - * Mapper. - */ - private static final ObjectMapper MAPPER = new ObjectMapper(); - - static { - MAPPER.setDeserializationConfig(MAPPER.getDeserializationConfig() - .without(org.codehaus.jackson.map.DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES)); - MAPPER.setSerializationInclusion(Inclusion.NON_NULL); - } - - /** - * Constructor<br/> - * <p> - * </p> - * - * @since GSO 0.5 - */ - private JsonUtil() { - - } - - /** - * Parse the string in form of json.<br/> - * - * @param jsonstr json string. - * @param type that convert json string to - * @return - * @throws ServiceException - * @since GSO 0.5 - */ - public static <T> T unMarshal(String jsonstr, Class<T> type) throws ServiceException { - try { - return MAPPER.readValue(jsonstr, type); - } catch(IOException e) { - LOGGER.error("jsonstr unMarshal failed!", e); - throw new ServiceException(ErrorCode.SVCMGR_SERVICEMGR_BAD_PARAM, "jsonstr unMarshal failed!"); - } - } - - /** - * Parse the string in form of json.<br/> - * - * @param jsonstr json string. - * @param type that convert json string to - * @return - * @throws ServiceException - * @since GSO 0.5 - */ - public static <T> T unMarshal(String jsonstr, TypeReference<T> type) throws ServiceException { - try { - return MAPPER.readValue(jsonstr, type); - } catch(IOException e) { - LOGGER.error("jsonstr unMarshal failed!", e); - throw new ServiceException(ErrorCode.SVCMGR_SERVICEMGR_BAD_PARAM, "jsonstr unMarshal failed!"); - } - } - - /** - * Convert object to json string.<br/> - * - * @param srcObj data object - * @return json string - * @throws ServiceException when fail to convert. - * @since GSO 0.5 - */ - public static String marshal(Object srcObj) throws ServiceException { - if(srcObj instanceof JSON) { - return srcObj.toString(); - } - try { - return MAPPER.writeValueAsString(srcObj); - } catch(IOException e) { - LOGGER.error("srcObj marshal failed!", e); - throw new ServiceException(ErrorCode.SVCMGR_SERVICEMGR_BAD_PARAM, "srcObj marshal failed!"); - } - } - - /** - * Get mapper.<br/> - * - * @return mapper - * @since GSO 0.5 - */ - public static ObjectMapper getMapper() { - return MAPPER; - } -} diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/util/register/RegisterUtil.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/util/register/RegisterUtil.java deleted file mode 100644 index 4e8b6bd3..00000000 --- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/util/register/RegisterUtil.java +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright 2016 Huawei Technologies Co., Ltd. - * - * 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. - */ - -package org.openo.gso.gui.servicegateway.util.register; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.net.InetAddress; -import java.net.UnknownHostException; - -import org.apache.commons.lang.StringUtils; -import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.baseservice.roa.util.restclient.RestfulFactory; -import org.openo.baseservice.roa.util.restclient.RestfulParametes; -import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.gso.commsvc.common.constant.Constant; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Register Tool <br/> - * - * @author - * @since GSO 0.5, 2016-8-9 - */ -public class RegisterUtil { - - /** - * Logger - */ - private static final Logger LOGGER = LoggerFactory.getLogger(RegisterUtil.class); - - private RegisterUtil() { - } - - /** - * register the service to M-Bus by the parameter<br/> - * - * @author - * @param jsonInfo - * register body Data - * @since GSO 0.5, 2016-8-9 - */ - public static void registerService(final String jsonInfo) { - // check the parameter - if (StringUtils.isEmpty(jsonInfo)) { - LOGGER.error("RegisterUtil registerService jsonInfo is null"); - return; - } - - // replace the remote IP Address by the jsonInfo - String bodyData = jsonInfo; - boolean isIPExist = bodyData.indexOf(Constant.SERVICE_KEY_IP) > Constant.ZERO; - try { - // get the local IP address - String localIP = InetAddress.getLocalHost().getHostAddress(); - - // if the jsonInfo have the getInputIP string,start to replace the - // local IP - if (isIPExist) { - if (!StringUtils.isEmpty(localIP)) { - bodyData = bodyData.replace(Constant.SERVICE_KEY_IP, localIP); - } else { - LOGGER.error("RegisterUtil registerService localIP is null"); - return; - } - } - } catch (UnknownHostException e) { - LOGGER.error("RegisterUtil registerService getHostAddress fail:", e); - if (isIPExist) { - // if get local IP failed In the isIPExist is true ,operation is - // stopped. - return; - } - } - - // register the service to M-bus by the restful Interface - try { - RestfulResponse restfulRsp = RestfulFactory.getRestInstance("http").post(Constant.M_BUS_REGISTER_URL, - getRestfulParameters(bodyData)); - if (null != restfulRsp) { - // Record the result of registration - // (201:success;415:Invalid Parameter;500:Internal Server Error) - LOGGER.info("RegisterUtil registerService register result:", restfulRsp.getStatus()); - } - } catch (ServiceException e) { - LOGGER.error("RegisterUtil registerService post fail:", e); - } - } - - /** - * get the parameters for restful<br/> - * - * @author - * @param bodyData - * Json Body - * @return the RestfulParametes Instance - * @since GSO 0.5, 2016-8-9 - */ - private static RestfulParametes getRestfulParameters(final String bodyData) { - RestfulParametes param = new RestfulParametes(); - param.putHttpContextHeader(Constant.HEAD_ERMAP_TYPE, Constant.HEAD_ERMAP_VALUE); - param.setRawData(bodyData); - return param; - } - - /** - * read the service file<br/> - * - * @param path - * the service File Path - * @return jsonString - * @since GSO 0.5, 2016-8-9 - */ - public static String readFile(String path) { - // check parameter - if (StringUtils.isEmpty(path)) { - return null; - } - - File file = new File(path); - BufferedReader reader = null; - String laststr = ""; - try { - reader = new BufferedReader(new FileReader(file)); - String tempString = null; - // Read one line at a time until the end of the null file. - while ((tempString = reader.readLine()) != null) { - // add the line - laststr = laststr + tempString; - } - reader.close(); - } catch (IOException e) { - LOGGER.error("GSO ReadFile fail.", e); - } finally { - if (reader != null) { - try { - reader.close(); - } catch (IOException e1) { - LOGGER.error("GSO ReadFile reader close fail.", e1); - } - } - } - return laststr; - } -} diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/util/validate/ValidateUtil.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/util/validate/ValidateUtil.java deleted file mode 100644 index 461163ea..00000000 --- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/util/validate/ValidateUtil.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright 2016 Huawei Technologies Co., Ltd. - * - * 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. - */ - -package org.openo.gso.gui.servicegateway.util.validate; - -import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.gso.gui.servicegateway.exception.ErrorCode; -import org.openo.gso.gui.servicegateway.exception.HttpCode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.util.StringUtils; - -/** - * Validate Util <br/> - * <p> - * </p> - * - * @author - * @version GSO 0.5 2016/8/19 - */ -public class ValidateUtil { - - /** - * Log server. - */ - private static final Logger LOGGER = LoggerFactory.getLogger(ValidateUtil.class); - - /** - * Constructor<br/> - * <p> - * </p> - * - * @since GSO 0.5 - */ - private ValidateUtil() { - - } - - /** - * Assert String parameter.<br/> - * - * @param param parameter data - * @throws ServiceException when parameter is null or empty. - * @since GSO 0.5 - */ - public static void assertStringNotNull(String param) throws ServiceException { - if(StringUtils.hasLength(param)) { - return; - } - - LOGGER.error("Parameter is null or empty."); - throw new ServiceException(ErrorCode.SVCMGR_SERVICEMGR_BAD_PARAM, HttpCode.BAD_REQUEST); - } - - /** - * Assert object is null.<br/> - * - * @param object data object - * @throws ServiceException when object is null. - * @since GSO 0.5 - */ - public static void assertObjectNotNull(Object object) throws ServiceException { - if(null == object) { - LOGGER.error("Object is null."); - throw new ServiceException(ErrorCode.SVCMGR_SERVICEMGR_BAD_PARAM, "Object is null."); - } - - } - -} diff --git a/servicegateway/service/src/main/resources/META-INF/auth.properties b/servicegateway/service/src/main/resources/META-INF/auth.properties deleted file mode 100644 index 121f2944..00000000 --- a/servicegateway/service/src/main/resources/META-INF/auth.properties +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################### -# /* -# * Copyright (c) 2016, Huawei Technologies Co., Ltd. -# * -# * 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. -# */ -############################################################################### -auth=disable diff --git a/servicegateway/service/src/main/resources/log4j.properties b/servicegateway/service/src/main/resources/log4j.properties deleted file mode 100644 index ee3b9462..00000000 --- a/servicegateway/service/src/main/resources/log4j.properties +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2016 Huawei Technologies Co., Ltd. - -# 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. -log4j.rootLogger=INFO,root -log4j.appender.root.Append=true -log4j.appender.root.File=${catalina.base}/logs/servicegateway.log -log4j.appender.root.layout.ConversionPattern=%d %-5p [%t][%X{moduleID}][%C %L] %m%n -log4j.appender.root.layout=org.apache.log4j.PatternLayout -log4j.appender.root.MaxBackupIndex=50 -log4j.appender.root.MaxFileSize=20MB -log4j.appender.root=org.apache.log4j.RollingFileAppender
\ No newline at end of file diff --git a/servicegateway/service/src/main/resources/service-configure.properties b/servicegateway/service/src/main/resources/service-configure.properties deleted file mode 100644 index 45c2564b..00000000 --- a/servicegateway/service/src/main/resources/service-configure.properties +++ /dev/null @@ -1,17 +0,0 @@ -###############################################################################
-# /*
-# * Copyright (c) 2016, Huawei Technologies Co., Ltd.
-# *
-# * 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.
-# */
-###############################################################################
diff --git a/servicegateway/service/src/main/resources/spring/service.xml b/servicegateway/service/src/main/resources/spring/service.xml deleted file mode 100644 index 7ebfc4f8..00000000 --- a/servicegateway/service/src/main/resources/spring/service.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2016 Huawei Technologies Co., Ltd. - - 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. ---> -<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:ctx="http://www.springframework.org/schema/context" xmlns:context="http://www.springframework.org/schema/context" - xmlns:oms="http://www.huawei.com/schema/oms" - xsi:schemaLocation=" - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context.xsd - http://www.huawei.com/schema/oms - http://www.huawei.com/schema/oms/oms.xsd - http://cxf.apache.org/jaxrs - http://cxf.apache.org/schemas/jaxrs.xsd"> - <!-- these are included in the dependency jar --> - <import resource="classpath:META-INF/cxf/cxf.xml" /> - <import resource="classpath:META-INF/cxf/cxf-servlet.xml" /> - - <!-- jar rest server registration --> - <jaxrs:server id="sampleServer" address="/"> - <!-- registering beans --> - <jaxrs:serviceBeans> - <ref bean="serviceGatewayRoaModuleImpl"></ref> - </jaxrs:serviceBeans> - <!-- registering providers --> - <jaxrs:providers> - <bean class="org.codehaus.jackson.jaxrs.JacksonJsonProvider" /> - </jaxrs:providers> - </jaxrs:server> - - <bean class="org.openo.gso.gui.servicegateway.activator.Activator"></bean> - - <bean id="Activator" class="org.openo.gso.gui.servicegateway.activator.Activator" init-method="start" destroy-method="stop"> - </bean> - - <bean id="serviceGatewayRoaModuleImpl" class="org.openo.gso.gui.servicegateway.roa.impl.ServiceGatewayRoaModuleImpl"> - <property name="serviceGateway" ref="serviceGateway"></property> - </bean> - - <bean id="serviceGateway" class="org.openo.gso.gui.servicegateway.service.impl.ServiceGatewayImpl"> - </bean> -</beans>
\ No newline at end of file diff --git a/servicegateway/service/src/main/webapp/WEB-INF/web.xml b/servicegateway/service/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 174ba383..00000000 --- a/servicegateway/service/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2016 Huawei Technologies Co., Ltd. - - 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. ---> - -<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee - http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - - <servlet> - <servlet-name>CXFServlet</servlet-name> - <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class> - <load-on-startup>1</load-on-startup> - <init-param> - <param-name>hide-service-list-page</param-name> - <param-value>true</param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>CXFServlet</servlet-name> - <url-pattern>/openoapi/*</url-pattern> - </servlet-mapping> - - <listener> - <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> - </listener> - <context-param> - <param-name>contextConfigLocation</param-name> - <param-value>WEB-INF/classes/spring/*.xml,classpath*:spring/applicationContext.xml,classpath*:spring/service.xml</param-value> - </context-param> - - <session-config> - <session-timeout>10000000</session-timeout> - </session-config> -</web-app> diff --git a/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/activator/ActivatorTest.java b/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/activator/ActivatorTest.java deleted file mode 100644 index 96ea5701..00000000 --- a/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/activator/ActivatorTest.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2016, Huawei Technologies Co., Ltd. - * - * 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. - */ -package org.openo.gso.gui.servicegateway.activator; - -import org.junit.Test; - -public class ActivatorTest -{ - @Test - public void test() throws Exception - { - Activator activator = new Activator(); - activator.start(); - activator.stop(); - } - -} diff --git a/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/exception/ErrorCodeTest.java b/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/exception/ErrorCodeTest.java deleted file mode 100644 index 74f9f432..00000000 --- a/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/exception/ErrorCodeTest.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2016, Huawei Technologies Co., Ltd. - * - * 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. - */ - -package org.openo.gso.gui.servicegateway.exception; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -/** - * Test Constant class.<br/> - * <p> - * </p> - * - * @author - * @version GSO 0.5 2016/8/4 - */ -public class ErrorCodeTest { - - @Test - public void test() { - assertEquals("servicemgr.mysql.oper_mysql_db_error", ErrorCode.SVCMGR_OPER_MYSQL_DB_ERROR); - assertEquals("servicemgr.bad_param", ErrorCode.SVCMGR_SERVICEMGR_BAD_PARAM); - } - -} diff --git a/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/exception/HttpCodeTest.java b/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/exception/HttpCodeTest.java deleted file mode 100644 index 06d247b7..00000000 --- a/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/exception/HttpCodeTest.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2016, Huawei Technologies Co., Ltd. - * - * 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. - */ - -package org.openo.gso.gui.servicegateway.exception; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.Test; - -/** - * Test Constant class.<br/> - * <p> - * </p> - * - * @author - * @version GSO 0.5 2016/8/4 - */ -public class HttpCodeTest { - - @Test - public void test() { - assertEquals(400, HttpCode.BAD_REQUEST); - assertEquals(500, HttpCode.INTERNAL_SERVER_ERROR); - assertEquals(406, HttpCode.NOT_ACCEPTABLE); - assertEquals(404, HttpCode.NOT_FOUND); - assertEquals(202, HttpCode.RESPOND_ACCEPTED); - assertEquals(200, HttpCode.RESPOND_OK); - assertTrue(HttpCode.isSucess(200)); - assertFalse(HttpCode.isSucess(400)); - } - -} diff --git a/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/roa/impl/ServiceGatewayRoaModuleImplTest.java b/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/roa/impl/ServiceGatewayRoaModuleImplTest.java deleted file mode 100644 index 4fd620cc..00000000 --- a/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/roa/impl/ServiceGatewayRoaModuleImplTest.java +++ /dev/null @@ -1,185 +0,0 @@ -/* - * Copyright (c) 2016, Huawei Technologies Co., Ltd. - * - * 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. - */ - -package org.openo.gso.gui.servicegateway.roa.impl; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.sql.SQLException; - -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.baseservice.util.RestUtils; -import org.openo.gso.gui.servicegateway.exception.HttpCode; -import org.openo.gso.gui.servicegateway.service.impl.ServiceGatewayImpl; -import org.openo.gso.gui.servicegateway.util.http.HttpUtil; - -import mockit.Mock; -import mockit.MockUp; - -/** - * Test ServicemgrRoaModuleImpl class.<br/> - * <p> - * </p> - * - * @author - * @version GSO 0.5 2016/8/3 - */ -public class ServiceGatewayRoaModuleImplTest { - - /** - * File path - */ - private static final String FILE_PATH = "src/test/resources/json/"; - - /** - * Service ROA. - */ - ServiceGatewayRoaModuleImpl serviceRoa = new ServiceGatewayRoaModuleImpl(); - - /** - * Service manager. - */ - ServiceGatewayImpl serviceManager = new ServiceGatewayImpl(); - - - /** - * Http request. - */ - HttpServletRequest httpRequest; - - /** - * Rest response. - */ - RestfulResponse responseSuccess; - - /** - * Before executing UT, start sql.<br/> - * - * @since GSO 0.5 - */ - @Before - public void start() throws IOException, SQLException { - responseSuccess = new RestfulResponse(); - responseSuccess.setStatus(HttpCode.RESPOND_OK); - } - - - - /** - * After executing UT, close session<br/> - * - * @since GSO 0.5 - */ - @After - public void stop() { - - } - - /** - * Test create service.<br/> - * - * @throws ServiceException when fail to operate database or parameter is wrong. - * @since GSO 0.5 - */ - @Test - public void testCreateService() throws ServiceException { - // mock request body - mockGetRequestBody(FILE_PATH + "createServiceInstance.json"); - - mockPost(responseSuccess); - - serviceRoa.createService(httpRequest); - } - - /** - * Test delete service.<br/> - * - * @throws ServiceException when fail to operate database or parameter is wrong. - * @since GSO 0.5 - */ - @Test - public void testDeleteService() throws ServiceException { - mockGetRequestBody(FILE_PATH + "createServiceInstance.json"); - mockPost(responseSuccess); - serviceRoa.deleteService("1", httpRequest); - } - - /** - * Mock to get request body.<br/> - * - * @param file json file path. - * @since GSO 0.5 - */ - private void mockGetRequestBody(final String file) { - new MockUp<RestUtils>() { - - @Mock - public String getRequestBody(HttpServletRequest request) { - return getJsonString(file); - } - }; - } - - /** - * Mock rest request for post.<br/> - * - * @param response rest response - * @since GSO 0.5 - */ - private void mockPost(final RestfulResponse response) { - new MockUp<HttpUtil>() { - - @Mock - public RestfulResponse post(final String url, Object sendObj, HttpServletRequest httpRequest) { - return response; - } - }; - } - - /** - * Get json string from file.<br/> - * - * @param file the path of file - * @return json string - * @throws IOException when fail to read - * @since GSO 0.5 - */ - private String getJsonString(final String file) { - if(StringUtils.isEmpty(file)) { - return ""; - } - - String json = null; - try { - FileInputStream fileStream = new FileInputStream(new File(file)); - json = IOUtils.toString(fileStream); - } catch(Exception e) { - Assert.fail(e.getMessage()); - } - - return json; - } -} diff --git a/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImplTest.java b/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImplTest.java deleted file mode 100644 index b7c1657f..00000000 --- a/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImplTest.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2016, Huawei Technologies Co., Ltd. - * - * 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. - */ - -package org.openo.gso.gui.servicegateway.service.impl; - - -import javax.servlet.http.HttpServletRequest; - -import org.junit.Before; -import org.junit.Test; -import org.openo.baseservice.remoteservice.exception.ServiceException; - -/** - * Test ServiceGatewayImpl Class.<br/> - * <p> - * </p> - * - * @author - * @version GSO 0.5 2016/8/3 - */ -public class ServiceGatewayImplTest { - - /** - * Service manager. - */ - ServiceGatewayImpl serviceManager = new ServiceGatewayImpl(); - - /** - * Http request. - */ - HttpServletRequest httpRequest; - - @Before - public void start() { - } - - /** - * Invalid parameter.<br/> - * - * @throws ServiceException when parameter is wrong. - * @since GSO 0.5 - */ - @Test(expected = ServiceException.class) - public void testCreateServiceFail() throws ServiceException { - serviceManager.createService(null, httpRequest); - } - - /** - * Invalid parameter.<br/> - * - * @throws ServiceException when parameter is wrong. - * @since GSO 0.5 - */ - @Test(expected = ServiceException.class) - public void testDeleteServiceFail() throws ServiceException { - serviceManager.deleteService(null, "", httpRequest); - } - -} diff --git a/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/testsuite/SuiteSGTest.java b/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/testsuite/SuiteSGTest.java deleted file mode 100644 index 9223df67..00000000 --- a/servicegateway/service/src/test/java/org/openo/gso/gui/servicegateway/testsuite/SuiteSGTest.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2016, Huawei Technologies Co., Ltd. - * - * 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. - */ -package org.openo.gso.gui.servicegateway.testsuite; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; -import org.openo.gso.gui.servicegateway.activator.ActivatorTest; -import org.openo.gso.gui.servicegateway.exception.HttpCodeTest; -import org.openo.gso.gui.servicegateway.roa.impl.ServiceGatewayRoaModuleImplTest; -import org.openo.gso.gui.servicegateway.service.impl.ServiceGatewayImplTest; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - ActivatorTest.class, - ServiceGatewayImplTest.class, - HttpCodeTest.class, - ServiceGatewayRoaModuleImplTest.class - -}) -public class SuiteSGTest { - -} diff --git a/servicegateway/service/src/test/resources/json/createServiceInstance.json b/servicegateway/service/src/test/resources/json/createServiceInstance.json deleted file mode 100644 index d8ba2fea..00000000 --- a/servicegateway/service/src/test/resources/json/createServiceInstance.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "gso_service", - "description": "siteToDc", - "serviceDefId": "78ede6f3-66cc-46ab-b748-38a6c010d272", - "templateId": "38a6c01-66cc-46ab-b748-38a6c010d272", - "templateName": "GsoTemplate", - "gatewayUri":"/openoapi/lifecyclymgr/v1/services", - "parameters": { - "POP.vFW-moc": "xxx", - "POP.vCPE-moc": "xxx" - } -}
\ No newline at end of file diff --git a/servicegateway/service/src/test/resources/json/license.txt b/servicegateway/service/src/test/resources/json/license.txt deleted file mode 100644 index bebcc7f8..00000000 --- a/servicegateway/service/src/test/resources/json/license.txt +++ /dev/null @@ -1,473 +0,0 @@ -THIS LICENSE FILE CONTAINS THE LICENSE APPLICABLE DEPENDING ON THE TYPE OF CONTRIBUTIONS. - -APACHE LICENSE 2 IS APPLICABLE FOR SOURCE CODE, CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL FOR DOCUMENTATION - -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - - -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. - -"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. - -2. Grant of Copyright License. - -Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. - -Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. - -4. Redistribution. - -You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: - -You must give any other recipients of the Work or Derivative Works a copy of this License; and -You must cause any modified files to carry prominent notices stating that You changed the files; and -You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and -If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. -You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. - -5. Submission of Contributions. - -Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. - -6. Trademarks. - -This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. - -Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. - -In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. - -While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - -Attribution 4.0 International - -https://creativecommons.org/licenses/by/4.0/legalcode - ---------------------------------------------------------------------------------------- - -Creative Commons Corporation ("Creative Commons") is not a law firm and -does not provide legal services or legal advice. Distribution of -Creative Commons public licenses does not create a lawyer-client or -other relationship. Creative Commons makes its licenses and related -information available on an "as-is" basis. Creative Commons gives no -warranties regarding its licenses, any material licensed under their -terms and conditions, or any related information. Creative Commons -disclaims all liability for damages resulting from their use to the -fullest extent possible. - -Using Creative Commons Public Licenses - -Creative Commons public licenses provide a standard set of terms and -conditions that creators and other rights holders may use to share -original works of authorship and other material subject to copyright -and certain other rights specified in the public license below. The -following considerations are for informational purposes only, are not -exhaustive, and do not form part of our licenses. - - Considerations for licensors: Our public licenses are - intended for use by those authorized to give the public - permission to use material in ways otherwise restricted by - copyright and certain other rights. Our licenses are - irrevocable. Licensors should read and understand the terms - and conditions of the license they choose before applying it. - Licensors should also secure all rights necessary before - applying our licenses so that the public can reuse the - material as expected. Licensors should clearly mark any - material not subject to the license. This includes other CC- - licensed material, or material used under an exception or - limitation to copyright. More considerations for licensors: - wiki.creativecommons.org/Considerations_for_licensors - - Considerations for the public: By using one of our public - licenses, a licensor grants the public permission to use the - licensed material under specified terms and conditions. If - the licensor's permission is not necessary for any reason--for - example, because of any applicable exception or limitation to - copyright--then that use is not regulated by the license. Our - licenses grant only permissions under copyright and certain - other rights that a licensor has authority to grant. Use of - the licensed material may still be restricted for other - reasons, including because others have copyright or other - rights in the material. A licensor may make special requests, - such as asking that all changes be marked or described. - Although not required by our licenses, you are encouraged to - respect those requests where reasonable. More_considerations - for the public: - wiki.creativecommons.org/Considerations_for_licensees - ---------------------------------------------------------------------------------------- - -Creative Commons Attribution 4.0 International Public License - -By exercising the Licensed Rights (defined below), You accept and agree -to be bound by the terms and conditions of this Creative Commons -Attribution 4.0 International Public License ("Public License"). To the -extent this Public License may be interpreted as a contract, You are -granted the Licensed Rights in consideration of Your acceptance of -these terms and conditions, and the Licensor grants You such rights in -consideration of benefits the Licensor receives from making the -Licensed Material available under these terms and conditions. - - -Section 1 -- Definitions. - - a. Adapted Material means material subject to Copyright and Similar - Rights that is derived from or based upon the Licensed Material - and in which the Licensed Material is translated, altered, - arranged, transformed, or otherwise modified in a manner requiring - permission under the Copyright and Similar Rights held by the - Licensor. For purposes of this Public License, where the Licensed - Material is a musical work, performance, or sound recording, - Adapted Material is always produced where the Licensed Material is - synched in timed relation with a moving image. - - b. Adapter's License means the license You apply to Your Copyright - and Similar Rights in Your contributions to Adapted Material in - accordance with the terms and conditions of this Public License. - - c. Copyright and Similar Rights means copyright and/or similar rights - closely related to copyright including, without limitation, - performance, broadcast, sound recording, and Sui Generis Database - Rights, without regard to how the rights are labeled or - categorized. For purposes of this Public License, the rights - specified in Section 2(b)(1)-(2) are not Copyright and Similar - Rights. - - d. Effective Technological Measures means those measures that, in the - absence of proper authority, may not be circumvented under laws - fulfilling obligations under Article 11 of the WIPO Copyright - Treaty adopted on December 20, 1996, and/or similar international - agreements. - - e. Exceptions and Limitations means fair use, fair dealing, and/or - any other exception or limitation to Copyright and Similar Rights - that applies to Your use of the Licensed Material. - - f. Licensed Material means the artistic or literary work, database, - or other material to which the Licensor applied this Public - License. - - g. Licensed Rights means the rights granted to You subject to the - terms and conditions of this Public License, which are limited to - all Copyright and Similar Rights that apply to Your use of the - Licensed Material and that the Licensor has authority to license. - - h. Licensor means the individual(s) or entity(ies) granting rights - under this Public License. - - i. Share means to provide material to the public by any means or - process that requires permission under the Licensed Rights, such - as reproduction, public display, public performance, distribution, - dissemination, communication, or importation, and to make material - available to the public including in ways that members of the - public may access the material from a place and at a time - individually chosen by them. - - j. Sui Generis Database Rights means rights other than copyright - resulting from Directive 96/9/EC of the European Parliament and of - the Council of 11 March 1996 on the legal protection of databases, - as amended and/or succeeded, as well as other essentially - equivalent rights anywhere in the world. - - k. You means the individual or entity exercising the Licensed Rights - under this Public License. Your has a corresponding meaning. - - -Section 2 -- Scope. - - a. License grant. - - 1. Subject to the terms and conditions of this Public License, - the Licensor hereby grants You a worldwide, royalty-free, - non-sublicensable, non-exclusive, irrevocable license to - exercise the Licensed Rights in the Licensed Material to: - - a. reproduce and Share the Licensed Material, in whole or - in part; and - - b. produce, reproduce, and Share Adapted Material. - - 2. Exceptions and Limitations. For the avoidance of doubt, where - Exceptions and Limitations apply to Your use, this Public - License does not apply, and You do not need to comply with - its terms and conditions. - - 3. Term. The term of this Public License is specified in Section - 6(a). - - 4. Media and formats; technical modifications allowed. The - Licensor authorizes You to exercise the Licensed Rights in - all media and formats whether now known or hereafter created, - and to make technical modifications necessary to do so. The - Licensor waives and/or agrees not to assert any right or - authority to forbid You from making technical modifications - necessary to exercise the Licensed Rights, including - technical modifications necessary to circumvent Effective - Technological Measures. For purposes of this Public License, - simply making modifications authorized by this Section 2(a) - (4) never produces Adapted Material. - - 5. Downstream recipients. - - a. Offer from the Licensor -- Licensed Material. Every - recipient of the Licensed Material automatically - receives an offer from the Licensor to exercise the - Licensed Rights under the terms and conditions of this - Public License. - - b. No downstream restrictions. You may not offer or impose - any additional or different terms or conditions on, or - apply any Effective Technological Measures to, the - Licensed Material if doing so restricts exercise of the - Licensed Rights by any recipient of the Licensed - Material. - - 6. No endorsement. Nothing in this Public License constitutes or - may be construed as permission to assert or imply that You - are, or that Your use of the Licensed Material is, connected - with, or sponsored, endorsed, or granted official status by, - the Licensor or others designated to receive attribution as - provided in Section 3(a)(1)(A)(i). - - b. Other rights. - - 1. Moral rights, such as the right of integrity, are not - licensed under this Public License, nor are publicity, - privacy, and/or other similar personality rights; however, to - the extent possible, the Licensor waives and/or agrees not to - assert any such rights held by the Licensor to the limited - extent necessary to allow You to exercise the Licensed - Rights, but not otherwise. - - 2. Patent and trademark rights are not licensed under this - Public License. - - 3. To the extent possible, the Licensor waives any right to - collect royalties from You for the exercise of the Licensed - Rights, whether directly or through a collecting society - under any voluntary or waivable statutory or compulsory - licensing scheme. In all other cases the Licensor expressly - reserves any right to collect such royalties. - - -Section 3 -- License Conditions. - -Your exercise of the Licensed Rights is expressly made subject to the -following conditions. - - a. Attribution. - - 1. If You Share the Licensed Material (including in modified - form), You must: - - a. retain the following if it is supplied by the Licensor - with the Licensed Material: - - i. identification of the creator(s) of the Licensed - Material and any others designated to receive - attribution, in any reasonable manner requested by - the Licensor (including by pseudonym if - designated); - - ii. a copyright notice; - - iii. a notice that refers to this Public License; - - iv. a notice that refers to the disclaimer of - warranties; - - v. a URI or hyperlink to the Licensed Material to the - extent reasonably practicable; - - b. indicate if You modified the Licensed Material and - retain an indication of any previous modifications; and - - c. indicate the Licensed Material is licensed under this - Public License, and include the text of, or the URI or - hyperlink to, this Public License. - - 2. You may satisfy the conditions in Section 3(a)(1) in any - reasonable manner based on the medium, means, and context in - which You Share the Licensed Material. For example, it may be - reasonable to satisfy the conditions by providing a URI or - hyperlink to a resource that includes the required - information. - - 3. If requested by the Licensor, You must remove any of the - information required by Section 3(a)(1)(A) to the extent - reasonably practicable. - - 4. If You Share Adapted Material You produce, the Adapter's - License You apply must not prevent recipients of the Adapted - Material from complying with this Public License. - - -Section 4 -- Sui Generis Database Rights. - -Where the Licensed Rights include Sui Generis Database Rights that -apply to Your use of the Licensed Material: - - a. for the avoidance of doubt, Section 2(a)(1) grants You the right - to extract, reuse, reproduce, and Share all or a substantial - portion of the contents of the database; - - b. if You include all or a substantial portion of the database - contents in a database in which You have Sui Generis Database - Rights, then the database in which You have Sui Generis Database - Rights (but not its individual contents) is Adapted Material; and - - c. You must comply with the conditions in Section 3(a) if You Share - all or a substantial portion of the contents of the database. - -For the avoidance of doubt, this Section 4 supplements and does not -replace Your obligations under this Public License where the Licensed -Rights include other Copyright and Similar Rights. - - -Section 5 -- Disclaimer of Warranties and Limitation of Liability. - - a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE - EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS - AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF - ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, - IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, - WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR - PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, - ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT - KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT - ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. - - b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE - TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, - NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, - INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, - COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR - USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN - ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR - DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR - IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. - - c. The disclaimer of warranties and limitation of liability provided - above shall be interpreted in a manner that, to the extent - possible, most closely approximates an absolute disclaimer and - waiver of all liability. - - -Section 6 -- Term and Termination. - - a. This Public License applies for the term of the Copyright and - Similar Rights licensed here. However, if You fail to comply with - this Public License, then Your rights under this Public License - terminate automatically. - - b. Where Your right to use the Licensed Material has terminated under - Section 6(a), it reinstates: - - 1. automatically as of the date the violation is cured, provided - it is cured within 30 days of Your discovery of the - violation; or - - 2. upon express reinstatement by the Licensor. - - For the avoidance of doubt, this Section 6(b) does not affect any - right the Licensor may have to seek remedies for Your violations - of this Public License. - - c. For the avoidance of doubt, the Licensor may also offer the - Licensed Material under separate terms or conditions or stop - distributing the Licensed Material at any time; however, doing so - will not terminate this Public License. - - d. Sections 1, 5, 6, 7, and 8 survive termination of this Public - License. - - -Section 7 -- Other Terms and Conditions. - - a. The Licensor shall not be bound by any additional or different - terms or conditions communicated by You unless expressly agreed. - - b. Any arrangements, understandings, or agreements regarding the - Licensed Material not stated herein are separate from and - independent of the terms and conditions of this Public License. - - -Section 8 -- Interpretation. - - a. For the avoidance of doubt, this Public License does not, and - shall not be interpreted to, reduce, limit, restrict, or impose - conditions on any use of the Licensed Material that could lawfully - be made without permission under this Public License. - - b. To the extent possible, if any provision of this Public License is - deemed unenforceable, it shall be automatically reformed to the - minimum extent necessary to make it enforceable. If the provision - cannot be reformed, it shall be severed from this Public License - without affecting the enforceability of the remaining terms and - conditions. - - c. No term or condition of this Public License will be waived and no - failure to comply consented to unless expressly agreed to by the - Licensor. - - d. Nothing in this Public License constitutes or may be interpreted - as a limitation upon, or waiver of, any privileges and immunities - that apply to the Licensor or You, including from the legal - processes of any jurisdiction or authority. - ---------------------------------------------------------------------------------------- - -Creative Commons is not a party to its public -licenses. Notwithstanding, Creative Commons may elect to apply one of -its public licenses to material it publishes and in those instances -will be considered the "Licensor." The text of the Creative Commons -public licenses is dedicated to the public domain under the CC0 Public -Domain Dedication. Except for the limited purpose of indicating that -material is shared under a Creative Commons public license or as -otherwise permitted by the Creative Commons policies published at -creativecommons.org/policies, Creative Commons does not authorize the -use of the trademark "Creative Commons" or any other trademark or logo -of Creative Commons without its prior written consent including, -without limitation, in connection with any unauthorized modifications -to any of its public licenses or any other arrangements, -understandings, or agreements concerning use of licensed material. For -the avoidance of doubt, this paragraph does not form part of the -public licenses. - -Creative Commons may be contacted at creativecommons.org. |