Add des module in datalake-handler

Issue-ID: DCAEGEN2-2230
Signed-off-by: Kai Lu <lukai@chinamobile.com>
Change-Id: I13a4907462edc68ec26523bf856083b21b32dee7

diff --git a/components/datalake-handler/des/pom.xml b/components/datalake-handler/des/pom.xml
index c0346ce..9554052 100644 (file)
--- a/components/datalake-handler/des/pom.xml
+++ b/components/datalake-handler/des/pom.xml
@@ -27,13 +27,13 @@
        <parent>
                <groupId>org.onap.dcaegen2.services.components</groupId>
                <artifactId>datalake-handler</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
+               <version>1.1.0-SNAPSHOT</version>
        </parent>
 
        <groupId>org.onap.dcaegen2.services.components.datalake-handler</groupId>
        <artifactId>des</artifactId>
        <packaging>jar</packaging>
-       <name>DataLake Exposure Service</name>
+       <name>DataLake Extraction Service</name>
 
        <properties>
                <swagger.version>2.9.2</swagger.version>
@@ -228,6 +228,7 @@
                <dependency>
                        <groupId>org.onap.dcaegen2.services.components.datalake-handler</groupId>
                        <artifactId>feeder</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
        </dependencies>

diff --git a/components/datalake-handler/des/src/main/java/org/onap/datalake/des/controller/DataExposureController.java b/components/datalake-handler/des/src/main/java/org/onap/datalake/des/controller/DataExposureController.java
index e71ba6b..925afb8 100644 (file)
--- a/components/datalake-handler/des/src/main/java/org/onap/datalake/des/controller/DataExposureController.java
+++ b/components/datalake-handler/des/src/main/java/org/onap/datalake/des/controller/DataExposureController.java
@@ -102,7 +102,7 @@ public class DataExposureController {
                String query = sub.replace(sqlTemplate);
                log.info("Going to start Datalake Data Exposure Service ... query=" + query);
                // https://prestodb.io/docs/current/installation/jdbc.html
-               String url = String.format("jdbc:presto://dl-presto:8080/%s/%s", dataExposure.getDb().getPrestoCatalog(),
+               String url = String.format("jdbc:presto://dl-presto:8080/%s/%s", dataExposure.getDb().getHost(),
                                dataExposure.getDb().getDatabase());
                Properties properties = new Properties();
                properties.setProperty("user", "test");

diff --git a/components/datalake-handler/feeder/pom.xml b/components/datalake-handler/feeder/pom.xml
index 468ac67..d310312 100644 (file)
--- a/components/datalake-handler/feeder/pom.xml
+++ b/components/datalake-handler/feeder/pom.xml
@@ -208,6 +208,13 @@
 
        <build>
                <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <classifier>exec</classifier>
+                </configuration>
+            </plugin>
                        <plugin>
                                <groupId>com.spotify</groupId>
                                <artifactId>dockerfile-maven-plugin</artifactId>

diff --git a/components/datalake-handler/pom.xml b/components/datalake-handler/pom.xml
index bf70982..17cd124 100644 (file)
--- a/components/datalake-handler/pom.xml
+++ b/components/datalake-handler/pom.xml
@@ -21,6 +21,7 @@
                <module>feeder</module>
                <module>admin</module>
                <module>collector</module>
+               <module>des</module>
        </modules>
 
        <properties>
@@ -254,6 +255,12 @@
                                </configuration>
                        </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
+            </plugin>
+
                </plugins>
        </build>