Improve cross DB compatibility by using jpql

Signed-off-by: Aindriu Lavelle <aindriu.lavelle@aiven.io>
Aiven-Open · Apr 8, 2024 · ddb80f5 · ddb80f5
1 parent 01de206
commit ddb80f5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/core/src/main/java/io/aiven/klaw/helpers/db/rdbms/SelectDataJdbc.java b/core/src/main/java/io/aiven/klaw/helpers/db/rdbms/SelectDataJdbc.java
@@ -109,7 +109,7 @@ public boolean existsAclRequest(
   }
 
   public boolean existsAclSslInTeam(int teamId, int tenantId, String aclSsl) {
-    return aclRepo.existsAclSslInTeamInTenant(teamId, tenantId, aclSsl);
+    return aclRepo.existsByTeamIdAndTenantIdAndAclssl(teamId, tenantId, aclSsl);
   }
 
   public boolean existsSpecificAclRequest(

diff --git a/core/src/main/java/io/aiven/klaw/repository/AclRepo.java b/core/src/main/java/io/aiven/klaw/repository/AclRepo.java
@@ -44,11 +44,7 @@ boolean existsByTeamIdNotAndTenantIdAndConsumergroup(
   boolean existsByEnvironmentAndTenantId(
       @Param("envId") String envId, @Param("tenantId") Integer tenantId);
 
-  @Query(
-      value =
-          "select count(*) > 0 from kwacls where teamid = :teamId and tenantid = :tenantId and aclssl = :aclSsl",
-      nativeQuery = true)
-  boolean existsAclSslInTeamInTenant(Integer teamId, Integer tenantId, String aclSsl);
+  boolean existsByTeamIdAndTenantIdAndAclssl(Integer teamId, Integer tenantId, String aclSsl);
 
   @Query(
       value = "select count(*) from kwacls where env = :envId and tenantid = :tenantId",

diff --git a/core/src/test/java/io/aiven/klaw/helpers/db/rdbms/SelectDataJdbcTest.java b/core/src/test/java/io/aiven/klaw/helpers/db/rdbms/SelectDataJdbcTest.java
@@ -359,11 +359,12 @@ public static Stream<Arguments> doesAclExist() {
   public void doesAclSslExistInTeam(
       int teamId, int tenantId, String aclSsl, boolean expectedResult) {
 
-    when(aclRepo.existsAclSslInTeamInTenant(teamId, tenantId, aclSsl)).thenReturn(expectedResult);
+    when(aclRepo.existsByTeamIdAndTenantIdAndAclssl(teamId, tenantId, aclSsl))
+        .thenReturn(expectedResult);
 
     assertThat(selectData.existsAclSslInTeam(teamId, tenantId, aclSsl)).isEqualTo(expectedResult);
 
-    verify(aclRepo, times(1)).existsAclSslInTeamInTenant(teamId, tenantId, aclSsl);
+    verify(aclRepo, times(1)).existsByTeamIdAndTenantIdAndAclssl(teamId, tenantId, aclSsl);
   }
 
   public static Stream<Arguments> doesAclSslExistInTeam() {