diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java index aab9c375d..6d414db9d 100644 --- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java +++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java @@ -153,6 +153,11 @@ public abstract class TQRootBean { return ((SpiFetchGroupQuery) query()).buildFetchGroup(); } + /** + * Return a copy of the query bean. + */ + public abstract R copy(); + /** * Return the underlying query. *

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 00b0f1978..08c03cad8 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 @@ -63,7 +63,7 @@ class KotlinLangAdapter implements LangAdapter { writer.append(" /**").eol(); writer.append(" * @deprecated migrate to query.usingTransaction()", name).eol(); writer.append(" */").eol(); - writer.append(" @Deprecated").eol(); + writer.append(" @Deprecated(message=\"migrate to query.usingTransaction()\")").eol(); if (dbName == null) { writer.append(" constructor(transaction: io.ebean.Transaction) : super(%s::class.java, transaction)", fullName).eol().eol(); } else { @@ -88,7 +88,7 @@ class KotlinLangAdapter implements LangAdapter { writer.eol(); writer.append(" /** Return a copy of the query. */").eol(); - writer.append(" fun copy() : Q%s {", shortName).eol(); + writer.append(" override fun copy() : Q%s {", shortName).eol(); writer.append(" return Q%s(query().copy())", shortName).eol(); writer.append(" }").eol(); writer.eol(); 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 7b6c8aa66..dc66eb94c 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 @@ -197,6 +197,7 @@ class SimpleQueryBeanWriter { writer.eol(); writer.append(" /** Return a copy of the query bean. */").eol(); + writer.append(" @Override").eol(); writer.append(" public Q%s copy() {", shortName).eol(); writer.append(" return new Q%s(query().copy());", shortName).eol(); writer.append(" }").eol(); diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml index fc9bc8934..bbb93e2f6 100644 --- a/tests/test-kotlin/pom.xml +++ b/tests/test-kotlin/pom.xml @@ -92,7 +92,7 @@ io.ebean kotlin-querybean-generator - 14.0.0 + 14.0.2