From ce7ae5c6496eba13071cc85e13e70bac633dc4b7 Mon Sep 17 00:00:00 2001
From: Yurii Kuzan <ykuzan@atlassian.com>
Date: Wed, 19 Apr 2023 12:49:50 +0300
Subject: [PATCH] CLIP-1797 Updated template to use hikari connection pool
 provider

---
 .../molecule/default/tests/test_default.py               | 2 +-
 roles/confluence_config/templates/confluence.cfg.xml.j2  | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/roles/confluence_config/molecule/default/tests/test_default.py b/roles/confluence_config/molecule/default/tests/test_default.py
index 9bf11b3..c312b50 100644
--- a/roles/confluence_config/molecule/default/tests/test_default.py
+++ b/roles/confluence_config/molecule/default/tests/test_default.py
@@ -78,7 +78,7 @@ def test_confluence_config_file(host):
     assert f.contains('<property name="confluence.cluster.aws.host.header">ec2.amazonaws.com</property>')
     assert f.contains('<property name="hibernate.connection.url">jdbc:postgresql://postgres-db.ap-southeast-2.rds.amazonaws.com:5432/confluence</property>')
     assert f.contains('<property name="hibernate.connection.password">molecule_password</property>')
-    assert f.contains('<property name="hibernate.c3p0.preferredTestQuery">select 1;</property>')
+    assert (f.contains('<property name="hibernate.c3p0.preferredTestQuery">select 1;</property>') or f.contains('<property name="hibernate.hikari.registerMbeans">true</property>'))
     assert f.contains('<property name="confluence.webapp.context.path">/foo</property>')
     assert f.contains('<property name="confluence.cluster.aws.tag.key">my-cluster-tag</property>')
 
diff --git a/roles/confluence_config/templates/confluence.cfg.xml.j2 b/roles/confluence_config/templates/confluence.cfg.xml.j2
index 7b5dd08..e4f4eb8 100644
--- a/roles/confluence_config/templates/confluence.cfg.xml.j2
+++ b/roles/confluence_config/templates/confluence.cfg.xml.j2
@@ -18,6 +18,9 @@
     <property name="hibernate.connection.url">{{ atl_jdbc_url }}</property>
     <property name="hibernate.connection.username">{{ atl_jdbc_user }}</property>
     <property name="hibernate.connection.password">{{ atl_jdbc_password | replace("&", "&amp;") }}</property>
+
+    {# Confluence versions 7.13 and newer #}
+    {% if (atl_product_version.split(".")[0] | int() == 7 and atl_product_version.split(".")[1] | int() <= 13) or atl_product_version.split(".")[0] | int() < 7 %}
     <property name="hibernate.c3p0.min_size">{{ atl_db_poolminsize }}</property>
     <property name="hibernate.c3p0.max_size">{{ atl_db_poolmaxsize }}</property>
     <property name="hibernate.c3p0.timeout">{{ atl_db_timeout }}</property>
@@ -26,6 +29,12 @@
     <property name="hibernate.c3p0.validate">{{ atl_db_validate }}</property>
     <property name="hibernate.c3p0.acquire_increment">{{ atl_db_acquireincrement }}</property>
     <property name="hibernate.c3p0.preferredTestQuery">{{ atl_db_preferredtestquery }}</property>
+    {% else %}
+    <property name="hibernate.hikari.idleTimeout">{{ atl_db_timeout }}</property>
+    <property name="hibernate.hikari.maximumPoolSize">{{ atl_db_poolmaxsize }}</property>
+    <property name="hibernate.hikari.minimumIdle">{{ atl_db_poolminsize }}</property>
+    <property name="hibernate.hikari.registerMbeans">true</property>
+    {% endif %}
 
     <property name="shared-home">{{ atl_product_home_shared }}</property>
     <property name="confluence.cluster">true</property>