<artifactId>com.springsource.org.apache.commons.codec</artifactId>
<version>1.3.0</version>
</dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.2</version>
+ </dependency>
<dependency>
<groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId>
<version>2.4</version>
<classifier>jdk15</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>2.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>3.1.17</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.1.6</version>
+ <version>3.1.17</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.mybatis</groupId>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>3.1.0.RELEASE</version>
+ <version>4.3.18.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>3.1.0.RELEASE</version>
+ <version>4.3.18.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>3.1.0.RELEASE</version>
+ <version>4.3.18.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>3.2.14.RELEASE</version>
+ <version>4.3.18.RELEASE</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
<version>3.1.0.RELEASE</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>3.1.0.RELEASE</version>
+ <version>4.3.18.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>3.1.0.RELEASE</version>
+ <version>4.3.18.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>3.1.0.RELEASE</version>
+ <version>4.3.18.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>3.1.0.RELEASE</version>
+ <version>4.3.18.RELEASE</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>3.1.6</version>
- </dependency>
+ </dependency -->
<!-- UT coverage dependency start -->
<dependency>
+++ /dev/null
-/*
- * Copyright 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.
- * 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.vnfm.svnfm.vnfmadapter.service.activator;
-
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.inf.IVnfmAdapter2DriverMgrService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
-
-/**
- * <br>
- * <p>
- * </p>
- *
- * @author
- * @version VFC 1.0 Jan 23, 2017
- */
-public class RoaVnfmService2DriverMgr implements DestructionAwareBeanPostProcessor {
-
- private static final Logger LOG = LoggerFactory.getLogger(RoaVnfmService2DriverMgr.class);
-
- @Override
- public Object postProcessAfterInitialization(Object bean, String name) throws BeansException {
- if(bean instanceof IVnfmAdapter2DriverMgrService) {
- IVnfmAdapter2DriverMgrService vnfmAdapterSvc = (IVnfmAdapter2DriverMgrService)bean;
- vnfmAdapterSvc.register();
- LOG.info("Successfully Registered to Driver Manager!", RoaVnfmService2DriverMgr.class);
- }
-
- return bean;
- }
-
- @Override
- public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
- return bean;
- }
-
- @Override
- public void postProcessBeforeDestruction(Object bean, String name) throws BeansException {
- // post processing
- }
-
-}
+++ /dev/null
-/*
- * 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.vnfm.svnfm.vnfmadapter.service.activator;
-
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.inf.IVnfmAdapterMgrService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor;
-
-/**
- * <br/>
- * <p>
- * </p>
- *
- * @author
- * @version VFC 1.0 Aug 31, 2016
- */
-public class RoaVnfmServicePostProcessor implements DestructionAwareBeanPostProcessor {
-
- private static final Logger LOG = LoggerFactory.getLogger(RoaVnfmServicePostProcessor.class);
-
- @Override
- public Object postProcessAfterInitialization(Object bean, String name) throws BeansException {
- if(bean instanceof IVnfmAdapterMgrService) {
- IVnfmAdapterMgrService vnfmAdapterSvc = (IVnfmAdapterMgrService)bean;
- vnfmAdapterSvc.register();
- LOG.info("Successfully Registered to Microservice BUS!", RoaVnfmServicePostProcessor.class);
- }
-
- return bean;
- }
-
- @Override
- public Object postProcessBeforeInitialization(Object bean, String name) throws BeansException {
- return bean;
- }
-
- @Override
- public void postProcessBeforeDestruction(Object bean, String name) throws BeansException {
- //post processing
- }
-
-}
http://cxf.apache.org/transports/http/configuration
http://cxf.apache.org/schemas/configuration/http-conf.xsd
http://www.springframework.org/schema/aop
- http://www.springframework.org/schema/aop/spring-aop-3.0.xsd ">
+ http://www.springframework.org/schema/aop/spring-aop.xsd ">
<!-- these are included in the dependency jar -->
<import resource="classpath:META-INF/cxf/cxf.xml"/>
http://cxf.apache.org/transports/http/configuration
http://cxf.apache.org/schemas/configuration/http-conf.xsd
http://www.springframework.org/schema/aop
- http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
+ http://www.springframework.org/schema/aop/spring-aop.xsd">
<!--
<bean class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.activator.RoaVnfmServicePostProcessor"></bean>
<bean class="org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.impl.VnfmAdapterMgrService"></bean>
+++ /dev/null
-/*
- * 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.vnfm.svnfm.vnfmadapter.service.activator;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.activator.RoaVnfmServicePostProcessor;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.impl.VnfmAdapterMgrService;
-
-/**
- * Created by QuanZhong on 2017/3/17.
- */
-public class RoaVnfmServicePostProcessorTest {
- @Test
- public void testPostProcessAfterInitialization(){
- RoaVnfmServicePostProcessor dm = new RoaVnfmServicePostProcessor();
- dm.postProcessAfterInitialization(new VnfmAdapterMgrService(),"abc");
- Assert.assertTrue(true);
- }
- @Test
- public void testPostProcessAfterInitialization2(){
- RoaVnfmServicePostProcessor dm = new RoaVnfmServicePostProcessor();
- dm.postProcessAfterInitialization(null,"abc");
- Assert.assertTrue(true);
- }
-
- @Test
- public void testpostProcessBeforeDestruction(){
- RoaVnfmServicePostProcessor dm = new RoaVnfmServicePostProcessor();
- dm.postProcessBeforeDestruction(new VnfmAdapterMgrService(),"abc");
- Assert.assertTrue(true);
- }
-
- @Test
- public void testpostProcessBeforeInitialization(){
- RoaVnfmServicePostProcessor dm = new RoaVnfmServicePostProcessor();
- dm.postProcessBeforeInitialization(new VnfmAdapterMgrService(),"abc");
- Assert.assertTrue(true);
- }
-}
+++ /dev/null
-/*
- * 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.vnfm.svnfm.vnfmadapter.service.activator;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.activator.RoaVnfmService2DriverMgr;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.api.internalsvc.impl.VnfmAdapter2DriverMgrService;
-
-/**
- * Created by QuanZhong on 2017/3/17.
- */
-public class TestRoaVnfmService2DriverMgr {
- @Test
- public void testPostProcessAfterInitialization(){
- RoaVnfmService2DriverMgr dm = new RoaVnfmService2DriverMgr();
- dm.postProcessAfterInitialization(new VnfmAdapter2DriverMgrService(),"abc");
- Assert.assertTrue(true);
- }
- @Test
- public void testPostProcessAfterInitialization2(){
- RoaVnfmService2DriverMgr dm = new RoaVnfmService2DriverMgr();
- dm.postProcessAfterInitialization(null,"abc");
- Assert.assertTrue(true);
- }
-
- @Test
- public void testpostProcessBeforeDestruction(){
- RoaVnfmService2DriverMgr dm = new RoaVnfmService2DriverMgr();
- dm.postProcessBeforeDestruction(new VnfmAdapter2DriverMgrService(),"abc");
- Assert.assertTrue(true);
- }
-
- @Test
- public void testpostProcessBeforeInitialization(){
- RoaVnfmService2DriverMgr dm = new RoaVnfmService2DriverMgr();
- dm.postProcessBeforeInitialization(new VnfmAdapter2DriverMgrService(),"abc");
- Assert.assertTrue(true);
- }
-}
Code Review / vfc / nfvo / driver / vnfm / svnfm.git / commitdiff