diff --git a/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptConditionEngine.java b/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptConditionEngine.java index 75b604a5eb4f22f918fdfedc14a229e01178cacf..bef67182af8d8ad1a151eb82a2d564d5f53b17fb 100644 --- a/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptConditionEngine.java +++ b/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptConditionEngine.java @@ -80,7 +80,7 @@ public final class EncryptConditionEngine { } return result; } - + private Collection createEncryptConditions(final AndPredicate andPredicate, final TablesContext tablesContext) { Collection result = new LinkedList<>(); Collection stopIndexes = new HashSet<>(); diff --git a/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptPredicateRightValueTokenGenerator.java b/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptPredicateRightValueTokenGenerator.java index e1dfa9c4ec5e9fd73d07f45e7c351526280ca394..f4275f5e68f21ec4078307e15ffb99f0e8979f42 100644 --- a/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptPredicateRightValueTokenGenerator.java +++ b/encrypt-core/encrypt-core-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/impl/EncryptPredicateRightValueTokenGenerator.java @@ -48,8 +48,8 @@ import java.util.Map; * @author zhangliang */ @Setter -public final class EncryptPredicateRightValueTokenGenerator extends BaseEncryptSQLTokenGenerator implements CollectionSQLTokenGenerator, - RelationMetasAware, ParametersAware, QueryWithCipherColumnAware { +public final class EncryptPredicateRightValueTokenGenerator extends BaseEncryptSQLTokenGenerator + implements CollectionSQLTokenGenerator, RelationMetasAware, ParametersAware, QueryWithCipherColumnAware { private RelationMetas relationMetas; diff --git a/encrypt-core/encrypt-core-rewrite/src/test/resources/encrypt/select_for_query_with_cipher.xml b/encrypt-core/encrypt-core-rewrite/src/test/resources/encrypt/select_for_query_with_cipher.xml index 84bafa42de29d070d9be4ef6c0bdf98376924fab..0013777c0b74b9098c2887e974530df76a158f41 100644 --- a/encrypt-core/encrypt-core-rewrite/src/test/resources/encrypt/select_for_query_with_cipher.xml +++ b/encrypt-core/encrypt-core-rewrite/src/test/resources/encrypt/select_for_query_with_cipher.xml @@ -36,23 +36,23 @@ - + - + - + - + diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/constant/Bracket.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/constant/Bracket.java index c990aedeb35f6c17a35ecbf5c65a7d7e33473aa0..9c3b677763bea71a0f8cca6722e35331c2cdc544 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/constant/Bracket.java +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/constant/Bracket.java @@ -18,28 +18,26 @@ package org.apache.shardingsphere.sql.parser.core.constant; import lombok.Getter; +import lombok.RequiredArgsConstructor; /** * Predicate in bracket. * * @author chun.yang */ +@RequiredArgsConstructor @Getter public enum Bracket { - + /** - * in left bracket. + * In left bracket. */ LEFT("("), - + /** - * in right bracket. + * In right bracket. */ RIGHT(")"); - + private final String value; - - Bracket(final String value) { - this.value = value; - } } diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/extractor/impl/dml/PredicateExtractor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/extractor/impl/dml/PredicateExtractor.java index 714e43ebe43f27f904daea741fbff1f5676f34fe..55a2fa0c155e14baf9bc64bad8cd51f9253071ea 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/extractor/impl/dml/PredicateExtractor.java +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/core/extractor/impl/dml/PredicateExtractor.java @@ -83,7 +83,7 @@ public final class PredicateExtractor implements OptionalSQLSegmentExtractor { } return leftPredicate.isPresent() ? leftPredicate : rightPredicate; } - + private ParserRuleContext extractOperatorNode(final ParserRuleContext exprNode, final int childIndex) { ParserRuleContext result = (ParserRuleContext) exprNode.getChild(childIndex); while (ExtractorUtils.findFirstChildNodeNoneRecursive(result, RuleName.LOGICAL_OPERATOR).isPresent()) { @@ -91,7 +91,7 @@ public final class PredicateExtractor implements OptionalSQLSegmentExtractor { } return result; } - + private Optional extractPredicateSegment(final ParserRuleContext exprNode, final ParserRuleContext childNode, final int childIndex, final Map parameterMarkerIndexes) { ParserRuleContext operatorNode = childNode; @@ -116,7 +116,7 @@ public final class PredicateExtractor implements OptionalSQLSegmentExtractor { } return result; } - + private Optional extractRecursiveWithParen(final ParserRuleContext exprNode, final Map parameterMarkerIndexes) { if (1 == exprNode.getChild(0).getText().length() && Paren.isLeftParen(exprNode.getChild(0).getText().charAt(0))) { return extractRecursiveWithLogicalOperation((ParserRuleContext) exprNode.getChild(1), parameterMarkerIndexes); @@ -190,7 +190,7 @@ public final class PredicateExtractor implements OptionalSQLSegmentExtractor { predicateNode.getStart().getStartIndex(), predicateNode.getStop().getStopIndex(), column, new PredicateBetweenRightValue(betweenSQLExpression.get(), andSQLExpression.get()))) : Optional.absent(); } - + private Optional extractInPredicate(final ParserRuleContext predicateNode, final Map parameterMarkerIndexes, final ColumnSegment column) { Optional predicateBracketValue = extractBracketValue(predicateNode); Collection sqlExpressions = extractInExpressionSegments(predicateNode, parameterMarkerIndexes); @@ -198,7 +198,7 @@ public final class PredicateExtractor implements OptionalSQLSegmentExtractor { new PredicateInRightValue(predicateBracketValue.get(), sqlExpressions)); return sqlExpressions.isEmpty() ? Optional.absent() : Optional.of(predicateSegment); } - + private Optional extractBracketValue(final ParserRuleContext predicateNode) { PredicateLeftBracketValue predicateLeftBracketValue = null; PredicateRightBracketValue predicateRightBracketValue = null; @@ -215,7 +215,7 @@ public final class PredicateExtractor implements OptionalSQLSegmentExtractor { } return Optional.absent(); } - + private Collection extractInExpressionSegments(final ParserRuleContext predicateNode, final Map parameterMarkerIndexes) { List result = new LinkedList<>(); for (int i = 3; i < predicateNode.getChildCount(); i++) { diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/predicate/value/PredicateBracketValue.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/predicate/value/PredicateBracketValue.java index b23b69309f4bf5e69efe2fc371f4ee6f6ba5b07e..e7c4e09f537794d78f5b94a002257918370ebe99 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/predicate/value/PredicateBracketValue.java +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/predicate/value/PredicateBracketValue.java @@ -27,8 +27,8 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor @Getter public final class PredicateBracketValue implements PredicateRightValue { - + private final PredicateLeftBracketValue predicateLeftBracketValue; - + private final PredicateRightBracketValue predicateRightBracketValue; } diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/predicate/value/PredicateInRightValue.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/predicate/value/PredicateInRightValue.java index dc52549978c08a9b9234a90f863b00a9227188e6..9d5f34a4a4463fa99228b2e5721795a96b364aeb 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/predicate/value/PredicateInRightValue.java +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/predicate/value/PredicateInRightValue.java @@ -31,8 +31,8 @@ import java.util.Collection; @RequiredArgsConstructor @Getter public final class PredicateInRightValue implements PredicateRightValue { - + private final PredicateBracketValue predicateBracketValue; - + private final Collection sqlExpressions; } diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/predicate/value/PredicateLeftBracketValue.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/predicate/value/PredicateLeftBracketValue.java index 75c28eadbfe43afb4a610d7fcde11d9d01db7abc..cae23e730eb48f2147f2a35aad8c1c0ec3dd92c2 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/predicate/value/PredicateLeftBracketValue.java +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/predicate/value/PredicateLeftBracketValue.java @@ -30,8 +30,8 @@ import lombok.ToString; @Getter @ToString public final class PredicateLeftBracketValue implements PredicateRightValue { - + private final int startIndex; - + private final int stopIndex; } diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/predicate/value/PredicateRightBracketValue.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/predicate/value/PredicateRightBracketValue.java index 30530854ca6b97a6dde9768062588b22edc041a1..59a03662fb4d27a727b618f3cd5246197450ec63 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/predicate/value/PredicateRightBracketValue.java +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/segment/dml/predicate/value/PredicateRightBracketValue.java @@ -30,8 +30,8 @@ import lombok.ToString; @Getter @ToString public final class PredicateRightBracketValue implements PredicateRightValue { - + private final int startIndex; - + private final int stopIndex; }