From a7116d1606ba20f018220d603acc26a1f7536cc7 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Sun, 10 Nov 2019 11:36:28 +1300 Subject: [PATCH] No effective change - tidy only --- src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java | 2 +- src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java | 2 +- .../java/io/ebeaninternal/server/query/QueryFutureRowCount.java | 1 - .../io/ebeaninternal/server/query/QueryPlanLoggerExplain.java | 2 +- .../io/ebeaninternal/server/query/QueryPlanLoggerOracle.java | 2 +- .../io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java | 2 +- .../io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java b/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java index 173cfc2be..3ff0c4613 100644 --- a/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryRowCount.java @@ -129,7 +129,7 @@ class CQueryRowCount implements SpiProfileTransactionEvent { if (queryPlan.executionTime(rowCount, executionTimeMicros, query.getParentNode())) { queryPlan.captureBindForQueryPlan(predicates, executionTimeMicros); } - getTransaction().profileEvent(this); + t.profileEvent(this); return rowCount; } finally { diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java b/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java index 1570e438e..cc502d716 100644 --- a/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryUpdate.java @@ -96,7 +96,7 @@ class CQueryUpdate implements SpiProfileTransactionEvent { if (queryPlan.executionTime(rowCount, executionTimeMicros, null)) { queryPlan.captureBindForQueryPlan(predicates, executionTimeMicros); } - getTransaction().profileEvent(this); + t.profileEvent(this); return rowCount; } finally { diff --git a/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java b/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java index f32506271..52c7b0fca 100644 --- a/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java +++ b/src/main/java/io/ebeaninternal/server/query/QueryFutureRowCount.java @@ -31,5 +31,4 @@ public class QueryFutureRowCount extends BaseFuture implements Futur return super.cancel(mayInterruptIfRunning); } - } diff --git a/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java index 21ce968de..ee7f19f28 100644 --- a/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java +++ b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerExplain.java @@ -8,7 +8,7 @@ import java.sql.SQLException; import io.ebeaninternal.server.type.bindcapture.BindCapture; /** - * A QueryPlanlogger that prefixes "EXPLAIN " to the query. This works for Postgres, H2 and MySql. + * A QueryPlanLogger that prefixes "EXPLAIN " to the query. This works for Postgres, H2 and MySql. */ public class QueryPlanLoggerExplain extends QueryPlanLogger { diff --git a/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java index 773724880..48e8a860f 100644 --- a/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java +++ b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerOracle.java @@ -10,7 +10,7 @@ import java.sql.SQLException; import java.sql.Statement; /** - * A QueryPlanlogger for oracle. + * A QueryPlanLogger for oracle. * * @author Roland Praml, FOCONIS AG */ diff --git a/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java index 06cab4682..5b5cbf887 100644 --- a/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java +++ b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerPostgres.java @@ -8,7 +8,7 @@ import java.sql.ResultSet; import java.sql.SQLException; /** - * A QueryPlanlogger for Postgres that prefixes "EXPLAIN ANALYZE" to the query. + * A QueryPlanLogger for Postgres that prefixes "EXPLAIN ANALYZE" to the query. */ public class QueryPlanLoggerPostgres extends QueryPlanLogger { diff --git a/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java index 355494336..e3e402f97 100644 --- a/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java +++ b/src/main/java/io/ebeaninternal/server/query/QueryPlanLoggerSqlServer.java @@ -9,7 +9,7 @@ import java.sql.SQLException; import java.sql.Statement; /** - * A QueryPlanlogger for sqlserver. It will return the plan as XML, which can be opened in + * A QueryPlanLogger for SqlServer. It will return the plan as XML, which can be opened in * Microsoft SQL Server Management Studio. * * @author Roland Praml, FOCONIS AG