Subscription: simplify table and tree consumer builder interface (apache#15399)

VGalaxies · web-flow · commit eb15d9a8367d · 2025-04-24T13:13:03.000+08:00
diff --git a/example/session/src/main/java/org/apache/iotdb/TableModelSubscriptionSessionExample.java b/example/session/src/main/java/org/apache/iotdb/TableModelSubscriptionSessionExample.java
@@ -119,7 +119,7 @@ private static void dataSubscription() throws Exception {
         new SubscriptionTablePullConsumerBuilder()
             .consumerId("c1")
             .consumerGroupId("cg1")
-            .buildTablePullConsumer()) {
+            .build()) {
       consumer1.open();
       consumer1.subscribe(TOPIC_1);
       while (true) {
diff --git a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/tsfile/subscription/SubscriptionTableTsFile.java b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/tsfile/subscription/SubscriptionTableTsFile.java
@@ -109,7 +109,7 @@ public void createConsumers(String groupId) {
                   .autoCommit(Constants.AUTO_COMMIT)
                   .autoCommitIntervalMs(Constants.AUTO_COMMIT_INTERVAL)
                   .fileSaveDir(commonParam.getTargetDir())
-                  .buildTablePullConsumer());
+                  .build());
     }
     commonParam
         .getPullTableConsumers()
diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/base/AbstractSubscriptionConsumerBuilder.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/base/AbstractSubscriptionConsumerBuilder.java
@@ -21,10 +21,6 @@
 
 import org.apache.iotdb.isession.SessionConfig;
 import org.apache.iotdb.rpc.subscription.config.ConsumerConstant;
-import org.apache.iotdb.session.subscription.consumer.ISubscriptionTablePullConsumer;
-import org.apache.iotdb.session.subscription.consumer.ISubscriptionTablePushConsumer;
-import org.apache.iotdb.session.subscription.consumer.ISubscriptionTreePullConsumer;
-import org.apache.iotdb.session.subscription.consumer.ISubscriptionTreePushConsumer;
 import org.apache.iotdb.session.subscription.util.IdentifierUtils;
 
 import org.apache.thrift.annotation.Nullable;
@@ -131,20 +127,4 @@ public AbstractSubscriptionConsumerBuilder maxPollParallelism(final int maxPollP
     this.maxPollParallelism = Math.max(maxPollParallelism, 1);
     return this;
   }
-
-  public ISubscriptionTreePullConsumer buildTreePullConsumer() {
-    throw new UnsupportedOperationException();
-  }
-
-  public ISubscriptionTreePushConsumer buildTreePushConsumer() {
-    throw new UnsupportedOperationException();
-  }
-
-  public ISubscriptionTablePullConsumer buildTablePullConsumer() {
-    throw new UnsupportedOperationException();
-  }
-
-  public ISubscriptionTablePushConsumer buildTablePushConsumer() {
-    throw new UnsupportedOperationException();
-  }
 }
diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/table/SubscriptionTablePullConsumerBuilder.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/table/SubscriptionTablePullConsumerBuilder.java
@@ -118,8 +118,7 @@ public SubscriptionTablePullConsumerBuilder autoCommitIntervalMs(
     return this;
   }
 
-  @Override
-  public ISubscriptionTablePullConsumer buildTablePullConsumer() {
+  public ISubscriptionTablePullConsumer build() {
     return new SubscriptionTablePullConsumer(this);
   }
 }
diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/table/SubscriptionTablePushConsumerBuilder.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/table/SubscriptionTablePushConsumerBuilder.java
@@ -132,8 +132,7 @@ public SubscriptionTablePushConsumerBuilder autoPollTimeoutMs(final long autoPol
     return this;
   }
 
-  @Override
-  public ISubscriptionTablePushConsumer buildTablePushConsumer() {
+  public ISubscriptionTablePushConsumer build() {
     return new SubscriptionTablePushConsumer(this);
   }
 }
diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/tree/SubscriptionTreePullConsumerBuilder.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/tree/SubscriptionTreePullConsumerBuilder.java
@@ -117,8 +117,7 @@ public SubscriptionTreePullConsumerBuilder autoCommitIntervalMs(final long autoC
     return this;
   }
 
-  @Override
-  public ISubscriptionTreePullConsumer buildTreePullConsumer() {
+  public ISubscriptionTreePullConsumer build() {
     return new SubscriptionTreePullConsumer(this);
   }
 }
diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/tree/SubscriptionTreePushConsumerBuilder.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/tree/SubscriptionTreePushConsumerBuilder.java
@@ -132,8 +132,7 @@ public SubscriptionTreePushConsumerBuilder autoPollTimeoutMs(final long autoPoll
     return this;
   }
 
-  @Override
-  public ISubscriptionTreePushConsumer buildTreePushConsumer() {
+  public ISubscriptionTreePushConsumer build() {
     return new SubscriptionTreePushConsumer(this);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public void createConsumers(String groupId) {`
`109`	`109`	`.autoCommit(Constants.AUTO_COMMIT)`
`110`	`110`	`.autoCommitIntervalMs(Constants.AUTO_COMMIT_INTERVAL)`
`111`	`111`	`.fileSaveDir(commonParam.getTargetDir())`
`112`		`- .buildTablePullConsumer());`
	`112`	`+ .build());`
`113`	`113`	`}`
`114`	`114`	`commonParam`
`115`	`115`	`.getPullTableConsumers()`
Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,7 @@ public SubscriptionTablePullConsumerBuilder autoCommitIntervalMs(`
`118`	`118`	`return this;`
`119`	`119`	`}`
`120`	`120`
`121`		`- @Override`
`122`		`- public ISubscriptionTablePullConsumer buildTablePullConsumer() {`
	`121`	`+ public ISubscriptionTablePullConsumer build() {`
`123`	`122`	`return new SubscriptionTablePullConsumer(this);`
`124`	`123`	`}`
`125`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,8 +132,7 @@ public SubscriptionTablePushConsumerBuilder autoPollTimeoutMs(final long autoPol`
`132`	`132`	`return this;`
`133`	`133`	`}`
`134`	`134`
`135`		`- @Override`
`136`		`- public ISubscriptionTablePushConsumer buildTablePushConsumer() {`
	`135`	`+ public ISubscriptionTablePushConsumer build() {`
`137`	`136`	`return new SubscriptionTablePushConsumer(this);`
`138`	`137`	`}`
`139`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,7 @@ public SubscriptionTreePullConsumerBuilder autoCommitIntervalMs(final long autoC`
`117`	`117`	`return this;`
`118`	`118`	`}`
`119`	`119`
`120`		`- @Override`
`121`		`- public ISubscriptionTreePullConsumer buildTreePullConsumer() {`
	`120`	`+ public ISubscriptionTreePullConsumer build() {`
`122`	`121`	`return new SubscriptionTreePullConsumer(this);`
`123`	`122`	`}`
`124`	`123`	`}`