native image config for data modules

helidon-io · Jul 11, 2023 · a5d67df · a5d67df
1 parent 68a7062
commit a5d67df
Show file tree

Hide file tree

Showing 43 changed files with 324 additions and 84 deletions.
diff --git a/archetypes/helidon/src/main/archetype/mp/custom/database.xml b/archetypes/helidon/src/main/archetype/mp/custom/database.xml
@@ -345,7 +345,7 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele
                                             <value key="scope">runtime</value>
                                         </map>
                                         <map>
-                                            <value key="groupId">com.oracle.database.jdbc</value>
+                                            <value key="groupId">io.helidon.integrations.db</value>
                                             <value key="artifactId">ucp</value>
                                             <value key="scope">runtime</value>
                                         </map>
@@ -431,7 +431,7 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele
                                 <value key="artifactId">jakarta.xml.bind-api</value>
                             </map>
                             <map>
-                                <value key="groupId">com.h2database</value>
+                                <value key="groupId">io.helidon.integrations.db</value>
                                 <value key="artifactId">h2</value>
                             </map>
                             <map>

diff --git a/archetypes/helidon/src/main/archetype/se/custom/database.xml b/archetypes/helidon/src/main/archetype/se/custom/database.xml
@@ -51,12 +51,12 @@ Instructions for H2 can be found here: https://www.h2database.com/html/cheatShee
                                     </list>
                                     <list key="dependencies">
                                         <map>
-                                            <value key="groupId">com.h2database</value>
+                                            <value key="groupId">io.helidon.integrations.db</value>
                                             <value key="artifactId">h2</value>
                                         </map>
                                         <map>
-                                            <value key="groupId">com.zaxxer</value>
-                                            <value key="artifactId">HikariCP</value>
+                                            <value key="groupId">io.helidon.integrations.db</value>
+                                            <value key="artifactId">hikaricp</value>
                                         </map>
                                     </list>
                                     <value key="id">id</value>
@@ -180,7 +180,7 @@ docker run --rm --name mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_D
                                             <value key="scope">runtime</value>
                                         </map>
                                         <map>
-                                            <value key="groupId">com.h2database</value>
+                                            <value key="groupId">io.helidon.integrations.db</value>
                                             <value key="artifactId">h2</value>
                                             <value key="scope">test</value>
                                         </map>
@@ -222,7 +222,7 @@ docker run --rm --name xe -p 1521:1521 -p 8888:8080 -e ORACLE_PWD=oracle wnamele
                                             <value key="artifactId">ojdbc</value>
                                         </map>
                                         <map>
-                                            <value key="groupId">com.h2database</value>
+                                            <value key="groupId">io.helidon.integrations.db</value>
                                             <value key="artifactId">h2</value>
                                             <value key="scope">test</value>
                                         </map>
@@ -263,7 +263,7 @@ docker run --rm --name mongo -p 27017:27017 mongo
                                             <value key="artifactId">helidon-dbclient-mongodb</value>
                                         </map>
                                         <map>
-                                            <value key="groupId">com.h2database</value>
+                                            <value key="groupId">io.helidon.integrations.db</value>
                                             <value key="artifactId">h2</value>
                                             <value key="scope">test</value>
                                         </map>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -802,14 +802,24 @@
             </dependency>
 
             <!-- integrations -->
+            <dependency>
+                <groupId>io.helidon.integrations.db</groupId>
+                <artifactId>h2</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.helidon.integrations.db</groupId>
+                <artifactId>hikaricp</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.helidon.integrations.db</groupId>
                 <artifactId>ojdbc</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.helidon.integrations.db</groupId>
-                <artifactId>h2</artifactId>
+                <artifactId>ucp</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
             <dependency>

diff --git a/dbclient/jdbc/pom.xml b/dbclient/jdbc/pom.xml
@@ -47,8 +47,8 @@
             <artifactId>helidon-common-configurable</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP</artifactId>
+            <groupId>io.helidon.integrations.db</groupId>
+            <artifactId>hikaricp</artifactId>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

diff --git a/...s/META-INF/native-image/io.helidon.dbclient/helidon-dbclient-jdbc/native-image.properties b/...s/META-INF/native-image/io.helidon.dbclient/helidon-dbclient-jdbc/native-image.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2019, 2022 Oracle and/or its affiliates.
+# Copyright (c) 2019, 2023 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,6 +14,4 @@
 # limitations under the License.
 #
 
-Args= --initialize-at-build-time=org.slf4j \
-  --initialize-at-build-time=com.zaxxer.hikari \
-  --initialize-at-run-time=com.zaxxer.hikari.metrics.dropwizard.CodaHaleMetricsTracker
+Args= --initialize-at-build-time=org.slf4j
diff --git a/dbclient/metrics-jdbc/pom.xml b/dbclient/metrics-jdbc/pom.xml
@@ -44,8 +44,8 @@
             <artifactId>helidon-metrics</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP</artifactId>
