From 16dca2883188fca7725aa6841cba235cc04cd89c Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Sun, 31 Mar 2024 11:37:32 +1300 Subject: [PATCH] Deprecate Query bean constructor that takes transaction - migrate to usingTransaction() Migrate to query.usingTransaction() instead of the constructor that takes a transaction. --- .../java/io/ebean/querybean/generator/KotlinLangAdapter.java | 3 ++- .../io/ebean/querybean/generator/SimpleQueryBeanWriter.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/KotlinLangAdapter.java b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/KotlinLangAdapter.java index 245a07ac8..00b0f1978 100644 --- a/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/KotlinLangAdapter.java +++ b/kotlin-querybean-generator/src/main/java/io/ebean/querybean/generator/KotlinLangAdapter.java @@ -61,8 +61,9 @@ class KotlinLangAdapter implements LangAdapter { } writer.append(" /**").eol(); - writer.append(" * Construct with a given Transaction.", name).eol(); + writer.append(" * @deprecated migrate to query.usingTransaction()", name).eol(); writer.append(" */").eol(); + writer.append(" @Deprecated").eol(); if (dbName == null) { writer.append(" constructor(transaction: io.ebean.Transaction) : super(%s::class.java, transaction)", fullName).eol().eol(); } else { diff --git a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java index de9315afd..7b6c8aa66 100644 --- a/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java +++ b/querybean-generator/src/main/java/io/ebean/querybean/generator/SimpleQueryBeanWriter.java @@ -160,7 +160,8 @@ class SimpleQueryBeanWriter { writer.append(" }").eol(); writer.eol(); - writer.append(" /** Construct with a given transaction */").eol(); + writer.append(" /** @deprecated migrate to query.usingTransaction() */").eol(); + writer.append(" @Deprecated(forRemoval = true)").eol(); writer.append(" public Q%s(io.ebean.Transaction transaction) {", shortName).eol(); if (dbName == null) { writer.append(" super(%s.class, transaction);", beanFullName).eol();