From 4371aec0f98039131e9298b1d63bbc545b7a0f18 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 10 Mar 2020 10:16:01 +0100 Subject: [PATCH] DATAJDBC-490 - Polishing. Renamed GroupedConditionVisitor to NestedConditionVisitor to match the renamed NestedCondition. Original pull request: #193. --- .../data/relational/core/sql/render/ConditionVisitor.java | 2 +- ...pedConditionVisitor.java => NestedConditionVisitor.java} | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) rename spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/{GroupedConditionVisitor.java => NestedConditionVisitor.java} (93%) diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/ConditionVisitor.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/ConditionVisitor.java index 15c2030a..86877480 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/ConditionVisitor.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/ConditionVisitor.java @@ -88,7 +88,7 @@ class ConditionVisitor extends TypedSubtreeVisitor implements PartRen } if (segment instanceof NestedCondition) { - return new GroupedConditionVisitor(context, builder::append); + return new NestedConditionVisitor(context, builder::append); } return null; diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/GroupedConditionVisitor.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/NestedConditionVisitor.java similarity index 93% rename from spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/GroupedConditionVisitor.java rename to spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/NestedConditionVisitor.java index 199b3c7b..317d334c 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/GroupedConditionVisitor.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/NestedConditionVisitor.java @@ -26,14 +26,15 @@ import org.springframework.lang.Nullable; * @author Mark Paluch * @since 2.0 */ -class GroupedConditionVisitor extends TypedSubtreeVisitor { +class NestedConditionVisitor extends TypedSubtreeVisitor { private final RenderContext context; private final RenderTarget target; private @Nullable ConditionVisitor conditionVisitor; - GroupedConditionVisitor(RenderContext context, RenderTarget target) { + NestedConditionVisitor(RenderContext context, RenderTarget target) { + this.context = context; this.target = target; } @@ -68,6 +69,7 @@ class GroupedConditionVisitor extends TypedSubtreeVisitor { Delegation leaveNested(Visitable segment) { if (conditionVisitor != null) { + target.onRendered("(" + conditionVisitor.getRenderedPart() + ")"); conditionVisitor = null; }