ci: bump version to v4.38.0

CHANGELOG.md

@@ -368,3 +368,18 @@
 ### Features
 
 * Add HikariCP specific configuration to db.conf ([009b2b1](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/009b2b1ad9180f58a0b1434354f8a467b4e452ca))
+##  (2026-01-20)
+
+### Features
+
+* Add HikariCP specific configuration to db.conf ([4aa8709](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/4aa8709eb593b03254efc616b6b04c23b23ab6ab))
+##  (2026-01-20)
+
+### Features
+
+* Enhance EntityManagerProvider to use Play configuration for database settings ([476db28](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/476db288216ed2c1013fe3ddb9b82472254e352b))
+##  (2026-01-20)
+
+### Features
+
+* Disable default JPA and Hibernate modules and enhance EntityManagerProvider for HikariCP integration ([9fa1e5e](https://git.janis-eccarius.de/KnockOutWhist/KnockOutWhist-Web/commit/9fa1e5e07122aebd0391d47c3513013243a72a0f))

knockoutwhistweb/app/di/EntityManagerProvider.scala

@@ -1,14 +1,33 @@
 package di
 
-import com.google.inject.Provider
-import com.google.inject.Inject
+import com.google.inject.{Inject, Provider}
 import jakarta.inject.Singleton
 import jakarta.persistence.{EntityManager, EntityManagerFactory, Persistence}
+import play.api.Configuration
 
 @Singleton
-class EntityManagerProvider @Inject()() extends Provider[EntityManager] {
+class EntityManagerProvider @Inject()(config: Configuration) extends Provider[EntityManager] {
 
-  private val emf: EntityManagerFactory = Persistence.createEntityManagerFactory("defaultPersistenceUnit")
+  private val emf: EntityManagerFactory = {
+    val dbConfig = config.get[Configuration]("db.default")
+    val props = new java.util.HashMap[String, Object]()
+    
+    // Map Play configuration to Jakarta Persistence properties
+    props.put("jakarta.persistence.jdbc.driver", dbConfig.get[String]("driver"))
+    props.put("jakarta.persistence.jdbc.url", dbConfig.get[String]("url"))
+    props.put("jakarta.persistence.jdbc.user", dbConfig.get[String]("username"))
+    props.put("jakarta.persistence.jdbc.password", dbConfig.get[String]("password"))
+    
+    // Also pass HikariCP settings if present
+    dbConfig.getOptional[Configuration]("hikaricp").foreach { hikariConfig =>
+      hikariConfig.keys.foreach { key =>
+        val value = hikariConfig.underlying.getValue(key).unwrapped()
+        props.put(s"hibernate.hikari.$key", value)
+      }
+    }
+
+    Persistence.createEntityManagerFactory("defaultPersistenceUnit", props)
+  }
 
   override def get(): EntityManager = {
     emf.createEntityManager()

knockoutwhistweb/conf/META-INF/persistence.xml

@@ -9,12 +9,6 @@
         <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
         
         <properties>
-            <!-- Database connection settings -->
-            <property name="jakarta.persistence.jdbc.driver" value="org.postgresql.Driver"/>
-            <property name="jakarta.persistence.jdbc.url" value="${DATABASE_URL}"/>
-            <property name="jakarta.persistence.jdbc.user" value="${DB_USER}"/>
-            <property name="jakarta.persistence.jdbc.password" value="${DB_PASSWORD}"/>
-            
             <!-- Hibernate specific settings -->
             <property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect"/>
             <property name="hibernate.hbm2ddl.auto" value="update"/>

knockoutwhistweb/conf/application.conf

@@ -2,6 +2,9 @@
 play.filters.disabled += play.filters.csrf.CSRFFilter
 play.filters.disabled += play.filters.hosts.AllowedHostsFilter
 
+# Disable default JPA and Hibernate modules to use custom EntityManagerProvider
+play.modules.disabled += "play.db.jpa.JPAModule"
+
 play.http.secret.key="QCY?tAnfk?aZ?iwrNwnxIlR6CTf:G3gf:90Latabg@5241AB`R5W:1uDFN];Ik@n"
 play.http.secret.key=${?APPLICATION_SECRET}
 

knockoutwhistweb/conf/db.conf

@@ -1,13 +1,20 @@
 
 # Database configuration - PostgreSQL with environment variables
-db.default.driver=org.postgresql.Driver
-db.default.jdbcUrl=${?DATABASE_URL}
+db.default.driver="org.postgresql.Driver"
+db.default.url="jdbc:postgresql://localhost:5432/knockoutwhist"
+db.default.url=${?DATABASE_URL}
+db.default.username="kw_user"
 db.default.username=${?DB_USER}
+db.default.password="postgres"
 db.default.password=${?DB_PASSWORD}
 
 # HikariCP specific configuration
+db.default.hikaricp.driverClassName="org.postgresql.Driver"
+db.default.hikaricp.jdbcUrl="jdbc:postgresql://localhost:5432/knockoutwhist"
 db.default.hikaricp.jdbcUrl=${?DATABASE_URL}
+db.default.hikaricp.username="kw_user"
 db.default.hikaricp.username=${?DB_USER}
+db.default.hikaricp.password="postgres"
 db.default.hikaricp.password=${?DB_PASSWORD}
 
 # JPA/Hibernate configuration

versions.env

@@ -1,3 +1,3 @@
 MAJOR=4
-MINOR=35
+MINOR=38
 PATCH=0