for #2084, EncryptRuleAware => EncryptRuleAwareFiller, ShardingRuleAw…

…are => ShardingRuleAwareFiller
apache · Apr 8, 2019 · 3ada5dd · 3ada5dd
1 parent 00e2345
commit 3ada5dd
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/.../parse/antlr/filler/EncryptRuleAware.java → .../antlr/filler/EncryptRuleAwareFiller.java b/.../parse/antlr/filler/EncryptRuleAware.java → .../antlr/filler/EncryptRuleAwareFiller.java
@@ -24,7 +24,7 @@
  *
  * @author zhangliang
  */
-public interface EncryptRuleAware {
+public interface EncryptRuleAwareFiller {
 
     /**
      * Set encrypt rule.

diff --git a/...main/java/org/apache/shardingsphere/core/parse/antlr/filler/SQLStatementFillerEngine.java b/...main/java/org/apache/shardingsphere/core/parse/antlr/filler/SQLStatementFillerEngine.java
@@ -81,11 +81,11 @@ public SQLStatement fill(final Collection<SQLSegment> sqlSegments, final SQLStat
 
     @SuppressWarnings("unchecked")
     private void doFill(final SQLSegment sqlSegment, final SQLStatement sqlStatement, final SQLSegmentFiller filler) {
-        if (filler instanceof ShardingRuleAware) {
-            ((ShardingRuleAware) filler).setShardingRule((ShardingRule) this.rule);
+        if (filler instanceof ShardingRuleAwareFiller) {
+            ((ShardingRuleAwareFiller) filler).setShardingRule((ShardingRule) this.rule);
         }
-        if (filler instanceof EncryptRuleAware) {
-            ((EncryptRuleAware) filler).setEncryptRule((EncryptRule) this.rule);
+        if (filler instanceof EncryptRuleAwareFiller) {
+            ((EncryptRuleAwareFiller) filler).setEncryptRule((EncryptRule) this.rule);
         }
         filler.fill(sqlSegment, sqlStatement, shardingTableMetaData);
     }

diff --git a/...parse/antlr/filler/ShardingRuleAware.java → ...antlr/filler/ShardingRuleAwareFiller.java b/...parse/antlr/filler/ShardingRuleAware.java → ...antlr/filler/ShardingRuleAwareFiller.java
@@ -24,7 +24,7 @@
  *
  * @author zhangliang
  */
-public interface ShardingRuleAware {
+public interface ShardingRuleAwareFiller {
 
     /**
      * Set sharding rule.

diff --git a/...org/apache/shardingsphere/core/parse/antlr/filler/encrypt/dml/EncryptFromWhereFiller.java b/...org/apache/shardingsphere/core/parse/antlr/filler/encrypt/dml/EncryptFromWhereFiller.java
@@ -20,7 +20,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.shardingsphere.core.metadata.table.ShardingTableMetaData;
-import org.apache.shardingsphere.core.parse.antlr.filler.EncryptRuleAware;
+import org.apache.shardingsphere.core.parse.antlr.filler.EncryptRuleAwareFiller;
 import org.apache.shardingsphere.core.parse.antlr.filler.SQLSegmentFiller;
 import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.FromWhereSegment;
 import org.apache.shardingsphere.core.parse.antlr.sql.statement.SQLStatement;
@@ -33,7 +33,7 @@
  */
 @Getter
 @Setter
-public class EncryptFromWhereFiller implements SQLSegmentFiller<FromWhereSegment>, EncryptRuleAware {
+public class EncryptFromWhereFiller implements SQLSegmentFiller<FromWhereSegment>, EncryptRuleAwareFiller {
 
     private EncryptRule encryptRule;
 

diff --git a/.../java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/FromWhereFiller.java b/.../java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/FromWhereFiller.java
@@ -21,7 +21,7 @@
 import lombok.Setter;
 import org.apache.shardingsphere.core.metadata.table.ShardingTableMetaData;
 import org.apache.shardingsphere.core.parse.antlr.filler.SQLSegmentFiller;
-import org.apache.shardingsphere.core.parse.antlr.filler.ShardingRuleAware;
+import org.apache.shardingsphere.core.parse.antlr.filler.ShardingRuleAwareFiller;
 import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.FromWhereSegment;
 import org.apache.shardingsphere.core.parse.antlr.sql.statement.SQLStatement;
 import org.apache.shardingsphere.core.rule.ShardingRule;
@@ -33,7 +33,7 @@
  */
 @Getter
 @Setter
-public class FromWhereFiller implements SQLSegmentFiller<FromWhereSegment>, ShardingRuleAware {
+public class FromWhereFiller implements SQLSegmentFiller<FromWhereSegment>, ShardingRuleAwareFiller {
 
     private ShardingRule shardingRule;
 

diff --git a/.../org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/SetAssignmentsFiller.java b/.../org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/SetAssignmentsFiller.java
@@ -23,7 +23,7 @@
 import org.apache.shardingsphere.core.metadata.table.ShardingTableMetaData;
 import org.apache.shardingsphere.core.parse.antlr.constant.QuoteCharacter;
 import org.apache.shardingsphere.core.parse.antlr.filler.SQLSegmentFiller;
-import org.apache.shardingsphere.core.parse.antlr.filler.ShardingRuleAware;
+import org.apache.shardingsphere.core.parse.antlr.filler.ShardingRuleAwareFiller;
 import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.assignment.AssignmentSegment;
 import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.assignment.SetAssignmentsSegment;
 import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.column.ColumnSegment;
@@ -53,7 +53,7 @@
  * @author zhangliang
  */
 @Setter
-public final class SetAssignmentsFiller implements SQLSegmentFiller<SetAssignmentsSegment>, ShardingRuleAware {
+public final class SetAssignmentsFiller implements SQLSegmentFiller<SetAssignmentsSegment>, ShardingRuleAwareFiller {
 
     private ShardingRule shardingRule;
 

diff --git a/...main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/TableFiller.java b/...main/java/org/apache/shardingsphere/core/parse/antlr/filler/sharding/dml/TableFiller.java
@@ -20,7 +20,7 @@
 import lombok.Setter;
 import org.apache.shardingsphere.core.metadata.table.ShardingTableMetaData;
 import org.apache.shardingsphere.core.parse.antlr.filler.SQLSegmentFiller;
-import org.apache.shardingsphere.core.parse.antlr.filler.ShardingRuleAware;
+import org.apache.shardingsphere.core.parse.antlr.filler.ShardingRuleAwareFiller;
 import org.apache.shardingsphere.core.parse.antlr.sql.segment.common.TableSegment;
 import org.apache.shardingsphere.core.parse.antlr.sql.statement.SQLStatement;
 import org.apache.shardingsphere.core.parse.antlr.sql.statement.dml.SelectStatement;
@@ -33,7 +33,7 @@
  * @author duhongjun
  */
 @Setter
-public final class TableFiller implements SQLSegmentFiller<TableSegment>, ShardingRuleAware {
+public final class TableFiller implements SQLSegmentFiller<TableSegment>, ShardingRuleAwareFiller {
 
     private ShardingRule shardingRule;
 

diff --git a/...apache/shardingsphere/core/parse/antlr/filler/sharding/dml/insert/InsertValuesFiller.java b/...apache/shardingsphere/core/parse/antlr/filler/sharding/dml/insert/InsertValuesFiller.java
@@ -22,7 +22,7 @@
 import lombok.Setter;
 import org.apache.shardingsphere.core.metadata.table.ShardingTableMetaData;
 import org.apache.shardingsphere.core.parse.antlr.filler.SQLSegmentFiller;
-import org.apache.shardingsphere.core.parse.antlr.filler.ShardingRuleAware;
+import org.apache.shardingsphere.core.parse.antlr.filler.ShardingRuleAwareFiller;
 import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.InsertValuesSegment;
 import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.expr.CommonExpressionSegment;
 import org.apache.shardingsphere.core.parse.antlr.sql.statement.SQLStatement;
@@ -47,7 +47,7 @@
  * @author zhangliang
  */
 @Setter
-public final class InsertValuesFiller implements SQLSegmentFiller<InsertValuesSegment>, ShardingRuleAware {
+public final class InsertValuesFiller implements SQLSegmentFiller<InsertValuesSegment>, ShardingRuleAwareFiller {
 
     private ShardingRule shardingRule;
 

diff --git a/...ardingsphere/core/parse/antlr/filler/sharding/dml/insert/OnDuplicateKeyColumnsFiller.java b/...ardingsphere/core/parse/antlr/filler/sharding/dml/insert/OnDuplicateKeyColumnsFiller.java
@@ -20,7 +20,7 @@
 import lombok.Setter;
 import org.apache.shardingsphere.core.metadata.table.ShardingTableMetaData;
 import org.apache.shardingsphere.core.parse.antlr.filler.SQLSegmentFiller;
-import org.apache.shardingsphere.core.parse.antlr.filler.ShardingRuleAware;
+import org.apache.shardingsphere.core.parse.antlr.filler.ShardingRuleAwareFiller;
 import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.column.ColumnSegment;
 import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.column.OnDuplicateKeyColumnsSegment;
 import org.apache.shardingsphere.core.parse.antlr.sql.statement.SQLStatement;
@@ -34,7 +34,7 @@
  * @author zhangliang
  */
 @Setter
-public final class OnDuplicateKeyColumnsFiller implements SQLSegmentFiller<OnDuplicateKeyColumnsSegment>, ShardingRuleAware {
+public final class OnDuplicateKeyColumnsFiller implements SQLSegmentFiller<OnDuplicateKeyColumnsSegment>, ShardingRuleAwareFiller {
 
     private ShardingRule shardingRule;
 

diff --git a/...e/shardingsphere/core/parse/antlr/filler/sharding/dml/select/SubqueryConditionFiller.java b/...e/shardingsphere/core/parse/antlr/filler/sharding/dml/select/SubqueryConditionFiller.java
@@ -20,7 +20,7 @@
 import lombok.Setter;
 import org.apache.shardingsphere.core.metadata.table.ShardingTableMetaData;
 import org.apache.shardingsphere.core.parse.antlr.filler.SQLSegmentFiller;
-import org.apache.shardingsphere.core.parse.antlr.filler.ShardingRuleAware;
+import org.apache.shardingsphere.core.parse.antlr.filler.ShardingRuleAwareFiller;
 import org.apache.shardingsphere.core.parse.antlr.filler.sharding.dml.OrConditionFiller;
 import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.condition.OrConditionSegment;
 import org.apache.shardingsphere.core.parse.antlr.sql.segment.dml.condition.SubqueryConditionSegment;
@@ -34,7 +34,7 @@
  * @author duhongjun
  */
 @Setter
-public final class SubqueryConditionFiller implements SQLSegmentFiller<SubqueryConditionSegment>, ShardingRuleAware {
+public final class SubqueryConditionFiller implements SQLSegmentFiller<SubqueryConditionSegment>, ShardingRuleAwareFiller {
 
     private ShardingRule shardingRule;