From 8f1ebdb89a8959208993e9225cef62834848d498 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Thu, 4 Apr 2024 22:35:55 +1300 Subject: [PATCH] Rename QueryBean interface to IQueryBean (because we want to rename TQRootBean) We want to rename TQRootBean to QueryBean. I can't do that right now because we need to make ebean-agent aware of that first. So yes, perhaps not ideal with IQueryBean but I think it will make sense once TQRootBean is renamed to QueryBean. --- .../typequery/{QueryBean.java => IQueryBean.java} | 13 ++----------- .../main/java/io/ebean/typequery/TQRootBean.java | 2 +- ebean-test/src/test/resources/logback-test.xml | 6 +++--- 3 files changed, 6 insertions(+), 15 deletions(-) rename ebean-querybean/src/main/java/io/ebean/typequery/{QueryBean.java => IQueryBean.java} (97%) diff --git a/ebean-querybean/src/main/java/io/ebean/typequery/QueryBean.java b/ebean-querybean/src/main/java/io/ebean/typequery/IQueryBean.java similarity index 97% rename from ebean-querybean/src/main/java/io/ebean/typequery/QueryBean.java rename to ebean-querybean/src/main/java/io/ebean/typequery/IQueryBean.java index a2e0e7454..a2d6fa094 100644 --- a/ebean-querybean/src/main/java/io/ebean/typequery/QueryBean.java +++ b/ebean-querybean/src/main/java/io/ebean/typequery/IQueryBean.java @@ -1,21 +1,12 @@ package io.ebean.typequery; -import io.avaje.lang.Nullable; import io.ebean.*; import io.ebean.search.MultiMatch; import io.ebean.search.TextCommonTerms; import io.ebean.search.TextQueryString; import io.ebean.search.TextSimple; -import io.ebean.text.PathProperties; -import javax.sql.DataSource; -import java.sql.Connection; -import java.sql.Timestamp; -import java.util.*; -import java.util.function.BooleanSupplier; -import java.util.function.Consumer; -import java.util.function.Predicate; -import java.util.stream.Stream; +import java.util.Collection; /** * Query bean for strongly typed query construction and execution. @@ -53,7 +44,7 @@ import java.util.stream.Stream; * @param the entity bean type (normal entity bean type e.g. Customer) * @param the specific query bean type (e.g. QCustomer) */ -public interface QueryBean extends QueryBuilder { +public interface IQueryBean extends QueryBuilder { /** * Return the underlying query. 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 f66796f37..0c0ef2227 100644 --- a/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java +++ b/ebean-querybean/src/main/java/io/ebean/typequery/TQRootBean.java @@ -57,7 +57,7 @@ import java.util.stream.Stream; * @param the specific root query bean type (e.g. QCustomer) */ @NonNullApi -public abstract class TQRootBean implements QueryBean { +public abstract class TQRootBean implements IQueryBean { /** * The underlying query. diff --git a/ebean-test/src/test/resources/logback-test.xml b/ebean-test/src/test/resources/logback-test.xml index 1612755c9..36c235e0c 100644 --- a/ebean-test/src/test/resources/logback-test.xml +++ b/ebean-test/src/test/resources/logback-test.xml @@ -82,9 +82,9 @@ - - - + + +