From 154e18cb0157beda601b8a2c7c3229a2a9902dd2 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 11 Oct 2022 13:02:32 +0200 Subject: [PATCH] Polishing. Removes code duplication. Original pull request #1348 --- .../relational/core/sql/render/OrderByClauseVisitor.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/OrderByClauseVisitor.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/OrderByClauseVisitor.java index 23b7e2f30..065a4f341 100644 --- a/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/OrderByClauseVisitor.java +++ b/spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/render/OrderByClauseVisitor.java @@ -77,6 +77,7 @@ class OrderByClauseVisitor extends TypedSubtreeVisitor implements @Override Delegation enterNested(Visitable segment) { + if (segment instanceof SimpleFunction) { delegate = new SimpleFunctionVisitor(context); return Delegation.delegateTo((SimpleFunctionVisitor)delegate); @@ -92,12 +93,8 @@ class OrderByClauseVisitor extends TypedSubtreeVisitor implements @Override Delegation leaveNested(Visitable segment) { - if (delegate instanceof SimpleFunctionVisitor) { - builder.append(delegate.getRenderedPart()); - delegate = null; - } - if (delegate instanceof ExpressionVisitor) { + if (delegate instanceof SimpleFunctionVisitor || delegate instanceof ExpressionVisitor) { builder.append(delegate.getRenderedPart()); delegate = null; }