+            <groupId>io.helidon.integrations.db</groupId>
+            <artifactId>hikaricp</artifactId>
         </dependency>
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>

diff --git a/docs/se/dbclient.adoc b/docs/se/dbclient.adoc
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
-    Copyright (c) 2020, 2022 Oracle and/or its affiliates.
+    Copyright (c) 2020, 2023 Oracle and/or its affiliates.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -119,7 +119,7 @@ For the DB Client using JDBC implementation and H2 database, you must include th
          <artifactId>helidon-dbclient-jdbc</artifactId>
      </dependency>
      <dependency>
-         <groupId>com.h2database</groupId> <!--3-->
+         <groupId>io.helidon.integrations.db</groupId> <!--3-->
          <artifactId>h2</artifactId>
     </dependency>
 </dependencies>

diff --git a/examples/employee-app/pom.xml b/examples/employee-app/pom.xml
@@ -42,7 +42,7 @@
             <artifactId>ojdbc</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
+            <groupId>io.helidon.integrations.db</groupId>
             <artifactId>ucp</artifactId>
         </dependency>
         <dependency>

diff --git a/examples/integrations/cdi/datasource-hikaricp-h2/pom.xml b/examples/integrations/cdi/datasource-hikaricp-h2/pom.xml
@@ -51,7 +51,7 @@
 
         <!-- Runtime-scoped dependencies. -->
         <dependency>
-            <groupId>com.h2database</groupId>
+            <groupId>io.helidon.integrations.db</groupId>
             <artifactId>h2</artifactId>
             <scope>runtime</scope>
         </dependency>

diff --git a/examples/integrations/cdi/jpa/pom.xml b/examples/integrations/cdi/jpa/pom.xml
@@ -67,7 +67,7 @@
 
         <!-- Runtime-scoped dependencies. -->
         <dependency>
-            <groupId>com.h2database</groupId>
+            <groupId>io.helidon.integrations.db</groupId>
             <artifactId>h2</artifactId>
             <scope>runtime</scope>
         </dependency>

diff --git a/examples/integrations/cdi/pokemons/pom.xml b/examples/integrations/cdi/pokemons/pom.xml
@@ -65,7 +65,7 @@
 
         <!-- Runtime-scoped dependencies. -->
         <dependency>
-            <groupId>com.h2database</groupId>
+            <groupId>io.helidon.integrations.db</groupId>
             <artifactId>h2</artifactId>
             <scope>runtime</scope>
         </dependency>

diff --git a/examples/integrations/micronaut/data/README.md b/examples/integrations/micronaut/data/README.md
@@ -67,7 +67,7 @@ curl -i http://localhost:8080/pets/s
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
+            <groupId>io.helidon.integrations.db</groupId>
             <artifactId>ucp</artifactId>
             <scope>runtime</scope>
         </dependency>
@@ -112,7 +112,7 @@ curl -i http://localhost:8080/pets/s
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
+            <groupId>io.helidon.integrations.db</groupId>
             <artifactId>ucp</artifactId>
             <scope>runtime</scope>
         </dependency>

diff --git a/examples/integrations/micronaut/data/pom.xml b/examples/integrations/micronaut/data/pom.xml
@@ -69,12 +69,7 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>com.h2database</groupId>
-            <!--
-            Use the following group id if native image is desired
-            Also make sure a remote database is used
-            -->
-            <!-- <groupId>io.helidon.integrations.db</groupId> -->
+            <groupId>io.helidon.integrations.db</groupId>
             <artifactId>h2</artifactId>
             <scope>runtime</scope>
         </dependency>

diff --git a/examples/integrations/oci/atp-cdi/pom.xml b/examples/integrations/oci/atp-cdi/pom.xml
@@ -47,7 +47,7 @@
             <artifactId>ojdbc</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
+            <groupId>io.helidon.integrations.db</groupId>
             <artifactId>ucp</artifactId>
         </dependency>
         <dependency>

diff --git a/examples/integrations/oci/atp-reactive/pom.xml b/examples/integrations/oci/atp-reactive/pom.xml
@@ -55,7 +55,7 @@
             <artifactId>ojdbc</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
+            <groupId>io.helidon.integrations.db</groupId>
             <artifactId>ucp</artifactId>
         </dependency>
         <dependency>

