Skip to content

Commit eb15d9a

Browse files
authored
Subscription: simplify table and tree consumer builder interface (#15399)
1 parent b1344ee commit eb15d9a

File tree

7 files changed

+6
-30
lines changed

7 files changed

+6
-30
lines changed

example/session/src/main/java/org/apache/iotdb/TableModelSubscriptionSessionExample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ private static void dataSubscription() throws Exception {
119119
new SubscriptionTablePullConsumerBuilder()
120120
.consumerId("c1")
121121
.consumerGroupId("cg1")
122-
.buildTablePullConsumer()) {
122+
.build()) {
123123
consumer1.open();
124124
consumer1.subscribe(TOPIC_1);
125125
while (true) {

iotdb-client/cli/src/main/java/org/apache/iotdb/tool/tsfile/subscription/SubscriptionTableTsFile.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void createConsumers(String groupId) {
109109
.autoCommit(Constants.AUTO_COMMIT)
110110
.autoCommitIntervalMs(Constants.AUTO_COMMIT_INTERVAL)
111111
.fileSaveDir(commonParam.getTargetDir())
112-
.buildTablePullConsumer());
112+
.build());
113113
}
114114
commonParam
115115
.getPullTableConsumers()

iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/base/AbstractSubscriptionConsumerBuilder.java

-20
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@
2121

2222
import org.apache.iotdb.isession.SessionConfig;
2323
import org.apache.iotdb.rpc.subscription.config.ConsumerConstant;
24-
import org.apache.iotdb.session.subscription.consumer.ISubscriptionTablePullConsumer;
25-
import org.apache.iotdb.session.subscription.consumer.ISubscriptionTablePushConsumer;
26-
import org.apache.iotdb.session.subscription.consumer.ISubscriptionTreePullConsumer;
27-
import org.apache.iotdb.session.subscription.consumer.ISubscriptionTreePushConsumer;
2824
import org.apache.iotdb.session.subscription.util.IdentifierUtils;
2925

3026
import org.apache.thrift.annotation.Nullable;
@@ -131,20 +127,4 @@ public AbstractSubscriptionConsumerBuilder maxPollParallelism(final int maxPollP
131127
this.maxPollParallelism = Math.max(maxPollParallelism, 1);
132128
return this;
133129
}
134-
135-
public ISubscriptionTreePullConsumer buildTreePullConsumer() {
136-
throw new UnsupportedOperationException();
137-
}
138-
139-
public ISubscriptionTreePushConsumer buildTreePushConsumer() {
140-
throw new UnsupportedOperationException();
141-
}
142-
143-
public ISubscriptionTablePullConsumer buildTablePullConsumer() {
144-
throw new UnsupportedOperationException();
145-
}
146-
147-
public ISubscriptionTablePushConsumer buildTablePushConsumer() {
148-
throw new UnsupportedOperationException();
149-
}
150130
}

iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/table/SubscriptionTablePullConsumerBuilder.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,7 @@ public SubscriptionTablePullConsumerBuilder autoCommitIntervalMs(
118118
return this;
119119
}
120120

121-
@Override
122-
public ISubscriptionTablePullConsumer buildTablePullConsumer() {
121+
public ISubscriptionTablePullConsumer build() {
123122
return new SubscriptionTablePullConsumer(this);
124123
}
125124
}

iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/table/SubscriptionTablePushConsumerBuilder.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,7 @@ public SubscriptionTablePushConsumerBuilder autoPollTimeoutMs(final long autoPol
132132
return this;
133133
}
134134

135-
@Override
136-
public ISubscriptionTablePushConsumer buildTablePushConsumer() {
135+
public ISubscriptionTablePushConsumer build() {
137136
return new SubscriptionTablePushConsumer(this);
138137
}
139138
}

iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/tree/SubscriptionTreePullConsumerBuilder.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@ public SubscriptionTreePullConsumerBuilder autoCommitIntervalMs(final long autoC
117117
return this;
118118
}
119119

120-
@Override
121-
public ISubscriptionTreePullConsumer buildTreePullConsumer() {
120+
public ISubscriptionTreePullConsumer build() {
122121
return new SubscriptionTreePullConsumer(this);
123122
}
124123
}

iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/consumer/tree/SubscriptionTreePushConsumerBuilder.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,7 @@ public SubscriptionTreePushConsumerBuilder autoPollTimeoutMs(final long autoPoll
132132
return this;
133133
}
134134

135-
@Override
136-
public ISubscriptionTreePushConsumer buildTreePushConsumer() {
135+
public ISubscriptionTreePushConsumer build() {
137136
return new SubscriptionTreePushConsumer(this);
138137
}
139138
}

0 commit comments

Comments
 (0)