summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorKai <lukai@chinamobile.com>2020-08-27 15:54:11 +0800
committerKai <lukai@chinamobile.com>2020-08-27 18:53:16 +0800
commit17f250a9137546ccda001413575aa8f2fb6a7d85 (patch)
tree8d67de31820b1e600bf9b14b4e5ebfcfa0d02b40 /components
parent36916e410fe28a233c7850e41ae837af7659de6e (diff)
Add des module in datalake-handler
Issue-ID: DCAEGEN2-2230 Signed-off-by: Kai Lu <lukai@chinamobile.com> Change-Id: I13a4907462edc68ec26523bf856083b21b32dee7
Diffstat (limited to 'components')
-rw-r--r--components/datalake-handler/des/pom.xml5
-rw-r--r--components/datalake-handler/des/src/main/java/org/onap/datalake/des/controller/DataExposureController.java2
-rw-r--r--components/datalake-handler/feeder/pom.xml7
-rw-r--r--components/datalake-handler/pom.xml7
4 files changed, 18 insertions, 3 deletions
diff --git a/components/datalake-handler/des/pom.xml b/components/datalake-handler/des/pom.xml
index c0346ce9..9554052f 100644
--- 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 e71ba6b0..925afb89 100644
--- 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 468ac674..d310312a 100644
--- 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 bf709828..17cd1244 100644
--- 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>