From d3a765a5323e82513a473b588a9a27d9e7baba34 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Mon, 14 Mar 2022 16:19:02 +1300 Subject: [PATCH] Tidy whitespace only, no effective change --- .../java/io/ebeaninternal/server/query/SqlTree.java | 9 --------- .../io/ebeaninternal/server/query/SqlTreeAlias.java | 12 ++---------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java index 5b11be657..d055b94c9 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTree.java @@ -13,30 +13,22 @@ import java.util.Set; final class SqlTree { private final SqlTreeNode rootNode; - /** * Property if resultSet contains master and detail rows. */ private final STreePropertyAssocMany manyProperty; - private final String distinctOn; - private final String selectSql; - private final String fromSql; - private final String groupBy; - /** * Encrypted Properties require additional binding. */ private final STreeProperty[] encryptedProps; - /** * Where clause for inheritance. */ private final String inheritanceWhereSql; - private final boolean noJoins; /** @@ -44,7 +36,6 @@ final class SqlTree { */ SqlTree(SqlTreeNode rootNode, String distinctOn, String selectSql, String fromSql, String groupBy, String inheritanceWhereSql, STreeProperty[] encryptedProps, STreePropertyAssocMany manyProperty, boolean includeJoins) { - this.rootNode = rootNode; this.distinctOn = distinctOn; this.selectSql = selectSql; diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java index 9d46d07c3..a3661e816 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/query/SqlTreeAlias.java @@ -15,22 +15,14 @@ import java.util.TreeSet; final class SqlTreeAlias { private final SpiQuery.TemporalMode temporalMode; - - private int counter; - - private int manyWhereCounter; - private final TreeSet joinProps = new TreeSet<>(); - private HashSet embeddedPropertyJoins; - private final TreeSet manyWhereJoinProps = new TreeSet<>(); - private final HashMap aliasMap = new HashMap<>(); - private final HashMap manyWhereAliasMap = new HashMap<>(); - private final String rootTableAlias; + private int counter; + private int manyWhereCounter; SqlTreeAlias(String rootTableAlias, SpiQuery.TemporalMode temporalMode) { this.rootTableAlias = rootTableAlias;