From f6da22cd9b0423c6c53cb76699ad64676b9b8e88 Mon Sep 17 00:00:00 2001 From: Richard Virgo Richter Date: Thu, 2 Apr 2020 18:00:10 +0200 Subject: [PATCH] repo...hbm/condition: code cleanup, HibernateSubquery gone --- .../hqm/condition/HibernateSubquery.java | 32 ------------------- .../sql/query2/hqm/condition/InCondition.java | 12 ++++--- .../hqm/condition/JunctionCondition.java | 6 ++-- .../condition/SimpleComparisonCondition.java | 16 ++++++---- 4 files changed, 18 insertions(+), 48 deletions(-) delete mode 100644 repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/condition/HibernateSubquery.java diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/condition/HibernateSubquery.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/condition/HibernateSubquery.java deleted file mode 100644 index 766f1599378..00000000000 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/condition/HibernateSubquery.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) 2010-2015 Evolveum and contributors - * - * This work is dual-licensed under the Apache License 2.0 - * and European Union Public License. See LICENSE file for details. - */ - -package com.evolveum.midpoint.repo.sql.query2.hqm.condition; - -import com.evolveum.midpoint.repo.sql.query2.definition.JpaEntityDefinition; -import com.evolveum.midpoint.repo.sql.query2.hqm.HibernateQuery; -import com.evolveum.midpoint.repo.sql.query2.hqm.RootHibernateQuery; -import org.apache.commons.lang.Validate; - -/** - * @author mederly - */ -public class HibernateSubquery extends HibernateQuery { - - private HibernateQuery parentQuery; - - public HibernateSubquery(JpaEntityDefinition primaryEntityDef, HibernateQuery parentQuery) { - super(primaryEntityDef); - Validate.notNull(parentQuery); - this.parentQuery = parentQuery; - } - - @Override - public RootHibernateQuery getRootQuery() { - return parentQuery.getRootQuery(); - } -} diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/condition/InCondition.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/condition/InCondition.java index 5184af5977e..d7c49c0010f 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/condition/InCondition.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/condition/InCondition.java @@ -9,9 +9,11 @@ import com.evolveum.midpoint.repo.sql.query2.hqm.HibernateQuery; import com.evolveum.midpoint.repo.sql.query2.hqm.RootHibernateQuery; + import org.apache.commons.lang.Validate; import java.util.Collection; +import java.util.Objects; /** * @author mederly @@ -52,14 +54,14 @@ public void dumpToHql(StringBuilder sb, int indent) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; + if (this == o) { return true; } + if (o == null || getClass() != o.getClass()) { return false; } + if (!super.equals(o)) { return false; } InCondition that = (InCondition) o; - if (values != null ? !values.equals(that.values) : that.values != null) return false; - return !(innerQueryText != null ? !innerQueryText.equals(that.innerQueryText) : that.innerQueryText != null); + return Objects.equals(values, that.values) + && Objects.equals(innerQueryText, that.innerQueryText); } diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/condition/JunctionCondition.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/condition/JunctionCondition.java index 5b6ad768143..bccaf49872f 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/condition/JunctionCondition.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/condition/JunctionCondition.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; /** @@ -23,9 +24,7 @@ public abstract class JunctionCondition extends Condition { public JunctionCondition(RootHibernateQuery rootHibernateQuery, Condition... conditions) { super(rootHibernateQuery); - for (Condition condition : conditions) { - components.add(condition); - } + Collections.addAll(components, conditions); } public JunctionCondition(RootHibernateQuery rootHibernateQuery, Collection conditions) { @@ -69,7 +68,6 @@ public boolean equals(Object o) { JunctionCondition that = (JunctionCondition) o; return components.equals(that.components); - } @Override diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/condition/SimpleComparisonCondition.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/condition/SimpleComparisonCondition.java index b0140063a67..5cbca16ec9e 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/condition/SimpleComparisonCondition.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/hqm/condition/SimpleComparisonCondition.java @@ -7,8 +7,11 @@ package com.evolveum.midpoint.repo.sql.query2.hqm.condition; +import java.util.Objects; + import com.evolveum.midpoint.repo.sql.query2.hqm.HibernateQuery; import com.evolveum.midpoint.repo.sql.query2.hqm.RootHibernateQuery; + import org.apache.commons.lang.Validate; /** @@ -54,16 +57,15 @@ public void dumpToHql(StringBuilder sb, int indent) { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - if (!super.equals(o)) return false; + if (this == o) { return true; } + if (o == null || getClass() != o.getClass()) { return false; } + if (!super.equals(o)) { return false; } SimpleComparisonCondition that = (SimpleComparisonCondition) o; - if (ignoreCase != that.ignoreCase) return false; - if (value != null ? !value.equals(that.value) : that.value != null) return false; - return operator.equals(that.operator); - + return ignoreCase == that.ignoreCase + && Objects.equals(value, that.value) + && operator.equals(that.operator); } @Override