From e807d49279f40e82d93fba0872ecd38ed16833dc Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Mon, 24 May 2021 14:12:21 +0200
Subject: [PATCH] added coverage report to table service
Former-commit-id: 8e45e917093e810799418705a82a479f2764c8e6
---
.gitlab-ci.yml | 2 +-
fda-container-service/pom.xml | 2 +-
fda-database-service/report/pom.xml | 2 +-
fda-table-service/Dockerfile | 3 +-
.../{gateways => gateway}/pom.xml | 2 +-
.../src/main/java/at/tuwien/config/.gitkeep | 0
fda-table-service/pom.xml | 36 +++++++++++-
fda-table-service/report/pom.xml | 57 +++++++++++++++++++
fda-table-service/rest-service/pom.xml | 25 --------
9 files changed, 97 insertions(+), 32 deletions(-)
rename fda-table-service/{gateways => gateway}/pom.xml (95%)
rename fda-table-service/{gateways => gateway}/src/main/java/at/tuwien/config/.gitkeep (100%)
create mode 100644 fda-table-service/report/pom.xml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4733474a11..c6316cee4a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -104,7 +104,7 @@ test-backend-table:
- "./fda-table-service/rest-service/src/test/resources/integration-test.before"
- "mvn -f fda-table-service/pom.xml clean test verify"
- "./fda-table-service/rest-service/src/test/resources/integration-test.after"
-# - cat fda-table-service/rest-service/target/site/jacoco/index.html
+ - cat ./fda-table-service/report/target/site/jacoco-aggregate/index.html
needs:
- build-metadata-db
dependencies:
diff --git a/fda-container-service/pom.xml b/fda-container-service/pom.xml
index d7f0dbb163..d32faa0830 100644
--- a/fda-container-service/pom.xml
+++ b/fda-container-service/pom.xml
@@ -166,7 +166,7 @@
<exclude>at/tuwien/mapper/**/*</exclude>
<exclude>at/tuwien/exception/**/*</exclude>
<exclude>at/tuwien/config/**/*</exclude>
- <exclude>**/FdaQueryServiceApplication.class</exclude>
+ <exclude>**/FdaContainerManagingApplication.class</exclude>
</excludes>
</configuration>
<executions>
diff --git a/fda-database-service/report/pom.xml b/fda-database-service/report/pom.xml
index b91bd1b00b..082f21829d 100644
--- a/fda-database-service/report/pom.xml
+++ b/fda-database-service/report/pom.xml
@@ -4,8 +4,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>at.tuwien</groupId>
<artifactId>fda-database-service</artifactId>
+ <groupId>at.tuwien</groupId>
<version>0.0.1-SNAPSHOT</version>
</parent>
diff --git a/fda-table-service/Dockerfile b/fda-table-service/Dockerfile
index 5ad7dd9862..7fded984a4 100644
--- a/fda-table-service/Dockerfile
+++ b/fda-table-service/Dockerfile
@@ -11,9 +11,10 @@ RUN mvn -fn -B dependency:go-offline > /dev/null
COPY --from=dependency /root/.m2/repository/at/tuwien /root/.m2/repository/at/tuwien
-COPY ./gateways ./gateways
+COPY ./gateway ./gateway
COPY ./rest-service ./rest-service
COPY ./services ./services
+COPY ./report ./report
RUN mvn -q clean package -DskipTests
diff --git a/fda-table-service/gateways/pom.xml b/fda-table-service/gateway/pom.xml
similarity index 95%
rename from fda-table-service/gateways/pom.xml
rename to fda-table-service/gateway/pom.xml
index d88a4e3ecc..48c907017f 100644
--- a/fda-table-service/gateways/pom.xml
+++ b/fda-table-service/gateway/pom.xml
@@ -9,7 +9,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
- <artifactId>gateways</artifactId>
+ <artifactId>gateway</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>fda-table-service-gateways</name>
diff --git a/fda-table-service/gateways/src/main/java/at/tuwien/config/.gitkeep b/fda-table-service/gateway/src/main/java/at/tuwien/config/.gitkeep
similarity index 100%
rename from fda-table-service/gateways/src/main/java/at/tuwien/config/.gitkeep
rename to fda-table-service/gateway/src/main/java/at/tuwien/config/.gitkeep
diff --git a/fda-table-service/pom.xml b/fda-table-service/pom.xml
index 18250d15a4..25d843b452 100644
--- a/fda-table-service/pom.xml
+++ b/fda-table-service/pom.xml
@@ -18,7 +18,8 @@
<modules>
<module>rest-service</module>
<module>services</module>
- <module>gateways</module>
+ <module>gateway</module>
+ <module>report</module>
</modules>
<properties>
@@ -169,6 +170,37 @@
</dependency>
</dependencies>
- <!-- build in ./rest-service/pom.xml -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</version>
+ <configuration>
+ <excludes>
+ <exclude>at/tuwien/mapper/**/*</exclude>
+ <exclude>at/tuwien/exception/**/*</exclude>
+ <exclude>at/tuwien/utils/**/*</exclude>
+ <exclude>**/FdaTableServiceApplication.class</exclude>
+ </excludes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>default-prepare-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>default-report</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/fda-table-service/report/pom.xml b/fda-table-service/report/pom.xml
new file mode 100644
index 0000000000..93155d0f6e
--- /dev/null
+++ b/fda-table-service/report/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>fda-table-service</artifactId>
+ <groupId>at.tuwien</groupId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>report</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>fda-database-service-report</name>
+
+ <properties>
+ <jacoco.version>0.8.7</jacoco.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>at.tuwien</groupId>
+ <artifactId>gateway</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>at.tuwien</groupId>
+ <artifactId>rest-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>at.tuwien</groupId>
+ <artifactId>services</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</version>
+ <executions>
+ <execution>
+ <id>report-aggregate</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>report-aggregate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/fda-table-service/rest-service/pom.xml b/fda-table-service/rest-service/pom.xml
index 3a65be151b..2251386c21 100644
--- a/fda-table-service/rest-service/pom.xml
+++ b/fda-table-service/rest-service/pom.xml
@@ -34,31 +34,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco.version}</version>
- <configuration>
- <excludes>
- <exclude>**/FdaTableServiceApplication.class</exclude>
- </excludes>
- </configuration>
- <executions>
- <execution>
- <id>default-prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- </execution>
- <execution>
- <id>default-report</id>
- <phase>verify</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
--
GitLab