Update to Neon

Apply code updates to port to Neon.

Change-Id: I159309494ec64209d9fa23fc515643f1e31fe146
Issue-ID: CCSDK-1389
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

5 files changed, 150 insertions, 8 deletions

diff --git a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
index 61bfea93d..9937826a2 100644
--- a/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/data-adaptor-provider/pom.xml
@@ -13,12 +13,12 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>binding-parent</artifactId>
-		<version>1.3.3-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.features</groupId>
-	<version>0.5.2-SNAPSHOT</version>
+	<version>0.6.0-SNAPSHOT</version>
 	<artifactId>blueprints-data-adaptor-provider</artifactId>
 	<packaging>bundle</packaging>
 	<name>Blueprints Data Adaptor - Provider</name>
@@ -96,7 +96,6 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${maven.bundle.version}</version>
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
diff --git a/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
new file mode 100644
index 000000000..76459d51d
--- /dev/null
+++ b/blueprints-processor/adaptors/data-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- Copyright © 2017-2018 AT&T Intellectual Property. Modifications Copyright 

+	© 2018 IBM. 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. -->

+

+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"

+	xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"

+	odl:use-default-for-reference-types="true">

+

+	<!-- Dependencies -->

+

+	<reference id="dataSource" interface="javax.sql.DataSource" />

+

+	<!-- Data SourceInitialisation -->

+

+	<bean id="config.dataSource"

+		class="org.onap.ccsdk.features.data.adaptor.db.DataSourceWrap">

+		<argument ref="dataSource" />

+	</bean>

+

+	<bean id="jdbcTemplate"

+		class="org.springframework.jdbc.core.JdbcTemplate">

+		<property name="dataSource" ref="config.dataSource" />

+	</bean>

+

+	<bean id="namedParameterJdbcTemplate"

+		class="org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate">

+		<argument ref="config.dataSource" />

+	</bean>

+

+	<!-- DAO Initialisation -->

+	<bean id="transactionLogDao"

+		class="org.onap.ccsdk.features.data.adaptor.dao.TransactionLogDaoImpl">

+		<argument ref="jdbcTemplate" />

+	</bean>

+

+	<bean id="configResourceDao"

+		class="org.onap.ccsdk.features.data.adaptor.dao.ConfigResourceDaoImpl">

+		<argument ref="jdbcTemplate" />

+	</bean>

+

+	<bean id="queryExecutorDao"

+		class="org.onap.ccsdk.features.data.adaptor.dao.QueryExecutorDaoImpl">

+		<argument ref="jdbcTemplate" />

+	</bean>

+

+	<bean id="namedQueryExecutorDao"

+		class="org.onap.ccsdk.features.data.adaptor.dao.NamedQueryExecutorDaoImpl">

+		<argument ref="namedParameterJdbcTemplate" />

+	</bean>

+

+	<!-- Expose the Common Component Bean -->

+

+	<bean id="configResourceService"

+		class="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceServiceImpl">

+		<argument ref="transactionLogDao" />

+		<argument ref="configResourceDao" />

+		<argument ref="queryExecutorDao" />

+		<argument ref="namedQueryExecutorDao" />

+	</bean>

+

+	<service ref="configResourceService"

+		interface="org.onap.ccsdk.features.data.adaptor.service.ConfigResourceService" />

+

+</blueprint>

diff --git a/blueprints-processor/adaptors/pom.xml b/blueprints-processor/adaptors/pom.xml
index 9f1c2b0d9..9e081a5a3 100644
--- a/blueprints-processor/adaptors/pom.xml
+++ b/blueprints-processor/adaptors/pom.xml
@@ -20,12 +20,12 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.3.3-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.features</groupId>
-	<version>0.5.2-SNAPSHOT</version>
+	<version>0.6.0-SNAPSHOT</version>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<artifactId>blueprints-processor-adaptors</artifactId>
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
index 9232e0c10..f7effc4b8 100644
--- a/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/pom.xml
@@ -21,12 +21,12 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>binding-parent</artifactId>
-		<version>1.3.3-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.features</groupId>
-	<version>0.5.2-SNAPSHOT</version>
+	<version>0.6.0-SNAPSHOT</version>
 	<artifactId>blueprints-rest-adaptor-provider</artifactId>
 	<packaging>bundle</packaging>
 	<name>Blueprints Rest Adaptor - Provider</name>
@@ -71,6 +71,48 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-api-mockito</artifactId>
+			<version>1.6.4</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.javassist</groupId>
+			<artifactId>javassist</artifactId>
+			<version>3.21.0-GA</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>1.10.19</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-junit4</artifactId>
+			<version>1.6.4</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-api-support</artifactId>
+			<version>1.6.4</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-reflect</artifactId>
+			<version>1.6.4</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-core</artifactId>
+			<version>1.6.4</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -85,7 +127,6 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${maven.bundle.version}</version>
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
diff --git a/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
new file mode 100644
index 000000000..8788f6482
--- /dev/null
+++ b/blueprints-processor/adaptors/rest-adaptor-provider/src/main/resources/OSGI-INF/blueprint/impl-blueprint.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+  Copyright © 2017-2018 AT&T Intellectual Property.

+  Modifications Copyright © 2018 IBM.

+  

+  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.

+-->

+

+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"

+	xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"

+	odl:use-default-for-reference-types="true">

+

+	<!-- Expose the Common Component Bean -->

+

+	<bean id="configRestAdaptorService"

+		class="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorServiceImpl">

+	</bean>

+

+	<service ref="configRestAdaptorService"

+		interface="org.onap.ccsdk.features.rest.adaptor.service.ConfigRestAdaptorService" />

+

+</blueprint>