Remove openo dependency and fix compile problem 27/10527/4
authorluxin <luxin7@huawei.com>
Wed, 6 Sep 2017 08:54:34 +0000 (16:54 +0800)
committerluxin <luxin7@huawei.com>
Wed, 6 Sep 2017 10:28:56 +0000 (18:28 +0800)
Change-Id: I2fe2180b07acadad5fa332d8c3d338578b6e3943
Issue-Id:VFC-297
Signed-off-by: luxin <luxin7@huawei.com>
148 files changed:
ResmanagementService/service/pom.xml
ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITHostRoaFail.java
ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITHostRoaSuccess.java
ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITLimitsRoa.java
ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITLocationRoaFail.java
ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITLocationRoaSuccess.java
ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITNetworkRoaFail.java
ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITNetworkRoaSuccess.java
ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITPortRoaFail.java
ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITPortRoaSuccess.java
ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITResOperateRoaFail.java
ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITResOperateRoaSuccess.java
ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITSitesRoaFail.java
ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/test/ITSitesRoaSuccess.java
ResmanagementService/service/src/integration-test/java/org/openo/nfvo/resmanagement/util/MyTestManager.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtil.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/StringUtil.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/DefaultAsyncCallback.java [new file with mode: 0644]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/ExceptionArgs.java [new file with mode: 0644]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/HttpBaseRest.java [new file with mode: 0644]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/HttpRest.java [new file with mode: 0644]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/ReaderHelper.java [new file with mode: 0644]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestHttpContentExchange.java [new file with mode: 0644]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/Restful.java [new file with mode: 0644]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulAsyncCallback.java [new file with mode: 0644]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulClientConst.java [new file with mode: 0644]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulConfigure.java [new file with mode: 0644]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulFactory.java [new file with mode: 0644]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulOptions.java [new file with mode: 0644]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulParametes.java [new file with mode: 0644]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulResponse.java [new file with mode: 0644]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/ServiceException.java [new file with mode: 0644]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/SystemEnvVariables.java [new file with mode: 0644]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/SystemEnvVariablesDefImpl.java [new file with mode: 0644]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/SystemEnvVariablesFactory.java [new file with mode: 0644]
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManager.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Host.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/InterfaceResManagement.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Location.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Network.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Port.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/ResManagement.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Sites.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/inf/Vim.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/NetworkBusinessImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/PortBusinessImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/HostBusiness.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/LimitsBusiness.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/LocationBusiness.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/NetworkBusiness.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/PortBusiness.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/SitesBusiness.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/business/inf/VimBusiness.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/HostEntity.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/LocationEntity.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/NetworkEntity.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/NsEntity.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/PortEntity.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/SitesEntity.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VimEntity.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VirtualLinkEntity.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VmEntity.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfEntity.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfInfoEntity.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/entity/VnfStatusEntity.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/GrantResServiceImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceAddServiceImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceDelServiceImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/IResourceUpdateServiceImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/NsServiceImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/ResOperateServiceImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VirtualLinkServiceImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VmServiceImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfInfoServiceImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfServiceImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/impl/VnfStatusServiceImpl.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/GrantResService.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/NsService.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/ResOperateService.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VirtualLinkService.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VmService.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfInfoService.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfService.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/group/inf/VnfStatusService.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoa.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoa.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoa.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoa.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoa.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/NsRoa.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoa.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoa.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoa.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoa.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoa.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoa.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoa.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoa.java
ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapper.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/VimUtilTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/common/util/RestfulUtilTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapter2MSBManagerTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/HostImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/LocationImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/NetworkImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/PortImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/SitesImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/base/openstack/impl/VimImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/HostBusinessImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LimitsBusinessImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/LocationBusinessImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/SitesBusinessImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/business/impl/VimBusinessImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/HostDaoImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/LocationDaoImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/NetworkDaoImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/PortDaoImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/SitesDaoImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VimDaoImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VirtualLinkDaoImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/dao/impl/VmDaoImplTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/GrantResourseRoaTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/HostRoaTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LimitsRoaTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/LocationRoaTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/NetworkRoaTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/PortRoaTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/ResOperateRoaTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/SitesRoaTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VirtualLinkRoaTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VmRoaTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfInfoRoaTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfRoaTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/VnfStatusRoaTest.java
ResmanagementService/service/src/test/java/org/onap/vfc/nfvo/resmanagement/service/rest/exceptionmapper/ServiceExceptionMapperTest.java

index 0d91447..e4eec82 100644 (file)
     <artifactId>resmanagement-service</artifactId>
     <name>vfc/nfvo/resmanagement/ResmanagementService/service</name>
     <packaging>war</packaging>
-<repositories>
-        <repository>
-            <id>open-o</id>
-            <name>OPEN-O repository</name>
-            <url>https://nexus.open-o.org/content/repositories/public/</url>
-        </repository>
-    </repositories>
     <dependencies>
+    <dependency>
+  <groupId>org.apache.httpcomponents</groupId>
+  <artifactId>httpcore</artifactId>
+  <version>4.3</version>
+</dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>com.springsource.org.apache.commons.lang</artifactId>
+            <version>2.5.0</version>
+        </dependency>
+        <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>com.springsource.org.apache.commons.codec</artifactId>
+            <version>1.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.json-lib</groupId>
+            <artifactId>json-lib</artifactId>
+            <version>2.4</version>
+            <classifier>jdk15</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>javax.servlet</artifactId>
+            <version>3.0.0.v201112011016</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.aggregate</groupId>
+            <artifactId>jetty-all</artifactId>
+            <version>8.1.16.v20140903</version>
+        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <version>3.1.0.RELEASE</version>
         </dependency>
         <dependency>
-               <groupId>org.mybatis</groupId>
-               <artifactId>mybatis-spring</artifactId>
-               <version>1.2.0</version>
-           </dependency>
-           <dependency>
-             <groupId>org.mybatis</groupId>
-             <artifactId>mybatis</artifactId>
-             <version>3.2.7</version>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis-spring</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.2.7</version>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
             <version>1.15</version>
         </dependency>
