Skip to content

Commit c990347

Browse files
authored
*: fix fmt (#217)
1 parent f919f41 commit c990347

35 files changed

+290
-205
lines changed

client/build.gradle.kts

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
id("signing")
99

1010
kotlin("jvm") version "1.6.10"
11-
id("com.diffplug.spotless") version "6.2.0"
11+
id("com.diffplug.spotless") version "6.20.0"
1212

1313
id("me.champeau.jmh") version "0.6.7"
1414
}
@@ -147,17 +147,25 @@ publishing {
147147
// def releasesRepoUrl = layout.buildDirectory.dir('repos/releases')
148148
// def snapshotsRepoUrl = layout.buildDirectory.dir('repos/snapshots')
149149
url = uri(
150-
if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl
150+
if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl,
151151
)
152152
credentials {
153153
username =
154-
if (project.hasProperty("ossrhUsername")) project.property("ossrhUsername") as String? else System.getenv(
155-
"OSSRH_USERNAME"
156-
)
154+
if (project.hasProperty("ossrhUsername")) {
155+
project.property("ossrhUsername") as String?
156+
} else {
157+
System.getenv(
158+
"OSSRH_USERNAME",
159+
)
160+
}
157161
password =
158-
if (project.hasProperty("ossrhPassword")) project.property("ossrhPassword") as String? else System.getenv(
159-
"OSSRH_TOKEN"
160-
)
162+
if (project.hasProperty("ossrhPassword")) {
163+
project.property("ossrhPassword") as String?
164+
} else {
165+
System.getenv(
166+
"OSSRH_TOKEN",
167+
)
168+
}
161169
}
162170
}
163171
}
@@ -194,12 +202,12 @@ tasks.withType<Jar> {
194202

195203
spotless {
196204
java {
197-
target("client/src/*/java/**/*.java")
205+
target("**/*.java")
198206
googleJavaFormat()
199207
}
200208

201209
kotlin {
202-
target("client/src/*/kotlin/**/*.kt")
210+
target("**/*.kt")
203211
ktlint()
204212
}
205213

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package io.hstream;
22

33
public interface BatchAckResponder {
4-
void ackAll();
4+
void ackAll();
55
}

client/src/main/java/io/hstream/ConsumerBuilder.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
package io.hstream;
22

3-
import java.util.List;
4-
import java.util.function.BiConsumer;
5-
63
/** A builder for {@link Consumer}s. */
74
public interface ConsumerBuilder {
85

client/src/main/java/io/hstream/FlowControlSetting.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.hstream;
22

3-
import static com.google.common.base.Preconditions.*;
3+
import static com.google.common.base.Preconditions.checkState;
44

55
public class FlowControlSetting {
66

client/src/main/java/io/hstream/HStreamClient.java

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,35 @@
66
/** A client for the HStreamDB. */
77
public interface HStreamClient extends AutoCloseable {
88

9-
/** @return a {@link HStreamClientBuilder} */
9+
/**
10+
* @return a {@link HStreamClientBuilder}
11+
*/
1012
static HStreamClientBuilder builder() {
1113
return new HStreamClientBuilderImpl();
1214
}
1315

14-
/** @return a {@link ProducerBuilder} */
16+
/**
17+
* @return a {@link ProducerBuilder}
18+
*/
1519
ProducerBuilder newProducer();
1620

1721
BufferedProducerBuilder newBufferedProducer();
1822

19-
/** @return a {@link ConsumerBuilder} */
23+
/**
24+
* @return a {@link ConsumerBuilder}
25+
*/
2026
ConsumerBuilder newConsumer();
2127

2228
@Deprecated
23-
/** @return a {@link QueryerBuilder} */
29+
/**
30+
* @return a {@link QueryerBuilder}
31+
*/
2432
QueryerBuilder newQueryer();
2533

2634
@Deprecated
27-
/** @return a {@link ReaderBuilder} */
35+
/**
36+
* @return a {@link ReaderBuilder}
37+
*/
2838
ReaderBuilder newReader();
2939

3040
StreamShardReaderBuilder newStreamShardReader();
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package io.hstream;
22

3-
43
public interface StreamKeyReader extends AutoCloseable {
54

6-
boolean hasNext();
7-
ReceivedRecord next();
5+
boolean hasNext();
86

7+
ReceivedRecord next();
98
}

client/src/main/java/io/hstream/StreamKeyReaderBuilder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public interface StreamKeyReaderBuilder {
99
StreamKeyReaderBuilder from(StreamShardOffset from);
1010

1111
StreamKeyReaderBuilder until(StreamShardOffset until);
12+
1213
StreamKeyReaderBuilder bufferSize(int bufferSize);
1314

1415
StreamKeyReader build();

client/src/main/java/io/hstream/StreamShardReaderBuilder.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@ public interface StreamShardReaderBuilder {
77
StreamShardReaderBuilder shardId(long shardId);
88

99
StreamShardReaderBuilder from(StreamShardOffset shardOffset);
10+
1011
StreamShardReaderBuilder maxReadBatches(long maxReadBatches);
12+
1113
StreamShardReaderBuilder until(StreamShardOffset until);
1214

1315
StreamShardReaderBuilder receiver(StreamShardReaderReceiver streamShardReaderReceiver);
16+
1417
StreamShardReaderBuilder batchReceiver(StreamShardReaderBatchReceiver streamShardReaderReceiver);
1518

1619
StreamShardReader build();

client/src/main/java/io/hstream/Subscription.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ private Subscription(
4141
this.createdTime = createdTime;
4242
}
4343

44-
/** @return {@link Subscription.Builder} */
44+
/**
45+
* @return {@link Subscription.Builder}
46+
*/
4547
public static Builder newBuilder() {
4648
return new Builder();
4749
}

client/src/main/java/io/hstream/impl/ConsumerBuilderImpl.java

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22

33
import static com.google.common.base.Preconditions.checkArgument;
44

5-
import io.hstream.*;
6-
5+
import io.hstream.BatchReceiver;
6+
import io.hstream.Consumer;
7+
import io.hstream.ConsumerBuilder;
8+
import io.hstream.HRecordReceiver;
9+
import io.hstream.RawRecordReceiver;
710
import java.util.UUID;
811

912
public class ConsumerBuilderImpl implements ConsumerBuilder {
@@ -77,6 +80,13 @@ public Consumer build() {
7780
ackBufferSize = 1;
7881
}
7982
return new ConsumerKtImpl(
80-
client, name, subscription, rawRecordReceiver, hRecordReceiver, batchReceiver, ackBufferSize, ackAgeLimit);
83+
client,
84+
name,
85+
subscription,
86+
rawRecordReceiver,
87+
hRecordReceiver,
88+
batchReceiver,
89+
ackBufferSize,
90+
ackAgeLimit);
8191
}
8292
}

0 commit comments

Comments
 (0)