From ab303ef926d935368a65a1c264f27bbfbfbf8288 Mon Sep 17 00:00:00 2001
From: paulparkinson <paul.parkinson@gmail.com>
Date: Wed, 2 Oct 2024 16:26:28 -0400
Subject: [PATCH] init for graalvm workshops

---
 .../helidon/native-image/weld-proxies.json    | 13 ++++++++++
 .../META-INF/microprofile-config.properties   |  6 +++--
 .../native-image.properties                   |  1 +
 .../src/main/resources/application.properties | 24 ++++++++++---------
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/graalvm-nativeimage/helidon/src/main/resources/META-INF/helidon/native-image/weld-proxies.json b/graalvm-nativeimage/helidon/src/main/resources/META-INF/helidon/native-image/weld-proxies.json
index 40981eb..6e6a588 100644
--- a/graalvm-nativeimage/helidon/src/main/resources/META-INF/helidon/native-image/weld-proxies.json
+++ b/graalvm-nativeimage/helidon/src/main/resources/META-INF/helidon/native-image/weld-proxies.json
@@ -1,6 +1,19 @@
 [
     {
         "bean-class": "io.helidon.integrations.datasource.ucp.cdi.UCPBackedDataSourceExtension",
+        "ifaces": [
+            "java.io.Serializable",
+            "java.sql.Wrapper",
+            "javax.naming.Referenceable",
+            "javax.naming.spi.ObjectFactory",
+            "javax.sql.CommonDataSource",
+            "javax.sql.DataSource",
+            "oracle.ucp.jdbc.PoolDataSource",
+            "oracle.ucp.UniversalConnectionPoolAdapter"
+        ]
+    },
+    {
+        "bean-class": "io.helidon.integrations.datasource.ucp.cdi.UniversalConnectionPoolExtension",
         "ifaces": [
             "java.io.Serializable",
             "java.sql.Wrapper",
diff --git a/graalvm-nativeimage/helidon/src/main/resources/META-INF/microprofile-config.properties b/graalvm-nativeimage/helidon/src/main/resources/META-INF/microprofile-config.properties
index 5eb90d4..d712cb7 100644
--- a/graalvm-nativeimage/helidon/src/main/resources/META-INF/microprofile-config.properties
+++ b/graalvm-nativeimage/helidon/src/main/resources/META-INF/microprofile-config.properties
@@ -4,6 +4,8 @@ server.host=0.0.0.0
 
 # DataSource properties
 javax.sql.DataSource.example.connectionFactoryClassName=oracle.jdbc.pool.OracleDataSource
-javax.sql.DataSource.example.URL=jdbc:oracle:thin:@livelabs_high?TNS_ADMIN=/Users/youruser/Wallet_yourwalletdir
+#javax.sql.DataSource.example.URL=jdbc:oracle:thin:@<ATP_NAME>_high?TNS_ADMIN=/home/<YOUR_USER>/<YOUR_WALLET_LOCATION>
+javax.sql.DataSource.example.URL=jdbc:oracle:thin:@ATP110345_high?TNS_ADMIN=/home/LL110345_U/myatpwallet
 javax.sql.DataSource.example.user=ADMIN
-javax.sql.DataSource.example.password=Welcome12345
+javax.sql.DataSource.example.password=##03pRivvzR2q4jv
+#javax.sql.DataSource.example.password=<ADMIN_PASSWORD>
diff --git a/graalvm-nativeimage/helidon/src/main/resources/META-INF/native-image/com.oracle.helidon.datasource/com-oracle-helidon-datasource/native-image.properties b/graalvm-nativeimage/helidon/src/main/resources/META-INF/native-image/com.oracle.helidon.datasource/com-oracle-helidon-datasource/native-image.properties
index 54e2ed8..a7e3144 100644
--- a/graalvm-nativeimage/helidon/src/main/resources/META-INF/native-image/com.oracle.helidon.datasource/com-oracle-helidon-datasource/native-image.properties
+++ b/graalvm-nativeimage/helidon/src/main/resources/META-INF/native-image/com.oracle.helidon.datasource/com-oracle-helidon-datasource/native-image.properties
@@ -1,3 +1,4 @@
 Args=-H:+RemoveSaturatedTypeFlows --initialize-at-build-time=com.oracle.helidon.datasource \
+  --initialize-at-build-time=io.helidon.integrations.datasource.ucp.cdi.UniversalConnectionPool$_$$_WeldClientProxy \
   --initialize-at-run-time=oracle.jdbc.driver.NTFListener \
   --initialize-at-run-time=oracle.ucp.common.Service
\ No newline at end of file
diff --git a/graalvm-nativeimage/micronaut/src/main/resources/application.properties b/graalvm-nativeimage/micronaut/src/main/resources/application.properties
index 4719fad..a41aa13 100644
--- a/graalvm-nativeimage/micronaut/src/main/resources/application.properties
+++ b/graalvm-nativeimage/micronaut/src/main/resources/application.properties
@@ -5,20 +5,22 @@ flyway.datasources.default.baseline-on-migrate=true
 flyway.datasources.default.baseline-version=1.0.0
 
 datasources.default.dialect=ORACLE
-datasources.default.ocid=<YOUR_DB_OCID>
-datasources.default.username=<YOUR_DB_ADMIN_USERNAME>
-datasources.default.password=<YOUR_PASSWORD>
-datasources.default.walletPassword=<YOUR_WALLET_PASSWORD>
+#datasources.default.ocid=<YOUR_DB_OCID>
+datasources.default.username=ADMIN
+datasources.default.password=
+#datasources.default.password=<YOUR_PASSWORD>
+datasources.default.walletPassword=Welcome12345
+#datasources.default.walletPassword=<YOUR_WALLET_PASSWORD>
 
 # use these properties if running from OCI Console with Cloud Shell (https://rb.gy/64ebxw)
 # technical reference at https://micronaut-projects.github.io/micronaut-oracle-cloud/snapshot/guide/
-oci.fingerprint=<FINGERPRINT_VALUE>
-# example private key file path + file extension pattern
-# oci.private-key-file=file:/home/juarez/pk.pem
-oci.private-key-file=file:<ABSOLUTE_KEY_FILE_PATH><FILE_NAME.pem>
-oci.region=<REGION>
-oci.tenant-id=<OCI_TENANCY_OCID>
-oci.user-id=<OCI_USER_OCID>
+#oci.fingerprint=<FINGERPRINT_VALUE>
+## example private key file path + file extension pattern
+## oci.private-key-file=file:/home/juarez/pk.pem
+#oci.private-key-file=file:<ABSOLUTE_KEY_FILE_PATH><FILE_NAME.pem>
+#oci.region=<REGION>
+#oci.tenant-id=<OCI_TENANCY_OCID>
+#oci.user-id=<OCI_USER_OCID>
 
 # uncomment the property below if not using oci console with cloud shell
 # oci.config.profile=DEFAULT