chore: testing native

bcgov · Dec 20, 2024 · 2503da8 · 2503da8
1 parent 0e0a9db
commit 2503da8
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/.../src/main/java/ca/bc/gov/restapi/results/common/configuration/OracleJpaConfiguration.java b/.../src/main/java/ca/bc/gov/restapi/results/common/configuration/OracleJpaConfiguration.java
@@ -3,16 +3,18 @@
 import com.zaxxer.hikari.HikariDataSource;
 import jakarta.persistence.EntityManagerFactory;
 import java.util.Map;
-import javax.sql.DataSource;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ResourceLoader;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.persistenceunit.PersistenceManagedTypes;
+import org.springframework.orm.jpa.persistenceunit.PersistenceManagedTypesScanner;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
@@ -31,22 +33,30 @@ public class OracleJpaConfiguration {
   @Bean(name = "oracleEntityManagerFactory")
   public LocalContainerEntityManagerFactoryBean oracleEntityManagerFactory(
       @Qualifier("oracleDataSource") HikariDataSource dataSource,
+      @Qualifier("oracleManagedTypes") PersistenceManagedTypes persistenceManagedTypes,
       EntityManagerFactoryBuilder builder
   ) {
     return builder
         .dataSource(dataSource)
         .properties(Map.of(
             "hibernate.dialect", "org.hibernate.dialect.OracleDialect",
-            "hibernate.boot.allow_jdbc_metadata_access","false",
+            "hibernate.boot.allow_jdbc_metadata_access", "false",
             "hibernate.hikari.connection.provider_class",
             "org.hibernate.hikaricp.internal.HikariCPConnectionProvider",
             "hibernate.connection.datasource", dataSource
         ))
         .packages("ca.bc.gov.restapi.results.oracle")
+        .managedTypes(persistenceManagedTypes)
         .persistenceUnit("oracle")
         .build();
   }
 
+  @Bean(name = "oracleManagedTypes")
+  public PersistenceManagedTypes oracleManagedTypes(ResourceLoader resourceLoader) {
+    return new PersistenceManagedTypesScanner(resourceLoader)
+        .scan("ca.bc.gov.restapi.results.oracle");
+  }
+
   @Bean(name = "oracleDataSource")
   @ConfigurationProperties(prefix = "spring.oracle.hikari")
   public HikariDataSource oracleDataSource() {

diff --git a/...rc/main/java/ca/bc/gov/restapi/results/common/configuration/PostgresJpaConfiguration.java b/...rc/main/java/ca/bc/gov/restapi/results/common/configuration/PostgresJpaConfiguration.java
@@ -3,17 +3,19 @@
 import com.zaxxer.hikari.HikariDataSource;
 import jakarta.persistence.EntityManagerFactory;
 import java.util.Map;
-import javax.sql.DataSource;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.ResourceLoader;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+import org.springframework.orm.jpa.persistenceunit.PersistenceManagedTypes;
+import org.springframework.orm.jpa.persistenceunit.PersistenceManagedTypesScanner;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
@@ -32,6 +34,7 @@ public class PostgresJpaConfiguration {
   @Bean(name = "postgresEntityManagerFactory")
   public LocalContainerEntityManagerFactoryBean postgresEntityManagerFactory(
       @Qualifier("postgresHikariDataSource") HikariDataSource dataSource,
+      @Qualifier("postgresManagedTypes") PersistenceManagedTypes persistenceManagedTypes,
       EntityManagerFactoryBuilder builder
   ) {
     return builder
@@ -44,10 +47,18 @@ public LocalContainerEntityManagerFactoryBean postgresEntityManagerFactory(
             "hibernate.connection.datasource", dataSource
         ))
         .packages("ca.bc.gov.restapi.results.postgres")
+        .managedTypes(persistenceManagedTypes)
         .persistenceUnit("postgres")
         .build();
   }
 
+  @Bean(name = "postgresManagedTypes")
+  @Primary
+  public PersistenceManagedTypes postgresManagedTypes(ResourceLoader resourceLoader) {
+    return new PersistenceManagedTypesScanner(resourceLoader)
+        .scan("ca.bc.gov.restapi.results.postgres");
+  }
+
   @Bean(name = "postgresHikariDataSource")
   @ConfigurationProperties(prefix = "spring.datasource.hikari")
   @Primary