You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2024/11/01 13:47:43 UTC
(cayenne) branch master updated: Minor code cleanup
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new cc56f6573 Minor code cleanup
cc56f6573 is described below
commit cc56f6573655330994c3b0383114a75ae577bd9f
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Fri Nov 1 17:47:34 2024 +0400
Minor code cleanup
---
.../cayenne/access/translator/select/OrderingAbstractStage.java | 8 ++++++--
.../cayenne/access/translator/select/TranslatorContext.java | 4 +++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/OrderingAbstractStage.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/OrderingAbstractStage.java
index 545e59a5a..110f85b72 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/OrderingAbstractStage.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/OrderingAbstractStage.java
@@ -49,7 +49,11 @@ abstract class OrderingAbstractStage implements TranslationStage {
}
private boolean orderColumnAbsent(TranslatorContext context, Node orderingNode) {
- return context.getResultNodeList().stream()
- .noneMatch(result -> result.getNode().deepEquals(orderingNode));
+ for (ResultNodeDescriptor result : context.getResultNodeList()) {
+ if (result.getNode().deepEquals(orderingNode)) {
+ return false;
+ }
+ }
+ return true;
}
}
diff --git a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/TranslatorContext.java b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/TranslatorContext.java
index 237cfac07..fcfdc3b15 100644
--- a/cayenne/src/main/java/org/apache/cayenne/access/translator/select/TranslatorContext.java
+++ b/cayenne/src/main/java/org/apache/cayenne/access/translator/select/TranslatorContext.java
@@ -205,7 +205,9 @@ public class TranslatorContext implements SQLGenerationContext {
}
boolean hasAggregate() {
- if(hasAggregate != null) return hasAggregate;
+ if(hasAggregate != null) {
+ return hasAggregate;
+ }
if(getQuery().getHavingQualifier() != null) {
return (hasAggregate = true);