-        <dependency>
-            <groupId>org.openo.common-services.common-utilities</groupId>
-            <artifactId>commonlib-cbb</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.openo.common-services.common-utilities</groupId>
-            <artifactId>commonlib-restclient</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-
-
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
index 27e4c59..17803e1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -19,7 +19,7 @@ package org.openo.nfvo.resmanagement.test;
 import java.io.File;
 
 import org.junit.Test;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.openo.nfvo.resmanagement.util.MyTestManager;
 
 /**
index 72ac04d..4cf8239 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -19,7 +19,7 @@ package org.openo.nfvo.resmanagement.test;
 import java.io.File;
 
 import org.junit.Test;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.openo.nfvo.resmanagement.util.MyTestManager;
 
 /**
index f9ef461..d2387db 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -21,7 +21,7 @@ import java.io.File;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.openo.nfvo.resmanagement.mocoserver.VimDriverSuccessServer;
 import org.openo.nfvo.resmanagement.util.MyTestManager;
 
index 3d8b67d..64bc2ed 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -19,7 +19,7 @@ package org.openo.nfvo.resmanagement.test;
 import java.io.File;
 
 import org.junit.Test;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.openo.nfvo.resmanagement.util.MyTestManager;
 
 /**
index c3641b2..995dac3 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -19,7 +19,7 @@ package org.openo.nfvo.resmanagement.test;
 import java.io.File;
 
 import org.junit.Test;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.openo.nfvo.resmanagement.util.MyTestManager;
 
 /**
index 7b9cb54..d672037 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -19,7 +19,7 @@ package org.openo.nfvo.resmanagement.test;
 import java.io.File;
 
 import org.junit.Test;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.openo.nfvo.resmanagement.util.MyTestManager;
 
 /**
index 50f0aeb..21f169d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -19,7 +19,7 @@ package org.openo.nfvo.resmanagement.test;
 import java.io.File;
 
 import org.junit.Test;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.openo.nfvo.resmanagement.util.MyTestManager;
 
 /**
index d4b9d34..8a30dc8 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -19,7 +19,7 @@ package org.openo.nfvo.resmanagement.test;
 import java.io.File;
 
 import org.junit.Test;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.openo.nfvo.resmanagement.util.MyTestManager;
 
 /**
index fadf854..945f1a8 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -19,7 +19,7 @@ package org.openo.nfvo.resmanagement.test;
 import java.io.File;
 
 import org.junit.Test;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.openo.nfvo.resmanagement.util.MyTestManager;
 
 /**
index dcb3dd9..4e340f3 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -19,7 +19,7 @@ package org.openo.nfvo.resmanagement.test;
 import java.io.File;
 
 import org.junit.Test;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.openo.nfvo.resmanagement.util.MyTestManager;
 
 /**
index 718d688..5e424ef 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -21,7 +21,7 @@ import java.io.File;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.openo.nfvo.resmanagement.mocoserver.VimDriverSuccessServer;
 import org.openo.nfvo.resmanagement.util.MyTestManager;
 
index a96c451..4e33e1c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -19,7 +19,7 @@ package org.openo.nfvo.resmanagement.test;
 import java.io.File;
 
 import org.junit.Test;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.openo.nfvo.resmanagement.util.MyTestManager;
 
 /**
index b7736c3..fef1430 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -19,7 +19,7 @@ package org.openo.nfvo.resmanagement.test;
 import java.io.File;
 
 import org.junit.Test;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.openo.nfvo.resmanagement.util.MyTestManager;
 
 /**
index 97ebe50..2e6f0b5 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -21,9 +21,9 @@ import java.util.Iterator;
 import java.util.Map;
 
 import org.junit.Assert;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.baseservice.roa.util.restclient.RestfulParametes;
-import org.openo.baseservice.roa.util.restclient.RestfulResponse;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulResponse;
 import org.openo.sdno.testframework.checker.DefaultChecker;
 import org.openo.sdno.testframework.http.model.HttpModelUtils;
 import org.openo.sdno.testframework.http.model.HttpRequest;
index 8e66c7f..e623d75 100644 (file)
@@ -19,7 +19,7 @@ package org.onap.vfc.nfvo.resmanagement.common;
 import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
 import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
 import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
-import org.openo.baseservice.roa.util.restclient.RestfulParametes;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 4036de7..8607111 100644 (file)
@@ -23,17 +23,17 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
 import org.onap.vfc.nfvo.resmanagement.common.constant.Constant;
 import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.baseservice.roa.util.restclient.Restful;
-import org.openo.baseservice.roa.util.restclient.RestfulAsyncCallback;
-import org.openo.baseservice.roa.util.restclient.RestfulFactory;
-import org.openo.baseservice.roa.util.restclient.RestfulOptions;
-import org.openo.baseservice.roa.util.restclient.RestfulParametes;
-import org.openo.baseservice.roa.util.restclient.RestfulResponse;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.Restful;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulAsyncCallback;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulFactory;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulOptions;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulResponse;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index a415a71..e7f4943 100644 (file)
@@ -19,7 +19,7 @@ package org.onap.vfc.nfvo.resmanagement.common.util;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/DefaultAsyncCallback.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/DefaultAsyncCallback.java
new file mode 100644 (file)
index 0000000..f291d5f
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+ * 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.onap.vfc.nfvo.resmanagement.common.util.restclient;
+
+/**
+ * Restful Asynchronous call back implentation.<br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version 28-May-2016
+ */
+public class DefaultAsyncCallback implements RestfulAsyncCallback {
+
+    @Override
+    public void callback(final RestfulResponse response) {
+        // default implementation.
+    }
+
+    @Override
+    public void handleExcepion(final Throwable e) {
+        // default implementation
+    }
+}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/ExceptionArgs.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/ExceptionArgs.java
new file mode 100644 (file)
index 0000000..89b1b0a
--- /dev/null
@@ -0,0 +1,111 @@
+/*
+ * 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.onap.vfc.nfvo.resmanagement.common.util.restclient;
+
+/**
+ * ROA exception handling parameters.
+ * <br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version 28-May-2016
+ */
+public class ExceptionArgs {
+
+    /**
+     * Exception descriptions.
+     */
+    private String[] descArgs = null;
+
+    /**
+     * Exception reasons.
+     */
+    private String[] reasonArgs = null;
+
+    /**
+     * Exception detals.
+     */
+    private String[] detailArgs = null;
+
+    /**
+     * Exception advices.
+     */
+    private String[] adviceArgs = null;
+
+    /**
+     * Constructor<br/>
+     * <p>
+     * </p>
+     * 
+     * @since
+     */
+    public ExceptionArgs() {
+        // default constructor.
+    }
+
+    /**
+     * Constructor<br/>
+     * <p>
+     * </p>
+     * 
+     * @since
+     * @param descArgs: descriptions.
+     * @param reasonArgs: reasons.
+     * @param detailArgs: details.
+     * @param adviceArgs: advices.
+     */
+    public ExceptionArgs(final String[] descArgs, final String[] reasonArgs, final String[] detailArgs,
+            final String[] adviceArgs) {
+        this.descArgs = descArgs;
+        this.reasonArgs = reasonArgs;
+        this.detailArgs = detailArgs;
+        this.adviceArgs = adviceArgs;
+    }
+
+    public String[] getDescArgs() {
+        return descArgs;
+    }
+
+    public void setDescArgs(final String[] descArgs) {
+        this.descArgs = descArgs;
+    }
+
+    public String[] getReasonArgs() {
+        return reasonArgs;
+    }
+
+    public void setReasonArgs(final String[] reasonArgs) {
+        this.reasonArgs = reasonArgs;
+    }
+
+    public String[] getDetailArgs() {
+        return detailArgs;
+    }
+
+    public void setDetailArgs(final String[] detailArgs) {
+        this.detailArgs = detailArgs;
+    }
+
+    public String[] getAdviceArgs() {
+        return adviceArgs;
+    }
+
+    public void setAdviceArgs(final String[] adviceArgs) {
+        this.adviceArgs = adviceArgs;
+    }
+}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/HttpBaseRest.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/HttpBaseRest.java
new file mode 100644 (file)
index 0000000..9cc832f
--- /dev/null
@@ -0,0 +1,272 @@
+/*
+ * 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.onap.vfc.nfvo.resmanagement.common.util.restclient;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.eclipse.jetty.client.Address;
+import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.client.HttpExchange;
+import org.eclipse.jetty.http.HttpMethods;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * <br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version Aug 9, 2016
+ */
+public abstract class HttpBaseRest implements Restful {
+
+    private static final Logger LOG = LoggerFactory.getLogger(HttpRest.class);
+
+    final AtomicInteger requestId = new AtomicInteger(0);
+
+    protected HttpClient client = null;
+
+    private static final String LOCAL_HOST = "127.0.0.1";
+
+    static final String HTTP_PATCH = "PATCH";
+
+    String defaultIP = LOCAL_HOST;
+
+    int defaultPort = -10000;
+
+    int defaultTimeout = 30000;
+
+    final String procenameRouteID = "RouteID-" + System.currentTimeMillis() + "-";
+
+    /**
+     * Constructor<br/>
+     * <p>
+     * </p>
+     * 
+     * @since
+     */
+    public HttpBaseRest() {
+        super();
+    }
+
+    protected void createHttpClient() {
+        client = new HttpClient();
+    }
+
+    protected RestHttpContentExchange createRestHttpContentExchange(final RestfulAsyncCallback callback) {
+        final RestHttpContentExchange exchange = new RestHttpContentExchange(true, callback);
+        exchange.setScheme("http");
+        return exchange;
+    }
+
+    private String encodeParams(final RestfulParametes restParametes) throws ServiceException {
+        final Map<String, String> parm = restParametes.getParamMap();
+        String value = null;
+        boolean bHasParma = false;
+        final StringBuilder builder = new StringBuilder();
+        try {
+            for(final String key : parm.keySet()) {
+                value = parm.get(key);
+                if(value == null) {
+                    value = "";
+                }
+                String str;
+                if(bHasParma) {
+                    str = String.format("&%s=%s", URLEncoder.encode(key, RestfulClientConst.ENCODING),
+                            URLEncoder.encode(value, RestfulClientConst.ENCODING));
+                } else {
+                    bHasParma = true;
+                    str = String.format("%s=%s", URLEncoder.encode(key, RestfulClientConst.ENCODING),
+                            URLEncoder.encode(value, RestfulClientConst.ENCODING));
+                }
+                builder.append(str);
+            }
+        } catch(final UnsupportedEncodingException ex) {
+            LOG.error("unsupported encoding: ", ex);
+            throw new ServiceException("Broken VM does not support UTF-8");
+        }
+        return builder.toString();
+    }
+
+    private void processHeader(final RestHttpContentExchange contentExchange, final Map<String, String> headerMap) {
+        for(final String key : headerMap.keySet()) {
+            final String value = headerMap.get(key);
+            contentExchange.addRequestHeader(key, value);
+        }
+
+    }
+
+    private void setContentExchangeParams(final RestHttpContentExchange contentExchange) {
+        final String contentType = contentExchange.getRequestFields().getStringField("Content-Type");
+        if(null == contentType || contentType.isEmpty()) {
+            // application/json;charset=utf-8
+            contentExchange.setRequestContentType(RestfulClientConst.APPLICATION_FORM_URLENCODED);
+        }
+        final String encoding = contentExchange.getRequestFields().getStringField("Accept-Encoding");
+        if(null == encoding || encoding.isEmpty()) {
+            // compress,gzip
+            contentExchange.setRequestHeader("Accept-Encoding", "*/*");
+        }
+        contentExchange.setVersion(11);
+    }
+
+    /**
+     * <br/>
+     * 
+     * @param method
+     * @param servicePath
+     * @param restParametes
+     * @param options
+     * @param callback
+     * @return
+     * @throws ServiceException
+     * @since
+     */
+    protected RestfulResponse sendHttpRequest(final String method, final String servicePath,
+            final RestfulParametes restParametes, final RestfulOptions options, final RestfulAsyncCallback callback)
+            throws ServiceException {
+        final RestHttpContentExchange contentExchange = createRestHttpContentExchange(callback);
+        if(null == restParametes) {
+            return new RestfulResponse();
+        }
+        final String requestTrace = this.getReuqestIdString();
+        restParametes.putHttpContextHeader(RestfulClientConst.REQUEST_ID, requestTrace);
+
+        RestfulResponse rsp = null;
+        try {
+            contentExchange.setMethod(method);
+            final String str = encodeParams(restParametes);
+            final StringBuilder builder = new StringBuilder();
+            builder.append(servicePath);
+            if(str.length() > 0 && (method.equals(HttpMethods.GET) || method.equals(HttpMethods.DELETE)
+                    || method.equals(HttpMethods.HEAD))) {
+                builder.append('?');
+                builder.append(str);
+            }
+            setDefaultUrl(contentExchange, options, builder);
+            processHeader(contentExchange, restParametes.getHeaderMap());
+            setContentExchangeParams(contentExchange);
+
+            setPostPutParam(method, restParametes, contentExchange, str);
+            setTimeout(options, contentExchange);
+
+            client.send(contentExchange);
+            rsp = callbackExecute(callback, contentExchange);
+        } catch(final Exception e) {
+            LOG.error("request reply message have exception:status is "
+                    + RestHttpContentExchange.toState(contentExchange.getStatus()));
+            throw new ServiceException(e);
+        }
+        return rsp;
+    }
+
+    private void setDefaultUrl(final RestHttpContentExchange contentExchange, final RestfulOptions options,
+            final StringBuilder url) {
+        // server
+        if(url.toString().startsWith("http")) {
+            contentExchange.setURL(url.toString());
+        } else {
+            String host = defaultIP;
+            int iPort = defaultPort;
+            if(options != null) {
+                host = options.getHost();
+                if(host.isEmpty()) {
+                    host = defaultIP;
+                }
+                iPort = options.getPort();
+                if(iPort == 0) {
+                    iPort = defaultPort;
+                }
+            }
+            // Integer.getInteger(".http.client.maxThread",30)
+            contentExchange.setAddress(new Address(host, iPort));
+            contentExchange.setRequestURI(url.toString());
+        }
+    }
+
+    private String getReuqestIdString() {
+        if(this.requestId.get() == 0x7FFFFFFF) {
+            this.requestId.set(1);
+        }
+        final int reqId = this.requestId.getAndIncrement();
+        final StringBuilder builder = new StringBuilder(this.procenameRouteID);
+        // time
+        final SimpleDateFormat dateFormate = new SimpleDateFormat("yyMMdd");
+        final SimpleDateFormat timeFormate = new SimpleDateFormat("HHmmss");
+        final Date date = Calendar.getInstance().getTime();
+        builder.append(dateFormate.format(date) + timeFormate.format(date));
+        builder.append('-');
+        builder.append(reqId);
+        return builder.toString();
+    }
+
+    private void setPostPutParam(final String method, final RestfulParametes restParametes,
+            final RestHttpContentExchange contentExchange, final String str) throws UnsupportedEncodingException {
+        if(HttpMethods.POST.equals(method) || HttpMethods.PUT.equals(method) || HTTP_PATCH.equals(method)) {
+            ByteArrayInputStream buff;
+            final String tmpRaw = restParametes.getRawData();
+            if(tmpRaw == null) {
+                buff = new ByteArrayInputStream(str.getBytes(RestfulClientConst.ENCODING));
+            } else {
+                buff = new ByteArrayInputStream(tmpRaw.getBytes(RestfulClientConst.ENCODING));
+            }
+            final int len = buff.available();
+            contentExchange.setRequestContentSource(buff);
+            contentExchange.setRequestHeader("content-length", String.valueOf(len));
+        }
+    }
+
+    private void setTimeout(final RestfulOptions options, final RestHttpContentExchange contentExchange) {
+        if(options != null) {
+            final long timeout = options.getRestTimeout();
+            if(timeout != 0) {
+                contentExchange.setTimeout(timeout);
+            } else {
+                contentExchange.setTimeout(defaultTimeout);
+            }
+        } else {
+            contentExchange.setTimeout(defaultTimeout);
+        }
+    }
+
+    private RestfulResponse callbackExecute(final RestfulAsyncCallback callback,
+            final RestHttpContentExchange contentExchange) throws InterruptedException, IOException, ServiceException {
+        if(callback == null) {
+            final int exchangeState = contentExchange.waitForDone();
+            if(exchangeState == HttpExchange.STATUS_COMPLETED) {
+                return contentExchange.getResponse();
+            } else if(exchangeState == HttpExchange.STATUS_EXCEPTED) {
+                throw new ServiceException(
+                        "request is exception: " + RestHttpContentExchange.toState(HttpExchange.STATUS_EXCEPTED));
+            } else if(exchangeState == HttpExchange.STATUS_EXPIRED) {
+                throw new ServiceException(
+                        "request is expierd: " + RestHttpContentExchange.toState(HttpExchange.STATUS_EXPIRED));
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/HttpRest.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/HttpRest.java
new file mode 100644 (file)
index 0000000..a36d984
--- /dev/null
@@ -0,0 +1,253 @@
+/*
+ * 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.onap.vfc.nfvo.resmanagement.common.util.restclient;
+
+import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.http.HttpMethods;
+import org.eclipse.jetty.util.thread.QueuedThreadPool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * <br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version Aug 9, 2016
+ */
+public class HttpRest extends HttpBaseRest {
+
+    private static final Logger LOG = LoggerFactory.getLogger(HttpRest.class);
+
+    /**
+     * Initializing Rest options.<br/>
+     * 
+     * @param options: rest options.
+     * @throws ServiceException
+     * @since
+     */
+    public void initHttpRest(final RestfulOptions option) throws ServiceException {
+        if(option == null) {
+            client = null;
+            throw new ServiceException("option is null.");
+        }
+        createHttpClient();
+        try {
+            int iValue;
+            iValue = option.getIntOption(RestfulClientConst.MAX_CONN_PER_ADDR_KEY_NAME);
+            // max 200 concurrent,connections to every address
+            client.setMaxConnectionsPerAddress(iValue);
+
+            iValue = option.getIntOption(RestfulClientConst.THREAD_KEY_NAME);
+            // max threads
+            client.setThreadPool(new QueuedThreadPool(iValue));
+            iValue = option.getIntOption(RestfulClientConst.CONN_TIMEOUT_KEY_NAME);
+            client.setConnectTimeout(iValue);
+            iValue = option.getRestTimeout();
+            defaultTimeout = iValue;
+            client.setTimeout(iValue);
+
+            iValue = option.getIntOption(RestfulClientConst.IDLE_TIMEOUT_KEY_NAME);
+            client.setIdleTimeout(iValue);
+            iValue = option.getIntOption(RestfulClientConst.MAX_RESPONSE_HEADER_SIZE);
+            client.setResponseHeaderSize(iValue);
+            iValue = option.getIntOption(RestfulClientConst.MAX_REQUEST_HEADER_SIZE);
+            client.setRequestHeaderSize(iValue);
+            // HttpClient.CONNECTOR_SOCKET
+            client.setConnectorType(HttpClient.CONNECTOR_SELECT_CHANNEL);
+            client.start();
+            defaultIP = option.getStringOption(RestfulClientConst.HOST_KEY_NAME);
+            defaultPort = option.getIntOption(RestfulClientConst.PORT_KEY_NAME);
+        } catch(final Exception e) {
+            LOG.error("start httpclient error", e);
+            client = null;
+            throw new ServiceException("http client init failed.");
+        }
+    }
+
+    @Override
+    public RestfulResponse get(final String servicePath, final RestfulParametes restParametes) throws ServiceException {
+        return this.sendHttpRequest(HttpMethods.GET, servicePath, restParametes, null, null);
+    }
+
+    @Override
+    public RestfulResponse get(final String servicePath, final RestfulParametes restParametes,
+            final RestfulOptions option) throws ServiceException {
+        return this.sendHttpRequest(HttpMethods.GET, servicePath, restParametes, option, null);
+    }
+
+    @Override
+    public RestfulResponse head(final String servicePath, final RestfulParametes restParametes)
+            throws ServiceException {
+        return this.sendHttpRequest(HttpMethods.HEAD, servicePath, restParametes, null, null);
+    }
+
+    @Override
+    public RestfulResponse head(final String servicePath, final RestfulParametes restParametes,
+            final RestfulOptions option) throws ServiceException {
+        return this.sendHttpRequest(HttpMethods.HEAD, servicePath, restParametes, option, null);
+    }
+
+    @Override
+    public void asyncGet(final String servicePath, final RestfulParametes restParametes,
+            final RestfulAsyncCallback callback) throws ServiceException {
+        if(callback == null) {
+            this.sendHttpRequest(HttpMethods.GET, servicePath, restParametes, null, new DefaultAsyncCallback());
+        } else {
+            this.sendHttpRequest(HttpMethods.GET, servicePath, restParametes, null, callback);
+        }
+    }
+
+    @Override
+    public void asyncGet(final String servicePath, final RestfulParametes restParametes, final RestfulOptions option,
+            final RestfulAsyncCallback callback) throws ServiceException {
+        if(callback == null) {
+            this.sendHttpRequest(HttpMethods.GET, servicePath, restParametes, option, new DefaultAsyncCallback());
+        } else {
+            this.sendHttpRequest(HttpMethods.GET, servicePath, restParametes, option, callback);
+        }
+    }
+
+    @Override
+    public RestfulResponse put(final String servicePath, final RestfulParametes restParametes) throws ServiceException {
+        return this.sendHttpRequest(HttpMethods.PUT, servicePath, restParametes, null, null);
+    }
+
+    @Override
+    public RestfulResponse put(final String servicePath, final RestfulParametes restParametes,
+            final RestfulOptions option) throws ServiceException {
+        return this.sendHttpRequest(HttpMethods.PUT, servicePath, restParametes, option, null);
+    }
+
+    @Override
+    public void asyncPut(final String servicePath, final RestfulParametes restParametes,
+            final RestfulAsyncCallback callback) throws ServiceException {
+        if(callback == null) {
+            this.sendHttpRequest(HttpMethods.PUT, servicePath, restParametes, null, new DefaultAsyncCallback());
+        } else {
+            this.sendHttpRequest(HttpMethods.PUT, servicePath, restParametes, null, callback);
+        }
+    }
+
+    @Override
+    public void asyncPut(final String servicePath, final RestfulParametes restParametes, final RestfulOptions option,
+            final RestfulAsyncCallback callback) throws ServiceException {
+        if(callback == null) {
+            this.sendHttpRequest(HttpMethods.PUT, servicePath, restParametes, option, new DefaultAsyncCallback());
+        } else {
+            this.sendHttpRequest(HttpMethods.PUT, servicePath, restParametes, option, callback);
+        }
+    }
+
+    @Override
+    public RestfulResponse post(final String servicePath, final RestfulParametes restParametes)
+            throws ServiceException {
+        return this.sendHttpRequest(HttpMethods.POST, servicePath, restParametes, null, null);
+    }
+
+    @Override
+    public RestfulResponse post(final String servicePath, final RestfulParametes restParametes,
+            final RestfulOptions option) throws ServiceException {
+        return this.sendHttpRequest(HttpMethods.POST, servicePath, restParametes, option, null);
+    }
+
+    @Override
+    public void asyncPost(final String servicePath, final RestfulParametes restParametes,
+            final RestfulAsyncCallback callback) throws ServiceException {
+        if(callback == null) {
+            this.sendHttpRequest(HttpMethods.POST, servicePath, restParametes, null, new DefaultAsyncCallback());
+        } else {
+            this.sendHttpRequest(HttpMethods.POST, servicePath, restParametes, null, callback);
+        }
+    }
+
+    @Override
+    public void asyncPost(final String servicePath, final RestfulParametes restParametes, final RestfulOptions option,
+            final RestfulAsyncCallback callback) throws ServiceException {
+        if(callback == null) {
+            this.sendHttpRequest(HttpMethods.POST, servicePath, restParametes, option, new DefaultAsyncCallback());
+        } else {
+            this.sendHttpRequest(HttpMethods.POST, servicePath, restParametes, option, callback);
+        }
+    }
+
+    @Override
+    public RestfulResponse delete(final String servicePath, final RestfulParametes restParametes)
+            throws ServiceException {
+        return this.sendHttpRequest(HttpMethods.DELETE, servicePath, restParametes, null, null);
+    }
+
+    @Override
+    public RestfulResponse delete(final String servicePath, final RestfulParametes restParametes,
+            final RestfulOptions option) throws ServiceException {
+        return this.sendHttpRequest(HttpMethods.DELETE, servicePath, restParametes, option, null);
+    }
+
+    @Override
+    public void asyncDelete(final String servicePath, final RestfulParametes restParametes,
+            final RestfulAsyncCallback callback) throws ServiceException {
+        if(callback == null) {
+            this.sendHttpRequest(HttpMethods.DELETE, servicePath, restParametes, null, new DefaultAsyncCallback());
+        } else {
+            this.sendHttpRequest(HttpMethods.DELETE, servicePath, restParametes, null, callback);
+        }
+    }
+
+    @Override
+    public void asyncDelete(final String servicePath, final RestfulParametes restParametes, final RestfulOptions option,
+            final RestfulAsyncCallback callback) throws ServiceException {
+        if(callback == null) {
+            this.sendHttpRequest(HttpMethods.DELETE, servicePath, restParametes, option, new DefaultAsyncCallback());
+        } else {
+            this.sendHttpRequest(HttpMethods.DELETE, servicePath, restParametes, option, callback);
+        }
+    }
+
+    @Override
+    public RestfulResponse patch(final String servicePath, final RestfulParametes restParametes)
+            throws ServiceException {
+        return this.sendHttpRequest(HTTP_PATCH, servicePath, restParametes, null, null);
+    }
+
+    @Override
+    public RestfulResponse patch(final String servicePath, final RestfulParametes restParametes,
+            final RestfulOptions option) throws ServiceException {
+        return this.sendHttpRequest(HTTP_PATCH, servicePath, restParametes, option, null);
+    }
+
+    @Override
+    public void asyncPatch(final String servicePath, final RestfulParametes restParametes,
+            final RestfulAsyncCallback callback) throws ServiceException {
+        if(callback == null) {
+            this.sendHttpRequest(HTTP_PATCH, servicePath, restParametes, null, new DefaultAsyncCallback());
+        } else {
+            this.sendHttpRequest(HTTP_PATCH, servicePath, restParametes, null, callback);
+        }
+    }
+
+    @Override
+    public void asyncPatch(final String servicePath, final RestfulParametes restParametes, final RestfulOptions option,
+            final RestfulAsyncCallback callback) throws ServiceException {
+        if(callback == null) {
+            this.sendHttpRequest(HTTP_PATCH, servicePath, restParametes, option, new DefaultAsyncCallback());
+        } else {
+            this.sendHttpRequest(HTTP_PATCH, servicePath, restParametes, option, callback);
+        }
+    }
+
+}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/ReaderHelper.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/ReaderHelper.java
new file mode 100644 (file)
index 0000000..85fe8ce
--- /dev/null
@@ -0,0 +1,62 @@
+/*
+ * 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.onap.vfc.nfvo.resmanagement.common.util.restclient;
+
+import java.io.Reader;
+
+import org.apache.commons.io.LineIterator;
+
+/**
+ * Helper for read line.<br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version 31-May-2016
+ */
+public class ReaderHelper {
+
+    private LineIterator ite = null;
+
+    /**
+     * Constructor<br/>
+     * <p>
+     * </p>
+     * 
+     * @since
+     * @param reader
+     */
+    public ReaderHelper(final Reader reader) {
+        if(reader != null) {
+            ite = new LineIterator(reader);
+        }
+
+    }
+
+    /**
+     * Gets the next line.<br/>
+     * 
+     * @return line if present else null.
+     * @since
+     */
+    public String getLine() {
+        if(ite != null && ite.hasNext()) {
+            return ite.nextLine();
+        }
+        return null;
+    }
+}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestHttpContentExchange.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestHttpContentExchange.java
new file mode 100644 (file)
index 0000000..fa01516
--- /dev/null
@@ -0,0 +1,233 @@
+/*
+ * 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.onap.vfc.nfvo.resmanagement.common.util.restclient;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.Charset;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.zip.GZIPInputStream;
+
+import org.apache.commons.lang.StringUtils;
+import org.eclipse.jetty.client.ContentExchange;
+import org.eclipse.jetty.client.HttpDestination;
+import org.eclipse.jetty.http.HttpFields;
+import org.eclipse.jetty.http.HttpHeaders;
+import org.eclipse.jetty.io.Buffer;
+import org.eclipse.jetty.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * ContentExchange implementation classe to provide access to response.
+ * <br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version 28-May-2016
+ */
+public class RestHttpContentExchange extends ContentExchange {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(RestHttpContentExchange.class);
+
+    private boolean gzip = false;
+
+    private RestfulAsyncCallback callback = null;
+
+    /**
+     * Constructor<br/>
+     * <p>
+     * </p>
+     * 
+     * @since
+     * @param cacheFields whether to cache response header.
+     * @param asyncCallback callback method.
+     */
+    RestHttpContentExchange(final boolean cacheFields, final RestfulAsyncCallback asyncCallback) {
+        super(cacheFields);
+        this.callback = asyncCallback;
+    }
+
+    /**
+     * Extract message.
+     * <br/>
+     * 
+     * @param data GZipped data.
+     * @return Uncompressed data.
+     * @throws IOException
+     * @since
+     */
+    public String decompressGzipToStr(final byte[] data) throws IOException {
+        if(data == null) {
+            return "";
+        }
+        ByteArrayInputStream input = null;
+        GZIPInputStream gzis = null;
+        InputStreamReader reader = null;
+        final StringBuilder out = new StringBuilder();
+        try {
+            input = new ByteArrayInputStream(data);
+            gzis = new GZIPInputStream(input);
+            reader = new InputStreamReader(gzis, Charset.forName(RestfulClientConst.ENCODING));
+            final char[] buff = new char[1024];
+            for(int n; (n = reader.read(buff)) != -1;) {
+                out.append(new String(buff, 0, n));
+            }
+        } finally {
+            if(reader != null) {
+                try {
+                    reader.close();
+                } catch(final IOException e) {
+                    LOGGER.error("decompress Gzip reader exception:", e);
+                }
+            }
+            if(gzis != null) {
+                try {
+                    gzis.close();
+                } catch(final IOException e) {
+                    LOGGER.error("decompress Gzip exception:", e);
+                }
+            }
+            if(input != null) {
+                try {
+                    input.close();
+                } catch(final IOException e) {
+                    LOGGER.error("decompress Gzip input exception:", e);
+                }
+            }
+        }
+        return out.toString();
+
+    }
+
+    /**
+     * View response headers Content-Encoding values if you need to extract data.<br/>
+     * 
+     * @param name buffer
+     * @param value value
+     * @throws IOException
+     * @since
+     */
+    @Override
+    protected synchronized void onResponseHeader(final Buffer name, final Buffer value) throws IOException {
+        super.onResponseHeader(name, value);
+        final int header = HttpHeaders.CACHE.getOrdinal(name);
+        if(header == HttpHeaders.CONTENT_ENCODING_ORDINAL) {
+            final String encoding = StringUtil.asciiToLowerCase(value.toString());
+            gzip = encoding != null && StringUtils.contains(encoding, "gzip");
+        }
+
+    }
+
+    @Override
+    protected void onResponseComplete() throws IOException {
+        if(LOGGER.isInfoEnabled()) {
+            LOGGER.info("Response has Complete:" + "path:" + this.getRequestURI().replace("\n", "0x0A"));
+        }
+        super.onResponseComplete();
+        if(callback != null) {
+            final RestfulResponse rsp = getResponse();
+            callback.callback(rsp);
+        }
+    }
+
+    @Override
+    protected void onRequestCommitted() throws IOException {
+        if(LOGGER.isInfoEnabled()) {
+            LOGGER.info("Request Header has been send:" + "path:" + this.getRequestURI().replace("\n", "0x0A"));
+        }
+        super.onRequestCommitted();
+    }
+
+    @Override
+    protected void onRequestComplete() throws IOException {
+        if(LOGGER.isInfoEnabled()) {
+            LOGGER.info("Request has bend send complete:" + "path:" + this.getRequestURI().replace("\n", "0x0A"));
+        }
+        super.onRequestComplete();
+    }
+
+    @Override
+    protected void onException(final Throwable x) {
+        LOGGER.warn("onException:", x);
+        super.onException(x);
+        if(callback != null) {
+            callback.handleExcepion(x);
+        }
+    }
+
+    @Override
+    protected void onConnectionFailed(final Throwable x) {
+        LOGGER.warn("onConnectionFailed:", x);
+        super.onConnectionFailed(x);
+        if(callback != null) {
+            callback.handleExcepion(x);
+        }
+
+    }
+
+    @Override
+    protected void expire(final HttpDestination destination) {
+        super.expire(destination);
+        if(callback != null) {
+            callback.handleExcepion(new ServiceException("request is expired, status:" + toState(getStatus())));
+        }
+    }
+
+    public boolean isGzip() {
+        return gzip;
+    }
+
+    /**
+     * Get the response as RestfulResponse.
+     * <br/>
+     * 
+     * @return response object.
+     * @throws IOException
+     * @since
+     */
+    public RestfulResponse getResponse() throws IOException {
+        final RestfulResponse rsp = new RestfulResponse();
+        rsp.setStatus(this.getResponseStatus());
+        if(isGzip()) {
+            final String responseString = decompressGzipToStr(getResponseContentBytes());
+            rsp.setResponseJson(responseString);
+        } else {
+            rsp.setResponseJson(this.getResponseContent());
+        }
+
+        final HttpFields field = this.getResponseFields();
+        if(field != null) {
+            final Map<String, String> header = new HashMap<>();
+
+            final Enumeration<String> names = field.getFieldNames();
+            for(final Enumeration<String> e = names; e.hasMoreElements();) {
+                final String fieldName = e.nextElement();
+                final String fieldValue = field.getStringField(fieldName);
+                header.put(fieldName, fieldValue);
+            }
+
+            rsp.setRespHeaderMap(header);
+        }
+        return rsp;
+    }
+
+}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/Restful.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/Restful.java
new file mode 100644 (file)
index 0000000..32b31e7
--- /dev/null
@@ -0,0 +1,297 @@
+/*
+ * 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.onap.vfc.nfvo.resmanagement.common.util.restclient;
+
+/**
+ * ReSTful method interface.<br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version 28-May-2016
+ */
+public interface Restful {
+
+    /**
+     * Http GET method.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: query parameters.
+     * @return response.
+     * @throws ServiceException
+     * @since
+     */
+    RestfulResponse get(String servicePath, RestfulParametes restParametes) throws ServiceException;
+
+    /**
+     * Http HEAD method.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @param options: request options.
+     * @return response.
+     * @throws ServiceException
+     * @since
+     */
+    RestfulResponse head(String servicePath, RestfulParametes restParametes, RestfulOptions options)
+            throws ServiceException;
+
+    /**
+     * Http HEAD method.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @return response.
+     * @throws ServiceException
+     * @since
+     */
+    RestfulResponse head(String servicePath, RestfulParametes restParametes) throws ServiceException;
+
+    /**
+     * Http GET method.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @param options: request options.
+     * @return response.
+     * @throws ServiceException
+     * @since
+     */
+    RestfulResponse get(String servicePath, RestfulParametes restParametes, RestfulOptions options)
+            throws ServiceException;
+
+    /**
+     * Asynchronouse GET request.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @param callback: response callback method.
+     * @throws ServiceException
+     * @since
+     */
+    void asyncGet(String servicePath, RestfulParametes restParametes, RestfulAsyncCallback callback)
+            throws ServiceException;
+
+    /**
+     * Asynchronouse GET request.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @param options: request options.
+     * @param callback: response callback method.
+     * @throws ServiceException
+     * @since
+     */
+    void asyncGet(String servicePath, RestfulParametes restParametes, RestfulOptions options,
+            RestfulAsyncCallback callback) throws ServiceException;
+
+    /**
+     * Http PUT method.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @return response.
+     * @throws ServiceException
+     * @since
+     */
+    RestfulResponse put(String servicePath, RestfulParametes restParametes) throws ServiceException;
+
+    /**
+     * Http PUT method.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @param options: request options.
+     * @return response.
+     * @throws ServiceException
+     * @since
+     */
+    RestfulResponse put(String servicePath, RestfulParametes restParametes, RestfulOptions options)
+            throws ServiceException;
+
+    /**
+     * Asynchronouse PUT request.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @param callback: response callback method.
+     * @throws ServiceException
+     * @since
+     */
+    void asyncPut(String servicePath, RestfulParametes restParametes, RestfulAsyncCallback callback)
+            throws ServiceException;
+
+    /**
+     * Asynchronouse PUT request.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @param options: request options.
+     * @param callback: response callback method.
+     * @throws ServiceException
+     * @since
+     */
+    void asyncPut(String servicePath, RestfulParametes restParametes, RestfulOptions options,
+            RestfulAsyncCallback callback) throws ServiceException;
+
+    /**
+     * Http POST method.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @return response.
+     * @throws ServiceException
+     * @since
+     */
+    RestfulResponse post(String servicePath, RestfulParametes restParametes) throws ServiceException;
+
+    /**
+     * Http POST method.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @param options: request options.
+     * @return response.
+     * @throws ServiceException
+     * @since
+     */
+    RestfulResponse post(String servicePath, RestfulParametes restParametes, RestfulOptions options)
+            throws ServiceException;
+
+    /**
+     * Asynchronouse POST request.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @param callback: response callback method.
+     * @throws ServiceException
+     * @since
+     */
+    void asyncPost(String servicePath, RestfulParametes restParametes, RestfulAsyncCallback callback)
+            throws ServiceException;
+
+    /**
+     * Asynchronouse POST request.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @param options: request options.
+     * @param callback: response callback method.
+     * @throws ServiceException
+     * @since
+     */
+    void asyncPost(String servicePath, RestfulParametes restParametes, RestfulOptions options,
+            RestfulAsyncCallback callback) throws ServiceException;
+
+    /**
+     * Http DELETE method.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @return response.
+     * @throws ServiceException
+     * @since
+     */
+    RestfulResponse delete(String servicePath, RestfulParametes restParametes) throws ServiceException;
+
+    /**
+     * Http DELETE method.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @param options: request options.
+     * @return response.
+     * @throws ServiceException
+     * @since
+     */
+    RestfulResponse delete(String servicePath, RestfulParametes restParametes, RestfulOptions options)
+            throws ServiceException;
+
+    /**
+     * Asynchronouse DELETE request.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @param callback: response callback method.
+     * @throws ServiceException
+     * @since
+     */
+    void asyncDelete(String servicePath, RestfulParametes restParametes, RestfulAsyncCallback callback)
+            throws ServiceException;
+
+    /**
+     * Asynchronouse DELETE request.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @param options: request options.
+     * @param callback: response callback method.
+     * @throws ServiceException
+     * @since
+     */
+    void asyncDelete(String servicePath, RestfulParametes restParametes, RestfulOptions options,
+            RestfulAsyncCallback callback) throws ServiceException;
+
+    /**
+     * Http PATCH method.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @return response.
+     * @throws ServiceException
+     * @since
+     */
+    RestfulResponse patch(String servicePath, RestfulParametes restParametes) throws ServiceException;
+
+    /**
+     * Http PATCH method.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @param options: request options.
+     * @return response.
+     * @throws ServiceException
+     * @since
+     */
+    RestfulResponse patch(String servicePath, RestfulParametes restParametes, RestfulOptions options)
+            throws ServiceException;
+
+    /**
+     * Asynchronouse PATCH request.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @param callback: response callback method.
+     * @throws ServiceException
+     * @since
+     */
+    void asyncPatch(String servicePath, RestfulParametes restParametes, RestfulAsyncCallback callback)
+            throws ServiceException;
+
+    /**
+     * Asynchronouse PATCH request.<br/>
+     * 
+     * @param servicePath: request path.
+     * @param restParametes: request parameters.
+     * @param options: request options.
+     * @param callback: response callback method.
+     * @throws ServiceException
+     * @since
+     */
+    void asyncPatch(String servicePath, RestfulParametes restParametes, RestfulOptions options,
+            RestfulAsyncCallback callback) throws ServiceException;
+}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulAsyncCallback.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulAsyncCallback.java
new file mode 100644 (file)
index 0000000..a3096ca
--- /dev/null
@@ -0,0 +1,44 @@
+/*
+ * 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.onap.vfc.nfvo.resmanagement.common.util.restclient;
+
+/**
+ * Callback interface for ReST calls.<br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version 28-May-2016
+ */
+public interface RestfulAsyncCallback {
+
+    /**
+     * Response callback.<br/>
+     * 
+     * @param response: response of ReST call.
+     * @since
+     */
+    void callback(RestfulResponse response);
+
+    /**
+     * Exceptoin callback.<br/>
+     * 
+     * @param e: ReST call exception.
+     * @since
+     */
+    void handleExcepion(Throwable e);
+}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulClientConst.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulClientConst.java
new file mode 100644 (file)
index 0000000..bbc5057
--- /dev/null
@@ -0,0 +1,64 @@
+/*
+ * 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.onap.vfc.nfvo.resmanagement.common.util.restclient;
+
+/**
+ * Constants for ReST client.<br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version 28-May-2016
+ */
+public class RestfulClientConst {
+
+    /** -- json Ecode -- **/
+    public static final String APPLICATION_FORM_JSON_EBCIDED = "application/json";
+
+    /**
+     * urlencode
+     */
+    public static final String APPLICATION_FORM_URLENCODED = "application/x-www-form-urlencoded; charset=UTF-8";
+
+    public static final String ENCODING = "UTF-8";
+
+    public static final String SERVER_KEY_NAME = "defaultServer";
+
+    public static final String HOST_KEY_NAME = "host";
+
+    public static final String PORT_KEY_NAME = "port";
+
+    public static final String CONN_TIMEOUT_KEY_NAME = "ConnectTimeout";
+
+    public static final String THREAD_KEY_NAME = "thread";
+
+    public static final String IDLE_TIMEOUT_KEY_NAME = "idletimeout";
+
+    public static final String TIMEOUT_KEY_NAME = "timeout";
+
+    public static final String MAX_CONN_PER_ADDR_KEY_NAME = "maxConnectionPerAddr";
+
+    public static final String REQUEST_ID = "x-request-id";
+
+    public static final String MAX_RESPONSE_HEADER_SIZE = "responseHeaderSize";
+
+    public static final String MAX_REQUEST_HEADER_SIZE = "requestHeaderSize";
+
+    private RestfulClientConst() {
+
+    }
+}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulConfigure.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulConfigure.java
new file mode 100644 (file)
index 0000000..fc6f44a
--- /dev/null
@@ -0,0 +1,161 @@
+/*
+ * 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.onap.vfc.nfvo.resmanagement.common.util.restclient;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import net.sf.json.JSONObject;
+
+/**
+ * Rest client options.<br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version 28-May-2016
+ */
+public class RestfulConfigure {
+
+    private static final Logger LOG = LoggerFactory.getLogger(RestfulConfigure.class);
+
+    private RestfulOptions options = null;
+
+    /**
+     * Constructor<br/>
+     * <p>
+     * Use the default path initialization http Rest options.
+     * </p>
+     * 
+     * @since
+     */
+    public RestfulConfigure() {
+        final String config = "/etc/conf/restclient.json";
+        final String approot = SystemEnvVariablesFactory.getInstance().getAppRoot();
+        final StringBuilder extendSetting = new StringBuilder();
+
+        if(approot != null) {
+            extendSetting.append(approot);
+            extendSetting.append(config);
+        } else {
+            extendSetting.append(System.getProperty("user.dir"));
+            extendSetting.append(config);
+        }
+
+        final String configfile = extendSetting.toString();
+        initRestConf(configfile);
+    }
+
+    /**
+     * Constructor<br/>
+     * <p>
+     * Use the specified file to initialize http Rest options.
+     * </p>
+     * 
+     * @since
+     * @param configfile
+     */
+    public RestfulConfigure(final String configfile) {
+        initRestConf(configfile);
+    }
+
+    public RestfulOptions getOptions() {
+        return options;
+    }
+
+    private void initRestConf(final String configfile) {
+        options = getDefaultOptions();
+
+        final JSONObject obj = loadJsonFromFile(configfile);
+        if(obj != null) {
+            if(obj.has(RestfulClientConst.SERVER_KEY_NAME)) {
+                final JSONObject server = obj.getJSONObject(RestfulClientConst.SERVER_KEY_NAME);
+                setStringOption(server, RestfulClientConst.HOST_KEY_NAME);
+                setIntOption(server, RestfulClientConst.PORT_KEY_NAME);
+            }
+            setIntOption(obj, RestfulClientConst.CONN_TIMEOUT_KEY_NAME);
+            setIntOption(obj, RestfulClientConst.THREAD_KEY_NAME);
+            setIntOption(obj, RestfulClientConst.IDLE_TIMEOUT_KEY_NAME);
+            setIntOption(obj, RestfulClientConst.TIMEOUT_KEY_NAME);
+            setIntOption(obj, RestfulClientConst.MAX_CONN_PER_ADDR_KEY_NAME);
+            setIntOption(obj, RestfulClientConst.MAX_RESPONSE_HEADER_SIZE);
+            setIntOption(obj, RestfulClientConst.MAX_REQUEST_HEADER_SIZE);
+        } else {
+            LOG.error("failed to load json from " + configfile);
+        }
+    }
+
+    private void setStringOption(final JSONObject json, final String key) {
+        if(json.has(key)) {
+            options.setOption(key, json.getString(key));
+        }
+    }
+
+    private void setIntOption(final JSONObject json, final String key) {
+        if(json.has(key)) {
+            options.setOption(key, json.getInt(key));
+        }
+    }
+
+    private RestfulOptions getDefaultOptions() {
+        options = new RestfulOptions();
+        options.setOption(RestfulClientConst.CONN_TIMEOUT_KEY_NAME, 3000);
+        options.setOption(RestfulClientConst.THREAD_KEY_NAME, 200);
+        options.setOption(RestfulClientConst.IDLE_TIMEOUT_KEY_NAME, 30000);
+        options.setOption(RestfulClientConst.TIMEOUT_KEY_NAME, 30000);
+        options.setOption(RestfulClientConst.MAX_CONN_PER_ADDR_KEY_NAME, 50);
+        options.setOption(RestfulClientConst.MAX_RESPONSE_HEADER_SIZE, 20 * 1024);
+        options.setOption(RestfulClientConst.MAX_REQUEST_HEADER_SIZE, 20 * 1024);
+        return options;
+    }
+
+    private JSONObject loadJsonFromFile(final String filePath) {
+        final File file = new File(filePath);
+        if((!file.exists()) || (!file.isFile())) {
+            LOG.error(filePath + "isn't exist.");
+            return null;
+        }
+        BufferedReader reader = null;
+        final StringBuilder jsonstr = new StringBuilder();
+        JSONObject jo = null;
+        try {
+            reader = new BufferedReader(new FileReader(file));
+            final ReaderHelper rHelpper = new ReaderHelper(reader);
+            String tempString = null;
+            while((tempString = rHelpper.getLine()) != null) {
+                jsonstr.append(tempString);
+            }
+            jo = JSONObject.fromObject(jsonstr.toString());
+        } catch(final IOException e) {
+            LOG.error("load file exception:" + e);
+        } finally {
+            if(reader != null) {
+                try {
+                    reader.close();
+                } catch(final IOException e) {
+                    LOG.error("close error.", e);
+                }
+            }
+        }
+        return jo;
+    }
+}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulFactory.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulFactory.java
new file mode 100644 (file)
index 0000000..8a79463
--- /dev/null
@@ -0,0 +1,94 @@
+/*
+ * 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.onap.vfc.nfvo.resmanagement.common.util.restclient;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * RestFul instance factory. <br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version 28-May-2016
+ */
+public class RestfulFactory {
+
+    /**
+     * https protocol.
+     */
+    public static final String PROTO_HTTPS = "https";
+
+    /**
+     * http protocol.
+     */
+    public static final String PROTO_HTTP = "http";
+
+    private static final Logger LOG = LoggerFactory.getLogger(RestfulFactory.class);
+
+    private static final Map<String, Restful> INSTANCES = new HashMap<>(2);
+
+    private RestfulFactory() {
+
+    }
+
+    /**
+     * Get RESTful instance. This method returns a singleton instance.
+     * <br/>
+     * 
+     * @param protocol protocol. currently only support 'http'.
+     * @return restful instance.
+     * @since
+     */
+    public static synchronized Restful getRestInstance(final String protocol) {
+        Restful rest = INSTANCES.get(protocol);
+        if(rest != null) {
+            return rest;
+        }
+        if(PROTO_HTTP.equals(protocol)) {
+            rest = createHttpRest();
+            INSTANCES.put(protocol, rest);
+        }
+        return rest;
+    }
+
+    private static Restful createHttpRest() {
+        final HttpRest rest = new HttpRest();
+        setRestOption(rest, null);
+        return rest;
+    }
+
+    private static void setRestOption(final HttpRest rest, final String restoptionfile) {
+        try {
+            RestfulConfigure config;
+            if(restoptionfile == null || restoptionfile.isEmpty()) {
+                config = new RestfulConfigure();
+            } else {
+                config = new RestfulConfigure(restoptionfile);
+            }
+
+            final RestfulOptions option = config.getOptions();
+            rest.initHttpRest(option);
+        } catch(final ServiceException e) {
+            LOG.error("init http client exception: ", e);
+        }
+    }
+}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulOptions.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulOptions.java
new file mode 100644 (file)
index 0000000..eceb180
--- /dev/null
@@ -0,0 +1,171 @@
+/*
+ * 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.onap.vfc.nfvo.resmanagement.common.util.restclient;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Options for Rest communication.<br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version 28-May-2016
+ */
+public class RestfulOptions {
+
+    public static final String REST_OPTIONS_NAME_TIMEOUT = "timeout";
+
+    public static final int REST_OPTIONS_TIMEOUT_MAXTIMEOUT = 1800000;
+
+    private final Map<String, Object> optionsMap = new HashMap<>();
+
+    /**
+     * Get port.<br/>
+     * 
+     * @return port.
+     * @since
+     */
+    public int getPort() {
+        final Object obj = this.getOption(RestfulClientConst.PORT_KEY_NAME);
+        if(null == obj) {
+            return 0;
+        }
+        return ((Integer)obj).intValue();
+    }
+
+    /**
+     * Set port.<br/>
+     * 
+     * @param port port to set.
+     * @return
+     * @since
+     */
+    public boolean setPort(final int port) {
+        this.setOption(RestfulClientConst.PORT_KEY_NAME, port);
+        return true;
+    }
+
+    /**
+     * Get host.<br/>
+     * 
+     * @return the host.
+     * @since
+     */
+    public String getHost() {
+        final Object obj = this.getOption(RestfulClientConst.HOST_KEY_NAME);
+        if(null == obj) {
+            return "";
+        }
+        return (String)obj;
+    }
+
+    /**
+     * Set host.<br/>
+     * 
+     * @param host host to set.
+     * @return
+     * @since
+     */
+    public boolean setHost(final String host) {
+        this.setOption(RestfulClientConst.HOST_KEY_NAME, host);
+        return true;
+    }
+
+    /**
+     * Set rest time-out.<br/>
+     * 
+     * @param timeout time-out to set in seconds.
+     * @return
+     * @since
+     */
+    public boolean setRestTimeout(final int timeout) {
+        if(0 < timeout && REST_OPTIONS_TIMEOUT_MAXTIMEOUT >= timeout) {
+            this.setOption(REST_OPTIONS_NAME_TIMEOUT, timeout);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Get time-out.<br/>
+     * 
+     * @return time-out in seconds.
+     * @since
+     */
+    public int getRestTimeout() {
+        final Object obj = this.getOption(REST_OPTIONS_NAME_TIMEOUT);
+        if(null == obj) {
+            return 0;
+        }
+        return ((Integer)obj).intValue();
+    }
+
+    /**
+     * Get specified option.<br/>
+     * 
+     * @param optionName option name.
+     * @return option
+     * @since
+     */
+    public Object getOption(final String optionName) {
+        return optionsMap.get(optionName);
+    }
+
+    /**
+     * Get option value as integer.<br/>
+     * 
+     * @param optionName option name.
+     * @return option value as int.
+     * @since
+     */
+    public int getIntOption(final String optionName) {
+        final Object obj = this.getOption(optionName);
+        if(null == obj) {
+            return 0;
+        }
+        return ((Integer)obj).intValue();
+    }
+
+    /**
+     * Get option value as string.<br/>
+     * 
+     * @param optionName option name.
+     * @return option value as string.
+     * @since
+     */
+    public String getStringOption(final String optionName) {
+        final Object obj = this.getOption(optionName);
+        if(null == obj) {
+            return "";
+        }
+        return (String)obj;
+    }
+
+    /**
+     * Set option.<br/>
+     * 
+     * @param option option name.
+     * @param optionsValue option value.
+     * @return
+     * @since
+     */
+    public Object setOption(final String option, final Object optionsValue) {
+        return optionsMap.put(option, optionsValue);
+    }
+}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulParametes.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulParametes.java
new file mode 100644 (file)
index 0000000..f7eb359
--- /dev/null
@@ -0,0 +1,155 @@
+/*
+ * 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.onap.vfc.nfvo.resmanagement.common.util.restclient;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * <br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version Aug 9, 2016
+ */
+public class RestfulParametes {
+
+    private Map<String, String> paramMap = new HashMap<>();
+
+    private Map<String, String> headerMap = new HashMap<>();
+
+    private String rawData = null;
+
+    /**
+     * <br/>
+     * 
+     * @param key
+     * @return
+     * @since
+     */
+    public String get(final String key) {
+        return paramMap.get(key);
+    }
+
+    /**
+     * <br/>
+     * 
+     * @param data
+     * @since
+     */
+    public void setRawData(final String data) {
+        this.rawData = data;
+    }
+
+    /**
+     * <br/>
+     * 
+     * @return
+     * @since
+     */
+    public String getRawData() {
+        return this.rawData;
+    }
+
+    /**
+     * <br/>
+     * 
+     * @param key
+     * @param value
+     * @return
+     * @since
+     */
+    public String put(final String key, final String value) {
+        return paramMap.put(key, value);
+    }
+
+    /**
+     * <br/>
+     * 
+     * @param key
+     * @param value
+     * @return
+     * @since
+     */
+    public String putHttpContextHeader(final String key, final String value) {
+        return headerMap.put(key, value);
+    }
+
+    /**
+     * <br/>
+     * 
+     * @param key
+     * @param value
+     * @return
+     * @since
+     */
+    public String putHttpContextHeader(final String key, final int value) {
+        return this.putHttpContextHeader(key, String.valueOf(value));
+    }
+
+    /**
+     * <br/>
+     * 
+     * @param key
+     * @return
+     * @since
+     */
+    public String getHttpContextHeader(final String key) {
+        return headerMap.get(key);
+    }
+
+    /**
+     * <br/>
+     * 
+     * @return
+     * @since
+     */
+    public Map<String, String> getParamMap() {
+        return paramMap;
+    }
+
+    /**
+     * <br/>
+     * 
+     * @param paramMap
+     * @since
+     */
+    public void setParamMap(final Map<String, String> paramMap) {
+        this.paramMap = paramMap;
+    }
+
+    /**
+     * <br/>
+     * 
+     * @return
+     * @since
+     */
+    public Map<String, String> getHeaderMap() {
+        return this.headerMap;
+    }
+
+    /**
+     * <br/>
+     * 
+     * @param headerMap
+     * @since
+     */
+    public void setHeaderMap(final Map<String, String> headerMap) {
+        this.headerMap = headerMap;
+    }
+}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulResponse.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/RestfulResponse.java
new file mode 100644 (file)
index 0000000..c805532
--- /dev/null
@@ -0,0 +1,144 @@
+/*
+ * 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.onap.vfc.nfvo.resmanagement.common.util.restclient;
+
+import java.util.Map;
+
+/**
+ * Response for RestFul requests.<br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version 28-May-2016
+ */
+public class RestfulResponse {
+
+    private String responseContent;
+
+    private int status = -1;
+
+    private Map<String, String> respHeaderMap = null;
+
+    /**
+     * <br/>
+     * 
+     * @return
+     * @since
+     */
+    public int getStatus() {
+        return status;
+    }
+
+    /**
+     * <br/>
+     * 
+     * @param status
+     * @since
+     */
+    public void setStatus(final int status) {
+        this.status = status;
+    }
+
+    /**
+     * <br/>
+     * 
+     * @return
+     * @since
+     */
+    public Map<String, String> getRespHeaderMap() {
+        return respHeaderMap;
+    }
+
+    /**
+     * <br/>
+     * 
+     * @param header
+     * @since
+     */
+    public void setRespHeaderMap(final Map<String, String> header) {
+        this.respHeaderMap = header;
+    }
+
+    /**
+     * Get response header value as integer.<br/>
+     * 
+     * @param key header param name.
+     * @return header param value as integer. (-1 if error)
+     * @since
+     */
+    public int getRespHeaderInt(final String key) {
+        if(respHeaderMap != null) {
+            final String result = respHeaderMap.get(key);
+            if(result != null) {
+                return Integer.parseInt(result);
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * Get response header value as long.<br/>
+     * 
+     * @param key header param name.
+     * @return value as long. -1 if no value.
+     * @since
+     */
+    public long getRespHeaderLong(final String key) {
+        if(respHeaderMap != null) {
+            final String result = respHeaderMap.get(key);
+            if(result != null) {
+                return Long.parseLong(result);
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * Get http header as string.<br/>
+     * 
+     * @param key header name.
+     * @return header value.
+     * @since
+     */
+    public String getRespHeaderStr(final String key) {
+        if(respHeaderMap != null) {
+            return respHeaderMap.get(key);
+        }
+        return null;
+    }
+
+    /**
+     * <br/>
+     * 
+     * @return
+     * @since
+     */
+    public String getResponseContent() {
+        return responseContent;
+    }
+
+    /**
+     * <br/>
+     * 
+     * @param responseString
+     * @since
+     */
+    public void setResponseJson(final String responseString) {
+        this.responseContent = responseString;
+    }
+}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/ServiceException.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/ServiceException.java
new file mode 100644 (file)
index 0000000..0f6d843
--- /dev/null
@@ -0,0 +1,270 @@
+/*
+ * 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.onap.vfc.nfvo.resmanagement.common.util.restclient;
+
+import java.text.MessageFormat;
+
+/**
+ * The base class for all common exception.<br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version 28-May-2016
+ */
+public class ServiceException extends Exception {
+
+    /**
+     * default exception id.
+     */
+    public static final String DEFAULT_ID = "framwork.remote.SystemError";
+
+    /**
+     * Serial number.
+     */
+    private static final long serialVersionUID = 5703294364555144738L;
+
+    /**
+     * Exception id.
+     */
+    private String id = DEFAULT_ID;
+
+    private Object[] args = null;
+
+    private int httpCode = 500;
+
+    private ExceptionArgs exceptionArgs = null;
+
+    /**
+     * The default constructor<br/>
+     * <p>
+     * This method is only used as deserialized, in other cases, use parameterized constructor.
+     * </p>
+     * 
+     * @since
+     */
+    public ServiceException() {
+        super("");
+    }
+
+    /**
+     * Constructor<br/>
+     * <p>
+     * </p>
+     * 
+     * @since
+     * @param id: details.
+     * @param cause: reason.
+     */
+    public ServiceException(final String id, final Throwable cause) {
+        super(cause);
+        this.setId(id);
+    }
+
+    /**
+     * Constructor<br/>
+     * <p>
+     * </p>
+     * 
+     * @since
+     * @param message: details.
+     */
+    public ServiceException(final String message) {
+        super(message);
+    }
+
+    /**
+     * Constructor<br/>
+     * <p>
+     * </p>
+     * 
+     * @since
+     * @param id: exception id.
+     * @param message: details.
+     */
+    public ServiceException(final String id, final String message) {
+        super(message);
+        this.setId(id);
+    }
+
+    /**
+     * Constructor<br/>
+     * <p>
+     * </p>
+     * 
+     * @since
+     * @param id: exception id.
+     * @param httpCode: http status code.
+     */
+    public ServiceException(final String id, final int httpCode) {
+        super();
+        this.setId(id);
+        this.setHttpCode(httpCode);
+    }
+
+    /**
+     * Constructor<br/>
+     * <p>
+     * the exception include the httpcode and message.
+     * </p>
+     * 
+     * @since
+     * @param httpCode http code.
+     * @param message details.
+     */
+    public ServiceException(final int httpCode, final String message) {
+        super(message);
+        this.setHttpCode(httpCode);
+    }
+
+    /**
+     * Constructor<br/>
+     * <p>
+     * </p>
+     * 
+     * @since
+     * @param id: exception id.
+     * @param httpCode: http code.
+     * @param exceptionArgs: Exception handling frame parameters.
+     */
+    public ServiceException(final String id, final int httpCode, final ExceptionArgs exceptionArgs) {
+        super();
+        this.setId(id);
+        this.setHttpCode(httpCode);
+        this.setExceptionArgs(exceptionArgs);
+    }
+
+    /**
+     * Constructor<br/>
+     * <p>
+     * Have a placeholder exception, use args formatted message.
+     * </p>
+     * 
+     * @since
+     * @param id: exception id.
+     * @param message: details.
+     * @param args: Placeholders for parameters
+     */
+    public ServiceException(final String id, final String message, final Object... args) {
+        super(MessageFormat.format(message, args));
+        this.setId(id);
+        this.args = args;
+    }
+
+    /**
+     * Constructor<br/>
+     * <p>
+     * Have a placeholder exception, use args formatted message
+     * </p>
+     * 
+     * @since
+     * @param id: exception id.
+     * @param message: details.
+     * @param cause: reason.
+     * @param args: placeholder for parameters
+     */
+    public ServiceException(final String id, final String message, final Throwable cause, final Object... args) {
+        super(MessageFormat.format(message, args), cause);
+        this.setId(id);
+        this.args = args;
+    }
+
+    /**
+     * Constructor<br/>
+     * <p>
+     * </p>
+     * 
+     * @since
+     * @param id: exception id.
+     * @param message: details.
+     * @param cause: reason.
+     */
+    public ServiceException(final String id, final String message, final Throwable cause) {
+        super(message, cause);
+        this.setId(id);
+    }
+
+    /**
+     * Constructor<br/>
+     * <p>
+     * </p>
+     * 
+     * @since
+     * @param cause: reason.
+     */
+    public ServiceException(final Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Get exceptoin id.<br/>
+     * 
+     * @return
+     * @since
+     */
+    public String getId() {
+        if(id == null || id.isEmpty()) {
+            return DEFAULT_ID;
+        }
+        return id;
+    }
+
+    public void setId(final String id) {
+        this.id = id;
+    }
+
+    public int getHttpCode() {
+        return this.httpCode;
+    }
+
+    public void setHttpCode(final int httpCode) {
+        this.httpCode = httpCode;
+    }
+
+    /**
+     * Obtain the ROA exception handling framework parameters<br/>
+     * 
+     * @return exception args.
+     * @since
+     */
+    public ExceptionArgs getExceptionArgs() {
+        return exceptionArgs;
+    }
+
+    public void setExceptionArgs(final ExceptionArgs exceptionArgs) {
+        this.exceptionArgs = exceptionArgs;
+    }
+
+    /**
+     * Gets the parameter information<br/>
+     * 
+     * @return parameter list.
+     * @since
+     */
+    protected Object[] getArgs() {
+        if(args == null || args.length == 0 || DEFAULT_ID.equals(getId())) {
+            return new Object[] {};
+        }
+        return args;
+    }
+
+    @Override
+    public String toString() {
+        return "exception.id: " + getId() + "; " + super.toString();
+    }
+
+}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/SystemEnvVariables.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/SystemEnvVariables.java
new file mode 100644 (file)
index 0000000..78a9bf7
--- /dev/null
@@ -0,0 +1,36 @@
+/*
+ * 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.onap.vfc.nfvo.resmanagement.common.util.restclient;
+
+/**
+ * Dependency the system env<br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version 31-May-2016
+ */
+public interface SystemEnvVariables {
+
+    /**
+     * Get application root path <br/>
+     * 
+     * @return application root path.
+     * @since
+     */
+    String getAppRoot();
+}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/SystemEnvVariablesDefImpl.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/SystemEnvVariablesDefImpl.java
new file mode 100644 (file)
index 0000000..ce50cc8
--- /dev/null
@@ -0,0 +1,67 @@
+/*
+ * 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.onap.vfc.nfvo.resmanagement.common.util.restclient;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * System environment variable helper implementation.<br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version 24-Jun-2016
+ */
+public class SystemEnvVariablesDefImpl implements SystemEnvVariables {
+
+    private static final Logger LOG = LoggerFactory.getLogger(SystemEnvVariablesDefImpl.class);
+
+    @Override
+    public String getAppRoot() {
+        String appRoot = null;
+        appRoot = System.getProperty("catalina.base");
+        if(appRoot != null) {
+            appRoot = getCanonicalPath(appRoot);
+        }
+        return appRoot;
+    }
+
+    /**
+     * Gets the canonical path<br/>
+     * 
+     * @param inPath input path
+     * @return the canonical path.
+     * @since
+     */
+    private String getCanonicalPath(final String inPath) {
+        String path = null;
+        try {
+            if(inPath != null) {
+                final File file = new File(inPath);
+                path = file.getCanonicalPath();
+            }
+        } catch(final IOException e) {
+            LOG.error("file.getCanonicalPath() IOException:", e);
+        }
+        return path;
+    }
+
+}
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/SystemEnvVariablesFactory.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/util/restclient/SystemEnvVariablesFactory.java
new file mode 100644 (file)
index 0000000..e6d1655
--- /dev/null
@@ -0,0 +1,53 @@
+/*
+ * 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.onap.vfc.nfvo.resmanagement.common.util.restclient;
+
+/**
+ * SystemEnvVariables factory class
+ * <br/>
+ * <p>
+ * </p>
+ * 
+ * @author
+ * @version
+ */
+public class SystemEnvVariablesFactory {
+
+    private static SystemEnvVariables systemEnvVariablesInstance = new SystemEnvVariablesDefImpl();
+
+    /**
+     * Constructor<br/>
+     * <p>
+     * </p>
+     * 
+     * @since
+     */
+    private SystemEnvVariablesFactory() {
+
+    }
+
+    /**
+     * get the SystemEnvVariables instance
+     * <br/>
+     * 
+     * @return SystemEnvVariables instance
+     * @since
+     */
+    public static SystemEnvVariables getInstance() {
+        return systemEnvVariablesInstance;
+    }
+}
index 4054a62..5cf7627 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -22,7 +22,7 @@ import org.onap.vfc.nfvo.resmanagement.common.constant.Constant;
 import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
 import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
 import org.onap.vfc.nfvo.resmanagement.service.adapter.inf.IResmgrAdapter2MSBManager;
-import org.openo.baseservice.roa.util.restclient.RestfulResponse;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index a8256f1..f75ec06 100644 (file)
@@ -29,9 +29,9 @@ import org.onap.vfc.nfvo.resmanagement.common.constant.Constant;
 import org.onap.vfc.nfvo.resmanagement.common.constant.HttpConstant;
 import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
 import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.SystemEnvVariablesFactory;
 import org.onap.vfc.nfvo.resmanagement.service.adapter.inf.IResmgrAdapter2MSBManager;
 import org.onap.vfc.nfvo.resmanagement.service.adapter.inf.IResmgrAdapterMgrService;
-import org.openo.baseservice.util.impl.SystemEnvVariablesFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index f3afa9b..505bd50 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -22,7 +22,7 @@ import java.util.Map;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Host;
 import org.onap.vfc.nfvo.resmanagement.service.business.inf.HostBusiness;
 import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import net.sf.json.JSONObject;
 
index a3fffdb..d083f33 100644 (file)
@@ -29,7 +29,7 @@ import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;
 import org.onap.vfc.nfvo.resmanagement.service.business.inf.LocationBusiness;
 import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 8ac3b95..be82396 100644 (file)
@@ -23,7 +23,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Network;
 import org.onap.vfc.nfvo.resmanagement.service.business.inf.NetworkBusiness;
 import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index deec19d..f1ab242 100644 (file)
@@ -23,7 +23,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Port;
 import org.onap.vfc.nfvo.resmanagement.service.business.inf.PortBusiness;
 import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 939385f..b7d55c9 100644 (file)
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.VimUtil;
 import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
 import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
@@ -31,7 +31,7 @@ import org.onap.vfc.nfvo.resmanagement.service.business.inf.LimitsBusiness;
 import org.onap.vfc.nfvo.resmanagement.service.business.inf.SitesBusiness;
 import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.ResOperateService;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index f6cf553..abd9d39 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -23,7 +23,7 @@ import java.util.Map;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Vim;
 import org.onap.vfc.nfvo.resmanagement.service.business.inf.VimBusiness;
 import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import net.sf.json.JSONObject;
 
index 673d274..0c07119 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import net.sf.json.JSONObject;
 
index b9ec1f6..2540a78 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -16,7 +16,7 @@
 
 package org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf;
 
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 /**
  * <br/>
index 9767e12..9f5ba16 100644 (file)
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import net.sf.json.JSONObject;
 
index 449ebe9..ce089b6 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import net.sf.json.JSONObject;
 
index 9d073f0..3a5bf90 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import net.sf.json.JSONObject;
 
index e840827..ff19217 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -16,7 +16,7 @@
 
 package org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf;
 
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import net.sf.json.JSONObject;
 
index 7aaba35..04a4af4 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import net.sf.json.JSONObject;
 
index 9378f3f..7dfb79b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import net.sf.json.JSONObject;
 
index e66c6f5..62acb04 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,12 +20,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
 import org.onap.vfc.nfvo.resmanagement.service.business.inf.HostBusiness;
 import org.onap.vfc.nfvo.resmanagement.service.dao.inf.HostDao;
 import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 668257b..1fd6d09 100644 (file)
@@ -21,7 +21,7 @@ import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
 import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
 import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
 import org.onap.vfc.nfvo.resmanagement.service.business.inf.LimitsBusiness;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index fcbd3ae..e068056 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -21,14 +21,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
 import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
 import org.onap.vfc.nfvo.resmanagement.common.util.StringUtil;
 import org.onap.vfc.nfvo.resmanagement.service.business.inf.LocationBusiness;
 import org.onap.vfc.nfvo.resmanagement.service.dao.inf.LocationDao;
 import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 433af10..1a001e3 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,12 +20,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
 import org.onap.vfc.nfvo.resmanagement.service.business.inf.NetworkBusiness;
 import org.onap.vfc.nfvo.resmanagement.service.dao.inf.NetworkDao;
 import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index b2545ac..fc42543 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,12 +20,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
 import org.onap.vfc.nfvo.resmanagement.service.business.inf.PortBusiness;
 import org.onap.vfc.nfvo.resmanagement.service.dao.inf.PortDao;
 import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 9ffed0a..7d610cf 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -21,13 +21,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
 import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
 import org.onap.vfc.nfvo.resmanagement.service.business.inf.SitesBusiness;
 import org.onap.vfc.nfvo.resmanagement.service.dao.inf.SitesDao;
 import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 5c6dda3..03a08d4 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -18,13 +18,13 @@ package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.StringUtil;
 import org.onap.vfc.nfvo.resmanagement.service.business.inf.VimBusiness;
 import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VimDao;
 import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index e017709..db2f01e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 /**
  * Host Buisiness Class.<br/>
index 6fab40a..d75d0aa 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 /**
  *
index 80ff1e3..be4bf29 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 /**
  *
index 7e32484..92c8dae 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 /**
  * Port Buisiness Class.<br/>
index f3c09dd..bfa95f0 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 /**
  * DC info interface.<br/>
index fc2a857..9fb267d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -19,7 +19,7 @@ package org.onap.vfc.nfvo.resmanagement.service.business.inf;
 import java.util.List;
 
 import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 /**
  * Vim info interface.<br/>
index b948fd9..ce3dfd3 100644 (file)
@@ -16,7 +16,7 @@
 
 package org.onap.vfc.nfvo.resmanagement.service.entity;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
index 657c1a0..c84574f 100644 (file)
@@ -16,7 +16,7 @@
 
 package org.onap.vfc.nfvo.resmanagement.service.entity;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
index 9d4948e..47625b5 100644 (file)
@@ -16,7 +16,7 @@
 
 package org.onap.vfc.nfvo.resmanagement.service.entity;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
index adc61c7..55e5a54 100644 (file)
@@ -18,7 +18,7 @@ package org.onap.vfc.nfvo.resmanagement.service.entity;
 \r
 import java.io.Serializable;\r
 \r
-import org.apache.commons.lang3.StringUtils;\r
+import org.apache.commons.lang.StringUtils;\r
 import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;\r
 \r
 import net.sf.json.JSONObject;\r
index 6aa9c39..08c16a7 100644 (file)
@@ -16,7 +16,7 @@
 
 package org.onap.vfc.nfvo.resmanagement.service.entity;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
index b0aa27b..c294338 100644 (file)
@@ -16,7 +16,7 @@
 
 package org.onap.vfc.nfvo.resmanagement.service.entity;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.StringUtil;
 
index fc0c9e9..85bccc2 100644 (file)
@@ -16,7 +16,7 @@
 
 package org.onap.vfc.nfvo.resmanagement.service.entity;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
index 228fa5c..5c7c137 100644 (file)
@@ -18,7 +18,7 @@ package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import java.io.Serializable;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
index 817ffe2..817faca 100644 (file)
@@ -18,7 +18,7 @@ package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import java.io.Serializable;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
index 4de6658..f22db1f 100644 (file)
@@ -18,7 +18,7 @@ package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import java.io.Serializable;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
index 948187f..7d40d9f 100644 (file)
@@ -18,7 +18,7 @@ package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import java.io.Serializable;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
index 27f008e..af638e0 100644 (file)
@@ -18,7 +18,7 @@ package org.onap.vfc.nfvo.resmanagement.service.entity;
 
 import java.io.Serializable;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 
 import net.sf.json.JSONObject;
index 362f80a..136b542 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -19,7 +19,7 @@ package org.onap.vfc.nfvo.resmanagement.service.group.impl;
 import org.onap.vfc.nfvo.resmanagement.common.VimUtil;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.GrantResService;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 1247b0e..989f5e4 100644 (file)
@@ -24,8 +24,8 @@ import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
 import org.onap.vfc.nfvo.resmanagement.common.util.JsonUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.baseservice.roa.util.restclient.RestfulParametes;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.transaction.annotation.Transactional;
index 2642ae0..ce16169 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -23,7 +23,7 @@ import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
 import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Vim;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 03cbfc3..02d0558 100644 (file)
@@ -23,8 +23,8 @@ import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
 import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
 import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.InterfaceResManagement;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.baseservice.roa.util.restclient.RestfulParametes;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.transaction.annotation.Transactional;
index 81e79c8..336315b 100644 (file)
@@ -20,11 +20,11 @@ import java.util.List;
 import java.util.Map;\r
 import java.util.UUID;\r
 \r
-import org.apache.commons.lang3.StringUtils;\r
+import org.apache.commons.lang.StringUtils;\r
 import org.onap.vfc.nfvo.resmanagement.service.dao.inf.NsDao;\r
 import org.onap.vfc.nfvo.resmanagement.service.entity.NsEntity;\r
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.NsService;\r
-import org.openo.baseservice.remoteservice.exception.ServiceException;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 \r
index 4a8ae39..56b3c2c 100644 (file)
@@ -20,7 +20,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
 import org.onap.vfc.nfvo.resmanagement.common.constant.Constant;
 import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
@@ -37,8 +37,8 @@ import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Vim;
 import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.ResOperateService;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.baseservice.roa.util.restclient.RestfulParametes;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.transaction.annotation.Transactional;
index 6619bfe..9efb312 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,12 +20,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
 import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VirtualLinkDao;
 import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.VirtualLinkService;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index df73a15..a078369 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -21,15 +21,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
 import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
 import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
 import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VmDao;
 import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.VmService;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.baseservice.roa.util.restclient.RestfulParametes;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index bf4ce37..f87862b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -24,7 +24,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
 import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.VmService;
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfInfoService;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 59059ea..6f7c889 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,13 +20,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.onap.vfc.nfvo.resmanagement.common.ResourceUtil;
 import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VnfDao;
 import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfInfoService;
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfService;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 49bfda1..30d82fc 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -22,7 +22,7 @@ import java.util.Map;
 import org.onap.vfc.nfvo.resmanagement.service.dao.inf.VnfStatusDao;
 import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfStatusService;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index ff483e3..92941a6 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -16,7 +16,7 @@
 
 package org.onap.vfc.nfvo.resmanagement.service.group.inf;
 
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import net.sf.json.JSONObject;
 
index add9f47..43760ab 100644 (file)
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;\r
 \r
 import org.onap.vfc.nfvo.resmanagement.service.entity.NsEntity;\r
-import org.openo.baseservice.remoteservice.exception.ServiceException;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;\r
 \r
 import net.sf.json.JSONObject;\r
 \r
index 89c2d67..b4f9c06 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -16,7 +16,7 @@
 
 package org.onap.vfc.nfvo.resmanagement.service.group.inf;
 
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import net.sf.json.JSONObject;
 
index a74c08a..2bec012 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import net.sf.json.JSONObject;
 
index 8b5d56f..785a95f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import net.sf.json.JSONObject;
 
index da408e1..3feadae 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import net.sf.json.JSONObject;
 
index 196f383..c81d4e8 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import net.sf.json.JSONObject;
 
index df5e4d9..8ac4b62 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import net.sf.json.JSONObject;
 
index 23190a7..1ed375d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -30,7 +30,7 @@ import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
 import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.GrantResService;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 43f0993..a00d25b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -41,7 +41,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Host;
 import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 2b86d3e..6f6d97f 100644 (file)
@@ -28,7 +28,7 @@ import javax.ws.rs.core.MediaType;
 import org.onap.vfc.nfvo.resmanagement.common.constant.ParamConstant;
 import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
 import org.onap.vfc.nfvo.resmanagement.service.business.inf.LimitsBusiness;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index b875f53..745b487 100644 (file)
@@ -46,7 +46,7 @@ import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Location;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;
 import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 22dc8e1..1995c66 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -41,7 +41,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Network;
 import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 63905ea..3a825f0 100644 (file)
@@ -1,3 +1,18 @@
+/*\r
+ * Copyright 2017 Huawei Technologies Co., Ltd.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *     http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
 \r
 package org.onap.vfc.nfvo.resmanagement.service.rest;\r
 \r
@@ -25,7 +40,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;\r
 import org.onap.vfc.nfvo.resmanagement.service.entity.NsEntity;\r
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.NsService;\r
-import org.openo.baseservice.remoteservice.exception.ServiceException;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 \r
index dbe5780..0f8f7b7 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -41,7 +41,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Port;
 import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 4a4a976..e1c2fa4 100644 (file)
@@ -35,7 +35,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.ResOperateService;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 9b7c8e4..4892d8e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -41,7 +41,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;
 import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index fd2a325..7f470b4 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -40,7 +40,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.VirtualLinkService;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index a13d295..732c818 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -40,7 +40,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.VmService;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 25351d6..468f394 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -40,7 +40,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfInfoService;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 96b90d7..e972992 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -38,9 +38,9 @@ import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
 import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfService;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index a071199..763aa36 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -40,7 +40,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.response.ResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.common.util.response.RoaResponseUtil;
 import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfStatusService;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
index 47d2a0d..c726255 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Huawei Technologies Co., Ltd.
+ * Copyright 2016-2017 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.
@@ -21,7 +21,7 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 /**
  * ServiceException response provider.<br>
index 6d15bbc..ddcb779 100644 (file)
@@ -24,9 +24,9 @@ import org.junit.Test;
 import org.onap.vfc.nfvo.resmanagement.common.VimUtil;
 import org.onap.vfc.nfvo.resmanagement.common.constant.UrlConstant;
 import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
-import org.openo.baseservice.roa.util.restclient.RestfulOptions;
-import org.openo.baseservice.roa.util.restclient.RestfulParametes;
-import org.openo.baseservice.roa.util.restclient.RestfulResponse;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulOptions;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulResponse;
 
 import mockit.Mock;
 import mockit.MockUp;
index 8947985..531b8e5 100644 (file)
@@ -25,10 +25,10 @@ import java.util.Map;
 import org.junit.Test;
 import org.onap.vfc.nfvo.resmanagement.common.constant.Constant;
 import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.baseservice.roa.util.restclient.RestfulOptions;
-import org.openo.baseservice.roa.util.restclient.RestfulParametes;
-import org.openo.baseservice.roa.util.restclient.RestfulResponse;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulOptions;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulResponse;
 
 import mockit.Mock;
 import mockit.MockUp;
index 07b53a8..356da82 100644 (file)
@@ -24,7 +24,7 @@ import java.util.Map;
 import org.junit.Test;
 import org.onap.vfc.nfvo.resmanagement.common.util.RestfulUtil;
 import org.onap.vfc.nfvo.resmanagement.service.adapter.impl.ResmgrAdapter2MSBManager;
-import org.openo.baseservice.roa.util.restclient.RestfulResponse;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulResponse;
 
 import mockit.Mock;
 import mockit.MockUp;
index 8e5dcc4..7c51c81 100644 (file)
@@ -26,7 +26,7 @@ import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.HostImpl;
 import org.onap.vfc.nfvo.resmanagement.service.business.impl.HostBusinessImpl;
 import org.onap.vfc.nfvo.resmanagement.service.dao.impl.HostDaoImpl;
 import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import mockit.Mock;
 import mockit.MockUp;
index 803d421..56ba16f 100644 (file)
@@ -32,7 +32,7 @@ import org.onap.vfc.nfvo.resmanagement.service.business.impl.SitesBusinessImpl;
 import org.onap.vfc.nfvo.resmanagement.service.dao.impl.LocationDaoImpl;
 import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import mockit.Mock;
 import mockit.MockUp;
index a94e994..5b8368d 100644 (file)
@@ -28,7 +28,7 @@ import org.onap.vfc.nfvo.resmanagement.service.business.impl.NetworkBusinessImpl
 import org.onap.vfc.nfvo.resmanagement.service.dao.impl.NetworkDaoImpl;
 import org.onap.vfc.nfvo.resmanagement.service.dao.inf.NetworkDao;
 import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import mockit.Mock;
 import mockit.MockUp;
index ae482f4..807a898 100644 (file)
@@ -24,7 +24,7 @@ import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.PortImpl;
 import org.onap.vfc.nfvo.resmanagement.service.business.impl.PortBusinessImpl;
 import org.onap.vfc.nfvo.resmanagement.service.dao.impl.PortDaoImpl;
 import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import mockit.Mock;
 import mockit.MockUp;
index 95bbca7..ee63537 100644 (file)
@@ -27,7 +27,7 @@ import org.junit.Test;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.SitesImpl;
 import org.onap.vfc.nfvo.resmanagement.service.business.impl.SitesBusinessImpl;
 import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import mockit.Mock;
 import mockit.MockUp;
index 28a7344..46ff5fd 100644 (file)
@@ -24,7 +24,7 @@ import org.junit.Test;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.VimImpl;
 import org.onap.vfc.nfvo.resmanagement.service.business.impl.VimBusinessImpl;
 import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import mockit.Mock;
 import mockit.MockUp;
index 18ade35..e94923d 100644 (file)
@@ -22,7 +22,7 @@ import org.junit.Test;
 import org.onap.vfc.nfvo.resmanagement.service.business.impl.HostBusinessImpl;
 import org.onap.vfc.nfvo.resmanagement.service.dao.impl.HostDaoImpl;
 import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import mockit.Mock;
 import mockit.MockUp;
index c5c9d78..56e0a44 100644 (file)
@@ -19,11 +19,11 @@ package org.onap.vfc.nfvo.resmanagement.service.business.impl;
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.vfc.nfvo.resmanagement.service.business.impl.LimitsBusinessImpl;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
-import org.openo.baseservice.roa.util.restclient.HttpRest;
-import org.openo.baseservice.roa.util.restclient.RestfulOptions;
-import org.openo.baseservice.roa.util.restclient.RestfulParametes;
-import org.openo.baseservice.roa.util.restclient.RestfulResponse;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.HttpRest;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulOptions;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulParametes;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.RestfulResponse;
 
 import mockit.Mock;
 import mockit.MockUp;
index 70ba66e..0f134d4 100644 (file)
@@ -23,7 +23,7 @@ import org.junit.Test;
 import org.onap.vfc.nfvo.resmanagement.service.business.impl.LocationBusinessImpl;
 import org.onap.vfc.nfvo.resmanagement.service.dao.impl.LocationDaoImpl;
 import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import mockit.Mock;
 import mockit.MockUp;
index ce33e8f..b0095b2 100644 (file)
@@ -30,7 +30,7 @@ import org.junit.Test;
 import org.onap.vfc.nfvo.resmanagement.service.business.impl.SitesBusinessImpl;
 import org.onap.vfc.nfvo.resmanagement.service.dao.impl.SitesDaoImpl;
 import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import mockit.Mock;
 import mockit.MockUp;
index c36aaf2..d5e8bdb 100644 (file)
@@ -25,7 +25,7 @@ import org.junit.Test;
 import org.onap.vfc.nfvo.resmanagement.service.business.impl.VimBusinessImpl;
 import org.onap.vfc.nfvo.resmanagement.service.dao.impl.VimDaoImpl;
 import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import mockit.Mock;
 import mockit.MockUp;
index 9ec2c8d..584502f 100644 (file)
@@ -24,7 +24,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;
 import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.onap.vfc.nfvo.resmanagement.service.mapper.HostMapper;
 import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import mockit.Expectations;
 import mockit.Mock;
index 908dd5c..b0cde7c 100644 (file)
@@ -25,7 +25,7 @@ import org.onap.vfc.nfvo.resmanagement.service.dao.impl.NetworkDaoImpl;
 import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;
 import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.onap.vfc.nfvo.resmanagement.service.mapper.LocationMapper;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import mockit.Mock;
 import mockit.MockUp;
index 88117fa..43b9f8c 100644 (file)
@@ -26,7 +26,7 @@ import org.onap.vfc.nfvo.resmanagement.service.dao.impl.AbstractDao;
 import org.onap.vfc.nfvo.resmanagement.service.dao.impl.NetworkDaoImpl;
 import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import mockit.Expectations;
 import mockit.Mock;
index efb633c..ec8c1cd 100644 (file)
@@ -25,7 +25,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;
 import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
 import org.onap.vfc.nfvo.resmanagement.service.mapper.PortMapper;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import mockit.Expectations;
 import mockit.Mock;
index 0944936..560fbed 100644 (file)
@@ -24,7 +24,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.onap.vfc.nfvo.resmanagement.service.mapper.NetworkMapper;
 import org.onap.vfc.nfvo.resmanagement.service.mapper.SitesMapper;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import mockit.Expectations;
 import mockit.Mock;
index 8adf0c8..b88a414 100644 (file)
@@ -26,7 +26,7 @@ import org.onap.vfc.nfvo.resmanagement.service.dao.impl.VimDaoImpl;
 import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.onap.vfc.nfvo.resmanagement.service.entity.VimEntity;
 import org.onap.vfc.nfvo.resmanagement.service.mapper.VimMapper;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import mockit.Expectations;
 import mockit.Mock;
index fa7fb54..e8b00b0 100644 (file)
@@ -24,7 +24,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;
 import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
 import org.onap.vfc.nfvo.resmanagement.service.mapper.SitesMapper;
 import org.onap.vfc.nfvo.resmanagement.service.mapper.VirtualLinkMapper;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import mockit.Mock;
 import mockit.MockUp;
index 07ac61c..a74cf11 100644 (file)
@@ -23,7 +23,7 @@ import org.onap.vfc.nfvo.resmanagement.service.dao.impl.VmDaoImpl;
 import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
 import org.onap.vfc.nfvo.resmanagement.service.mapper.SitesMapper;
 import org.onap.vfc.nfvo.resmanagement.service.mapper.VmMapper;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 
 import mockit.Mock;
 import mockit.MockUp;
index 952ca90..7df1ee2 100644 (file)
@@ -26,7 +26,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
 import org.onap.vfc.nfvo.resmanagement.service.group.impl.GrantResServiceImpl;\r
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.GrantResService;\r
 import org.onap.vfc.nfvo.resmanagement.service.rest.GrantResourseRoa;\r
-import org.openo.baseservice.remoteservice.exception.ServiceException;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
 import mockit.Mock;\r
index 72e79d7..e2c402a 100644 (file)
@@ -31,7 +31,7 @@ import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.HostImpl;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Host;\r
 import org.onap.vfc.nfvo.resmanagement.service.entity.HostEntity;\r
 import org.onap.vfc.nfvo.resmanagement.service.rest.HostRoa;\r
-import org.openo.baseservice.remoteservice.exception.ServiceException;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
 import mockit.Mock;\r
index 391aad3..d92bd31 100644 (file)
@@ -25,7 +25,7 @@ import org.junit.Test;
 import org.onap.vfc.nfvo.resmanagement.service.business.impl.LimitsBusinessImpl;\r
 import org.onap.vfc.nfvo.resmanagement.service.business.inf.LimitsBusiness;\r
 import org.onap.vfc.nfvo.resmanagement.service.rest.LimitsRoa;\r
-import org.openo.baseservice.remoteservice.exception.ServiceException;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
 import mockit.Mock;\r
index 78157f6..05b80ec 100644 (file)
@@ -34,7 +34,7 @@ import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Sites;
 import org.onap.vfc.nfvo.resmanagement.service.entity.LocationEntity;\r
 import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;\r
 import org.onap.vfc.nfvo.resmanagement.service.rest.LocationRoa;\r
-import org.openo.baseservice.remoteservice.exception.ServiceException;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
 import mockit.Mock;\r
index 4536b0d..13e6815 100644 (file)
@@ -31,7 +31,7 @@ import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.NetworkImpl;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Network;\r
 import org.onap.vfc.nfvo.resmanagement.service.entity.NetworkEntity;\r
 import org.onap.vfc.nfvo.resmanagement.service.rest.NetworkRoa;\r
-import org.openo.baseservice.remoteservice.exception.ServiceException;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
 import mockit.Mock;\r
index 181e6e5..0feca60 100644 (file)
@@ -31,7 +31,7 @@ import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.PortImpl;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.inf.Port;\r
 import org.onap.vfc.nfvo.resmanagement.service.entity.PortEntity;\r
 import org.onap.vfc.nfvo.resmanagement.service.rest.PortRoa;\r
-import org.openo.baseservice.remoteservice.exception.ServiceException;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
 import mockit.Mock;\r
index aa87bf5..4f4fb27 100644 (file)
@@ -27,7 +27,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
 import org.onap.vfc.nfvo.resmanagement.service.group.impl.ResOperateServiceImpl;\r
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.ResOperateService;\r
 import org.onap.vfc.nfvo.resmanagement.service.rest.ResOperateRoa;\r
-import org.openo.baseservice.remoteservice.exception.ServiceException;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
 import mockit.Mock;\r
index 1a813c8..42e5592 100644 (file)
@@ -32,7 +32,7 @@ import org.onap.vfc.nfvo.resmanagement.common.util.request.RequestUtil;
 import org.onap.vfc.nfvo.resmanagement.service.base.openstack.impl.SitesImpl;
 import org.onap.vfc.nfvo.resmanagement.service.entity.SitesEntity;
 import org.onap.vfc.nfvo.resmanagement.service.rest.SitesRoa;
-import org.openo.baseservice.remoteservice.exception.ServiceException;
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;
 import org.springframework.mock.web.MockHttpServletRequest;
 
 import mockit.Mock;
index 5377f60..23e2591 100644 (file)
@@ -31,7 +31,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.VirtualLinkEntity;
 import org.onap.vfc.nfvo.resmanagement.service.group.impl.VirtualLinkServiceImpl;\r
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.VirtualLinkService;\r
 import org.onap.vfc.nfvo.resmanagement.service.rest.VirtualLinkRoa;\r
-import org.openo.baseservice.remoteservice.exception.ServiceException;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
 import mockit.Mock;\r
index f3321fa..8ecd1d5 100644 (file)
@@ -31,7 +31,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.VmEntity;
 import org.onap.vfc.nfvo.resmanagement.service.group.impl.VmServiceImpl;\r
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.VmService;\r
 import org.onap.vfc.nfvo.resmanagement.service.rest.VmRoa;\r
-import org.openo.baseservice.remoteservice.exception.ServiceException;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
 import mockit.Mock;\r
index e6aafa6..5de4276 100644 (file)
@@ -31,7 +31,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.VnfInfoEntity;
 import org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfInfoServiceImpl;\r
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfInfoService;\r
 import org.onap.vfc.nfvo.resmanagement.service.rest.VnfInfoRoa;\r
-import org.openo.baseservice.remoteservice.exception.ServiceException;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
 import mockit.Mock;\r
index 099bae0..216c0fc 100644 (file)
@@ -31,7 +31,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.VnfEntity;
 import org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfServiceImpl;\r
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfService;\r
 import org.onap.vfc.nfvo.resmanagement.service.rest.VnfRoa;\r
-import org.openo.baseservice.remoteservice.exception.ServiceException;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
 import mockit.Mock;\r
index 61d3e6e..4d8cbca 100644 (file)
@@ -31,7 +31,7 @@ import org.onap.vfc.nfvo.resmanagement.service.entity.VnfStatusEntity;
 import org.onap.vfc.nfvo.resmanagement.service.group.impl.VnfStatusServiceImpl;\r
 import org.onap.vfc.nfvo.resmanagement.service.group.inf.VnfStatusService;\r
 import org.onap.vfc.nfvo.resmanagement.service.rest.VnfStatusRoa;\r
-import org.openo.baseservice.remoteservice.exception.ServiceException;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;\r
 import org.springframework.mock.web.MockHttpServletRequest;\r
 \r
 import mockit.Mock;\r
index f465772..dd2bc29 100644 (file)
@@ -22,7 +22,7 @@ import javax.ws.rs.core.Response;
 \r
 import org.junit.Test;\r
 import org.onap.vfc.nfvo.resmanagement.service.rest.exceptionmapper.ServiceExceptionMapper;\r
-import org.openo.baseservice.remoteservice.exception.ServiceException;\r
+import org.onap.vfc.nfvo.resmanagement.common.util.restclient.ServiceException;\r
 \r
 /**\r
  * <br>\r