This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch postgresql in repository https://gitbox.apache.org/repos/asf/james-project.git
commit e4ddaf88e24843abf7d0473a142252fdb19f843d Author: Quan Tran <[email protected]> AuthorDate: Fri Mar 22 10:07:29 2024 +0700 JAMES-2586 Adapt jooq 3.19.6 change --- .../org/apache/james/backends/postgres/utils/PostgresExecutor.java | 3 +-- .../java/org/apache/james/sieve/postgres/PostgresSieveRepository.java | 2 +- .../java/org/apache/james/sieve/postgres/PostgresSieveScriptDAO.java | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/backends-common/postgres/src/main/java/org/apache/james/backends/postgres/utils/PostgresExecutor.java b/backends-common/postgres/src/main/java/org/apache/james/backends/postgres/utils/PostgresExecutor.java index 37d3726e14..4bfb730ab0 100644 --- a/backends-common/postgres/src/main/java/org/apache/james/backends/postgres/utils/PostgresExecutor.java +++ b/backends-common/postgres/src/main/java/org/apache/james/backends/postgres/utils/PostgresExecutor.java @@ -138,10 +138,9 @@ public class PostgresExecutor { .map(record -> record.get(0, Boolean.class)); } - public Mono<Long> executeReturnAffectedRowsCount(Function<DSLContext, Mono<Integer>> queryFunction) { + public Mono<Integer> executeReturnAffectedRowsCount(Function<DSLContext, Mono<Integer>> queryFunction) { return dslContext() .flatMap(queryFunction) - .cast(Long.class) .retryWhen(Retry.backoff(MAX_RETRY_ATTEMPTS, MIN_BACKOFF) .filter(preparedStatementConflictException())); } diff --git a/server/data/data-postgres/src/main/java/org/apache/james/sieve/postgres/PostgresSieveRepository.java b/server/data/data-postgres/src/main/java/org/apache/james/sieve/postgres/PostgresSieveRepository.java index f9b09e8eab..0fb63a018f 100644 --- a/server/data/data-postgres/src/main/java/org/apache/james/sieve/postgres/PostgresSieveRepository.java +++ b/server/data/data-postgres/src/main/java/org/apache/james/sieve/postgres/PostgresSieveRepository.java @@ -196,7 +196,7 @@ public class PostgresSieveRepository implements SieveRepository { @Override public void renameScript(Username username, ScriptName oldName, ScriptName newName) throws DuplicateException, ScriptNotFoundException { try { - long renamedScripts = postgresSieveScriptDAO.renameScript(username, oldName, newName).block(); + int renamedScripts = postgresSieveScriptDAO.renameScript(username, oldName, newName).block(); if (renamedScripts == 0) { throw new ScriptNotFoundException(); } diff --git a/server/data/data-postgres/src/main/java/org/apache/james/sieve/postgres/PostgresSieveScriptDAO.java b/server/data/data-postgres/src/main/java/org/apache/james/sieve/postgres/PostgresSieveScriptDAO.java index 88ff9c4034..92e81ce347 100644 --- a/server/data/data-postgres/src/main/java/org/apache/james/sieve/postgres/PostgresSieveScriptDAO.java +++ b/server/data/data-postgres/src/main/java/org/apache/james/sieve/postgres/PostgresSieveScriptDAO.java @@ -53,7 +53,7 @@ public class PostgresSieveScriptDAO { this.postgresExecutor = postgresExecutor; } - public Mono<Long> upsertScript(PostgresSieveScript sieveScript) { + public Mono<Integer> upsertScript(PostgresSieveScript sieveScript) { return postgresExecutor.executeReturnAffectedRowsCount(dslContext -> Mono.from(dslContext.insertInto(TABLE_NAME) .set(SCRIPT_ID, sieveScript.getId().getValue()) .set(USERNAME, sieveScript.getUsername()) @@ -128,7 +128,7 @@ public class PostgresSieveScriptDAO { IS_ACTIVE.eq(true)))); } - public Mono<Long> renameScript(Username username, ScriptName oldName, ScriptName newName) { + public Mono<Integer> renameScript(Username username, ScriptName oldName, ScriptName newName) { return postgresExecutor.executeReturnAffectedRowsCount(dslContext -> Mono.from(dslContext.update(TABLE_NAME) .set(SCRIPT_NAME, newName.getValue()) .where(USERNAME.eq(username.asString()), --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
