From 3a138c3462ccbb3087c05f6970bca1f64ba5185b Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 20 Oct 2021 16:07:43 +1300 Subject: [PATCH] Tidy internals only - improve DefaultServer parameter names --- .../io/ebeaninternal/api/SpiEbeanServer.java | 6 +- .../server/core/DefaultServer.java | 188 +++++++++--------- 2 files changed, 97 insertions(+), 97 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java index 572f571d0..53d0c4551 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/api/SpiEbeanServer.java @@ -142,7 +142,7 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, EbeanServer, /** * Compile a query. */ - CQuery compileQuery(Type type, Query query, Transaction t); + CQuery compileQuery(Type type, Query query, Transaction transaction); /** * Execute the findId's query but without copying the query. @@ -151,12 +151,12 @@ public interface SpiEbeanServer extends SpiServer, ExtendedServer, EbeanServer, * the query has finished (if executing in a background thread). *

*/ - List findIdsWithCopy(Query query, Transaction t); + List findIdsWithCopy(Query query, Transaction transaction); /** * Execute the findCount query but without copying the query. */ - int findCountWithCopy(Query query, Transaction t); + int findCountWithCopy(Query query, Transaction transaction); /** * Load a batch of Associated One Beans. diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index e5c5d7cf1..f6ff48810 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -506,8 +506,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Compile a query. Only valid for ORM queries. */ @Override - public CQuery compileQuery(Type type, Query query, Transaction t) { - SpiOrmQueryRequest qr = createQueryRequest(type, query, t); + public CQuery compileQuery(Type type, Query query, Transaction transaction) { + SpiOrmQueryRequest qr = createQueryRequest(type, query, transaction); OrmQueryRequest orm = (OrmQueryRequest) qr; return cqueryEngine.buildQuery(orm); } @@ -719,15 +719,15 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public T executeCall(Callable c) { - return executeCall(null, c); + public T executeCall(Callable callable) { + return executeCall(null, callable); } @Override - public T executeCall(@Nullable TxScope scope, Callable c) { + public T executeCall(@Nullable TxScope scope, Callable callable) { ScopedTransaction scopeTrans = transactionManager.beginScopedTransaction(scope); try { - return c.call(); + return callable.call(); } catch (Error e) { throw scopeTrans.caughtError(e); } catch (Exception e) { @@ -738,15 +738,15 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public void execute(Runnable r) { - execute(null, r); + public void execute(Runnable runnable) { + execute(null, runnable); } @Override - public void execute(@Nullable TxScope scope, Runnable r) { + public void execute(@Nullable TxScope scope, Runnable runnable) { ScopedTransaction t = transactionManager.beginScopedTransaction(scope); try { - r.run(); + runnable.run(); } catch (Error e) { throw t.caughtError(e); } catch (Exception e) { @@ -1038,28 +1038,28 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Find a bean using its unique id. */ @Override - public T find(Class beanType, Object id, @Nullable Transaction t) { + public T find(Class beanType, Object id, @Nullable Transaction transaction) { Objects.requireNonNull(id); Query query = createQuery(beanType).setId(id); - return findId(query, t); + return findId(query, transaction); } - SpiOrmQueryRequest createQueryRequest(Type type, Query query, @Nullable Transaction t) { - SpiOrmQueryRequest request = buildQueryRequest(type, query, t); + SpiOrmQueryRequest createQueryRequest(Type type, Query query, @Nullable Transaction transaction) { + SpiOrmQueryRequest request = buildQueryRequest(type, query, transaction); request.prepareQuery(); return request; } - SpiOrmQueryRequest buildQueryRequest(Type type, Query query, @Nullable Transaction t) { + SpiOrmQueryRequest buildQueryRequest(Type type, Query query, @Nullable Transaction transaction) { SpiQuery spiQuery = (SpiQuery) query; spiQuery.setType(type); spiQuery.checkNamedParameters(); - return buildQueryRequest(spiQuery, t); + return buildQueryRequest(spiQuery, transaction); } - private SpiOrmQueryRequest buildQueryRequest(SpiQuery query, @Nullable Transaction t) { - if (t == null) { - t = currentServerTransaction(); + private SpiOrmQueryRequest buildQueryRequest(SpiQuery query, @Nullable Transaction transaction) { + if (transaction == null) { + transaction = currentServerTransaction(); } query.setDefaultRawSqlIfRequired(); if (query.isAutoTunable() && !autoTuneService.tuneQuery(query)) { @@ -1076,7 +1076,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { if (query.getParentNode() == null) { query.setOrigin(createCallOrigin()); } - return new OrmQueryRequest<>(this, queryEngine, query, (SpiTransaction) t); + return new OrmQueryRequest<>(this, queryEngine, query, (SpiTransaction) transaction); } /** @@ -1131,18 +1131,18 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Nullable @SuppressWarnings("unchecked") - private T findId(Query query, @Nullable Transaction t) { + private T findId(Query query, @Nullable Transaction transaction) { SpiQuery spiQuery = (SpiQuery) query; spiQuery.setType(Type.BEAN); if (SpiQuery.Mode.NORMAL == spiQuery.getMode() && !spiQuery.isForceHitDatabase()) { // See if we can skip doing the fetch completely by getting the bean from the // persistence context or the bean cache - T bean = findIdCheckPersistenceContextAndCache(t, spiQuery, spiQuery.getId()); + T bean = findIdCheckPersistenceContextAndCache(transaction, spiQuery, spiQuery.getId()); if (bean != null) { return bean; } } - SpiOrmQueryRequest request = buildQueryRequest(spiQuery, t); + SpiOrmQueryRequest request = buildQueryRequest(spiQuery, transaction); request.prepareQuery(); if (request.isUseDocStore()) { return docStore().find(request); @@ -1189,8 +1189,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override @SuppressWarnings({"unchecked", "rawtypes"}) - public Set findSet(Query query, Transaction t) { - SpiOrmQueryRequest request = createQueryRequest(Type.SET, query, t); + public Set findSet(Query query, Transaction transaction) { + SpiOrmQueryRequest request = createQueryRequest(Type.SET, query, transaction); Object result = request.getFromQueryCache(); if (result != null) { return (Set) result; @@ -1205,10 +1205,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override @SuppressWarnings({"unchecked", "rawtypes"}) - public Map findMap(Query query, @Nullable Transaction t) { - SpiOrmQueryRequest request = createQueryRequest(Type.MAP, query, t); + public Map findMap(Query query, @Nullable Transaction transaction) { + SpiOrmQueryRequest request = createQueryRequest(Type.MAP, query, transaction); request.resetBeanCacheAutoMode(false); - if ((t == null || !t.isSkipCache()) && request.getFromBeanCache()) { + if ((transaction == null || !transaction.isSkipCache()) && request.getFromBeanCache()) { // hit bean cache and got all results from cache return request.beanCacheHitsAsMap(); } @@ -1226,8 +1226,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Override @SuppressWarnings("unchecked") - public List findSingleAttributeList(Query query, Transaction t) { - SpiOrmQueryRequest request = createQueryRequest(Type.ATTRIBUTE, query, t); + public List findSingleAttributeList(Query query, Transaction transaction) { + SpiOrmQueryRequest request = createQueryRequest(Type.ATTRIBUTE, query, transaction); Object result = request.getFromQueryCache(); if (result != null) { return (List) result; @@ -1241,17 +1241,17 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public int findCount(Query query, @Nullable Transaction t) { + public int findCount(Query query, @Nullable Transaction transaction) { SpiQuery spiQuery = ((SpiQuery) query); if (!spiQuery.isDistinct()) { spiQuery = spiQuery.copy(); } - return findCountWithCopy(spiQuery, t); + return findCountWithCopy(spiQuery, transaction); } @Override - public int findCountWithCopy(Query query, @Nullable Transaction t) { - SpiOrmQueryRequest request = createQueryRequest(Type.COUNT, query, t); + public int findCountWithCopy(Query query, @Nullable Transaction transaction) { + SpiOrmQueryRequest request = createQueryRequest(Type.COUNT, query, transaction); Integer result = request.getFromQueryCache(); if (result != null) { return result; @@ -1288,14 +1288,14 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public List findIds(Query query, Transaction t) { - return findIdsWithCopy(((SpiQuery) query).copy(), t); + public List findIds(Query query, Transaction transaction) { + return findIdsWithCopy(((SpiQuery) query).copy(), transaction); } @SuppressWarnings("unchecked") @Override - public List findIdsWithCopy(Query query, Transaction t) { - SpiOrmQueryRequest request = createQueryRequest(Type.ID_LIST, query, t); + public List findIdsWithCopy(Query query, Transaction transaction) { + SpiOrmQueryRequest request = createQueryRequest(Type.ID_LIST, query, transaction); Object result = request.getFromQueryCache(); if (result != null) { if (Boolean.FALSE.equals(request.query().isReadOnly())) { @@ -1313,8 +1313,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public int delete(Query query, Transaction t) { - SpiOrmQueryRequest request = createQueryRequest(Type.DELETE, query, t); + public int delete(Query query, Transaction transaction) { + SpiOrmQueryRequest request = createQueryRequest(Type.DELETE, query, transaction); try { request.initTransIfRequired(); request.markNotQueryOnly(); @@ -1336,8 +1336,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public int update(Query query, Transaction t) { - SpiOrmQueryRequest request = createQueryRequest(Type.UPDATE, query, t); + public int update(Query query, Transaction transaction) { + SpiOrmQueryRequest request = createQueryRequest(Type.UPDATE, query, transaction); try { request.initTransIfRequired(); request.markNotQueryOnly(); @@ -1348,8 +1348,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public FutureRowCount findFutureCount(Query q, Transaction t) { - SpiQuery copy = ((SpiQuery) q).copy(); + public FutureRowCount findFutureCount(Query query, Transaction transaction) { + SpiQuery copy = ((SpiQuery) query).copy(); copy.setFutureFetch(true); Transaction newTxn = createTransaction(); QueryFutureRowCount queryFuture = new QueryFutureRowCount<>(new CallableQueryCount<>(this, copy, newTxn)); @@ -1358,7 +1358,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public FutureIds findFutureIds(Query query, Transaction t) { + public FutureIds findFutureIds(Query query, Transaction transaction) { SpiQuery copy = ((SpiQuery) query).copy(); copy.setFutureFetch(true); Transaction newTxn = createTransaction(); @@ -1368,7 +1368,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public FutureList findFutureList(Query query, Transaction t) { + public FutureList findFutureList(Query query, Transaction transaction) { SpiQuery spiQuery = (SpiQuery) query.copy(); spiQuery.setFutureFetch(true); // FutureList query always run in it's own persistence content @@ -1398,8 +1398,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public QueryIterator findIterate(Query query, Transaction t) { - SpiOrmQueryRequest request = createQueryRequest(Type.ITERATE, query, t); + public QueryIterator findIterate(Query query, Transaction transaction) { + SpiOrmQueryRequest request = createQueryRequest(Type.ITERATE, query, transaction); try { request.initTransIfRequired(); return request.findIterate(); @@ -1424,8 +1424,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public void findEach(Query query, Consumer consumer, Transaction t) { - SpiOrmQueryRequest request = createQueryRequest(Type.ITERATE, query, t); + public void findEach(Query query, Consumer consumer, Transaction transaction) { + SpiOrmQueryRequest request = createQueryRequest(Type.ITERATE, query, transaction); if (request.isUseDocStore()) { docStore().findEach(request, consumer); return; @@ -1436,8 +1436,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public void findEach(Query query, int batch, Consumer> consumer, Transaction t) { - SpiOrmQueryRequest request = createQueryRequest(Type.ITERATE, query, t); + public void findEach(Query query, int batch, Consumer> consumer, Transaction transaction) { + SpiOrmQueryRequest request = createQueryRequest(Type.ITERATE, query, transaction); // if (request.isUseDocStore()) { // docStore().findEach(request, consumer); // return; @@ -1448,8 +1448,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public void findEachWhile(Query query, Predicate consumer, Transaction t) { - SpiOrmQueryRequest request = createQueryRequest(Type.ITERATE, query, t); + public void findEachWhile(Query query, Predicate consumer, Transaction transaction) { + SpiOrmQueryRequest request = createQueryRequest(Type.ITERATE, query, transaction); if (request.isUseDocStore()) { docStore().findEachWhile(request, consumer); return; @@ -1471,15 +1471,15 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public List findList(Query query, Transaction t) { - return findList(query, t, false); + public List findList(Query query, Transaction transaction) { + return findList(query, transaction, false); } @SuppressWarnings("unchecked") - private List findList(Query query, @Nullable Transaction t, boolean findOne) { - SpiOrmQueryRequest request = buildQueryRequest(Type.LIST, query, t); + private List findList(Query query, @Nullable Transaction transaction, boolean findOne) { + SpiOrmQueryRequest request = buildQueryRequest(Type.LIST, query, transaction); request.resetBeanCacheAutoMode(findOne); - if ((t == null || !t.isSkipCache()) && request.getFromBeanCache()) { + if ((transaction == null || !transaction.isSkipCache()) && request.getFromBeanCache()) { // hit bean cache and got all results from cache return request.beanCacheHits(); } @@ -1501,10 +1501,10 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { @Nullable @Override - public SqlRow findOne(SqlQuery query, Transaction t) { + public SqlRow findOne(SqlQuery query, Transaction transaction) { // no findId() method for SqlQuery... // a query that is expected to return either 0 or 1 rows - List list = findList(query, t); + List list = findList(query, transaction); return extractUnique(list); } @@ -1531,8 +1531,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public List findList(SqlQuery query, Transaction t) { - RelationalQueryRequest request = new RelationalQueryRequest(this, relationalQueryEngine, query, t); + public List findList(SqlQuery query, Transaction transaction) { + RelationalQueryRequest request = new RelationalQueryRequest(this, relationalQueryEngine, query, transaction); try { request.initTransIfRequired(); return request.findList(); @@ -1666,8 +1666,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Save the bean with an explicit transaction. */ @Override - public void save(Object bean, @Nullable Transaction t) { - persister.save(checkEntityBean(bean), t); + public void save(Object bean, @Nullable Transaction transaction) { + persister.save(checkEntityBean(bean), transaction); } @Override @@ -1685,8 +1685,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public void update(Object bean, @Nullable Transaction t) { - persister.update(checkEntityBean(bean), t); + public void update(Object bean, @Nullable Transaction transaction) { + persister.update(checkEntityBean(bean), transaction); } @Override @@ -1722,8 +1722,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Insert the bean with a transaction. */ @Override - public void insert(Object bean, @Nullable Transaction t) { - persister.insert(checkEntityBean(bean), t); + public void insert(Object bean, @Nullable Transaction transaction) { + persister.insert(checkEntityBean(bean), transaction); } /** @@ -1866,8 +1866,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public int deleteAll(Class beanType, Collection ids, @Nullable Transaction t) { - return deleteAll(beanType, ids, t, false); + public int deleteAll(Class beanType, Collection ids, @Nullable Transaction transaction) { + return deleteAll(beanType, ids, transaction, false); } @Override @@ -1876,8 +1876,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public int deleteAllPermanent(Class beanType, Collection ids, @Nullable Transaction t) { - return deleteAll(beanType, ids, t, true); + public int deleteAllPermanent(Class beanType, Collection ids, @Nullable Transaction transaction) { + return deleteAll(beanType, ids, transaction, true); } private int deleteAll(Class beanType, Collection ids, @Nullable Transaction transaction, boolean permanent) { @@ -1896,9 +1896,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Delete the bean with the explicit transaction. */ @Override - public boolean delete(Object bean, @Nullable Transaction t) throws OptimisticLockException { + public boolean delete(Object bean, @Nullable Transaction transaction) throws OptimisticLockException { // this should really return an int where -1 means jdbc batch/unknown - return persister.delete(checkEntityBean(bean), t, false) != 0; + return persister.delete(checkEntityBean(bean), transaction, false) != 0; } @Override @@ -1907,9 +1907,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public boolean deletePermanent(Object bean, @Nullable Transaction t) throws OptimisticLockException { + public boolean deletePermanent(Object bean, @Nullable Transaction transaction) throws OptimisticLockException { // this should really return an int where -1 means jdbc batch/unknown - return persister.delete(checkEntityBean(bean), t, true) != 0; + return persister.delete(checkEntityBean(bean), transaction, true) != 0; } @Override @@ -1918,8 +1918,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } @Override - public int deleteAllPermanent(Collection beans, @Nullable Transaction t) { - return deleteAllInternal(beans, t, true); + public int deleteAllPermanent(Collection beans, @Nullable Transaction transaction) { + return deleteAllInternal(beans, transaction, true); } /** @@ -1934,8 +1934,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Delete all the beans in the collection. */ @Override - public int deleteAll(Collection beans, @Nullable Transaction t) { - return deleteAllInternal(beans, t, false); + public int deleteAll(Collection beans, @Nullable Transaction transaction) { + return deleteAllInternal(beans, transaction, false); } /** @@ -1961,8 +1961,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Execute the CallableSql with an explicit transaction. */ @Override - public int execute(CallableSql callSql, @Nullable Transaction t) { - return persister.executeCallable(callSql, t); + public int execute(CallableSql callSql, @Nullable Transaction transaction) { + return persister.executeCallable(callSql, transaction); } /** @@ -1977,8 +1977,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Execute the updateSql with an explicit transaction. */ @Override - public int execute(SqlUpdate updSql, @Nullable Transaction t) { - return persister.executeSqlUpdate(updSql, t); + public int execute(SqlUpdate updSql, @Nullable Transaction transaction) { + return persister.executeSqlUpdate(updSql, transaction); } @Override @@ -2008,8 +2008,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { * Execute the updateSql with an explicit transaction. */ @Override - public int execute(Update update, @Nullable Transaction t) { - return persister.executeOrmUpdate(update, t); + public int execute(Update update, @Nullable Transaction transaction) { + return persister.executeOrmUpdate(update, transaction); } /** @@ -2042,9 +2042,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } } - public void deregister(BeanPersistController c) { + public void deregister(BeanPersistController controller) { for (BeanDescriptor desc : beanDescriptorManager.descriptorList()) { - desc.deregister(c); + desc.deregister(controller); } } @@ -2166,8 +2166,8 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } } - private

P executeInTrans(Function fun, @Nullable Transaction t) { - ObtainedTransaction wrap = initTransIfRequired(t); + private

P executeInTrans(Function fun, @Nullable Transaction transaction) { + ObtainedTransaction wrap = initTransIfRequired(transaction); try { P result = fun.apply(wrap.transaction()); wrap.commitIfCreated(); @@ -2183,9 +2183,9 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { /** * Create a transaction if one is not currently active. */ - ObtainedTransaction initTransIfRequired(@Nullable Transaction t) { - if (t != null) { - return new ObtainedTransaction((SpiTransaction) t); + ObtainedTransaction initTransIfRequired(@Nullable Transaction transaction) { + if (transaction != null) { + return new ObtainedTransaction((SpiTransaction) transaction); } SpiTransaction trans = transactionManager.active(); if (trans != null) {