diff --git a/integrations/cdi/datasource-hikaricp/pom.xml b/integrations/cdi/datasource-hikaricp/pom.xml
@@ -42,8 +42,8 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.zaxxer</groupId>
-            <artifactId>HikariCP</artifactId>
+            <groupId>io.helidon.integrations.db</groupId>
+            <artifactId>hikaricp</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -90,7 +90,7 @@
 
         <!-- Test-scoped dependencies. -->
         <dependency>
-            <groupId>com.h2database</groupId>
+            <groupId>io.helidon.integrations.db</groupId>
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>

diff --git a/...tasource-hikaricp/src/main/resources/META-INF/helidon/native-image/reflection-config.json b/...tasource-hikaricp/src/main/resources/META-INF/helidon/native-image/reflection-config.json
diff --git a/...don.integrations.cdi/helidon-integrations-cdi-datasource-hikaricp/native-image.properties b/...don.integrations.cdi/helidon-integrations-cdi-datasource-hikaricp/native-image.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2022 Oracle and/or its affiliates.
+# Copyright (c) 2020, 2023 Oracle and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,6 +14,4 @@
 # limitations under the License.
 #
 
-Args=--initialize-at-build-time=com.zaxxer.hikari \
-  --initialize-at-build-time=org.slf4j \
-  --initialize-at-run-time=com.zaxxer.hikari.metrics.dropwizard.CodaHaleMetricsTracker
+Args=--initialize-at-build-time=org.slf4j
diff --git a/...helidon.integrations.cdi/helidon-integrations-cdi-datasource-hikaricp/reflect-config.json b/...helidon.integrations.cdi/helidon-integrations-cdi-datasource-hikaricp/reflect-config.json
@@ -1,12 +1,4 @@
 [
-    {
-        "name": "com.zaxxer.hikari.HikariConfig",
-        "allDeclaredConstructors": true,
-        "allDeclaredMethods": true,
-        "allPublicMethods": true,
-        "allDeclaredFields": true,
-        "allPublicFields": true
-    },
     {
         "name": "java.util.concurrent.CopyOnWriteArrayList",
         "fields": [

diff --git a/integrations/cdi/datasource-ucp/pom.xml b/integrations/cdi/datasource-ucp/pom.xml
@@ -36,7 +36,7 @@
     <dependencies>
         <!-- Compile-scoped dependencies. -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>io.helidon.integrations.cdi</groupId>
             <artifactId>helidon-integrations-cdi-datasource</artifactId>
             <scope>compile</scope>
         </dependency>
@@ -46,7 +46,7 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
+            <groupId>io.helidon.integrations.db</groupId>
             <artifactId>ucp</artifactId>
             <scope>compile</scope>
         </dependency>
@@ -99,10 +99,15 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.h2database</groupId>
+            <groupId>io.helidon.integrations.db</groupId>
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.integrations.db</groupId>
+            <artifactId>ojdbc</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.helidon.microprofile.server</groupId>
             <artifactId>helidon-microprofile-server</artifactId>

diff --git a/...di/datasource-ucp/src/main/resources/META-INF/helidon/native-image/reflection-config.json b/...di/datasource-ucp/src/main/resources/META-INF/helidon/native-image/reflection-config.json
@@ -0,0 +1,7 @@
+{
+    "classes": [
+        "oracle.ucp.jdbc.PoolDataSource",
+        "oracle.ucp.jdbc.PoolDataSourceImpl",
+        "javax.sql.DataSource"
+    ]
+}
diff --git a/...ons/cdi/datasource-ucp/src/main/resources/META-INF/helidon/native-image/weld-proxies.json b/...ons/cdi/datasource-ucp/src/main/resources/META-INF/helidon/native-image/weld-proxies.json
@@ -0,0 +1,11 @@
+[
+    {
+        "bean-class": "io.helidon.integrations.datasource.ucp.cdi.UCPBackedDataSourceExtension",
+        "ifaces": [
+            "io.helidon.integrations.datasource.ucp.cdi.UCPBackedDataSourceExtension",
+            "oracle.ucp.jdbc.PoolDataSource",
+            "oracle.ucp.jdbc.PoolDataSourceImpl",
+            "javax.sql.DataSource"
+        ]
+    }
+]
diff --git a/integrations/cdi/eclipselink-cdi/pom.xml b/integrations/cdi/eclipselink-cdi/pom.xml
@@ -57,7 +57,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.h2database</groupId>
+            <groupId>io.helidon.integrations.db</groupId>
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>

diff --git a/integrations/cdi/jpa-cdi/pom.xml b/integrations/cdi/jpa-cdi/pom.xml
@@ -147,7 +147,7 @@
 
         <!-- Test-scoped dependencies. -->
         <dependency>
-            <groupId>com.h2database</groupId>
+            <groupId>io.helidon.integrations.db</groupId>
             <artifactId>h2</artifactId>
             <scope>test</scope>
         </dependency>