Skip to content

Commit 17eece3

Browse files
author
Daniil Zulin
committed
Fix checkstyle
1 parent ea50c50 commit 17eece3

15 files changed

+93
-30
lines changed

‎topic/src/main/java/tech/ydb/topic/description/Consumer.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,9 @@ public Consumer build() {
144144

145145
@Override
146146
public boolean equals(Object o) {
147-
if (o == null || getClass() != o.getClass()) return false;
147+
if (o == null || getClass() != o.getClass()) {
148+
return false;
149+
}
148150
Consumer consumer = (Consumer) o;
149151
return important == consumer.important &&
150152
Objects.equals(name, consumer.name) &&

‎topic/src/main/java/tech/ydb/topic/description/ConsumerDescription.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ public List<ConsumerPartitionInfo> getPartitions() {
3232

3333
@Override
3434
public boolean equals(Object o) {
35-
if (o == null || getClass() != o.getClass()) return false;
35+
if (o == null || getClass() != o.getClass()) {
36+
return false;
37+
}
3638
ConsumerDescription that = (ConsumerDescription) o;
3739
return Objects.equals(consumer, that.consumer) && Objects.equals(partitions, that.partitions);
3840
}

‎topic/src/main/java/tech/ydb/topic/description/ConsumerPartitionInfo.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,9 @@ public int getConnectionNodeId() {
182182

183183
@Override
184184
public boolean equals(Object o) {
185-
if (o == null || getClass() != o.getClass()) return false;
185+
if (o == null || getClass() != o.getClass()) {
186+
return false;
187+
}
186188
ConsumerPartitionInfo that = (ConsumerPartitionInfo) o;
187189
return partitionId == that.partitionId &&
188190
active == that.active &&
@@ -195,6 +197,14 @@ public boolean equals(Object o) {
195197

196198
@Override
197199
public int hashCode() {
198-
return Objects.hash(partitionId, active, childPartitionIds, parentPartitionIds, partitionStats, consumerStats, location);
200+
return Objects.hash(
201+
partitionId,
202+
active,
203+
childPartitionIds,
204+
parentPartitionIds,
205+
partitionStats,
206+
consumerStats,
207+
location
208+
);
199209
}
200210
}

‎topic/src/main/java/tech/ydb/topic/description/MultipleWindowsStat.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package tech.ydb.topic.description;
22

3-
import tech.ydb.proto.topic.YdbTopic;
4-
53
import java.util.Objects;
64

5+
import tech.ydb.proto.topic.YdbTopic;
6+
77
/**
88
* @author Nikolay Perfilov
99
*/
@@ -38,7 +38,9 @@ public long getPerDay() {
3838

3939
@Override
4040
public boolean equals(Object o) {
41-
if (o == null || getClass() != o.getClass()) return false;
41+
if (o == null || getClass() != o.getClass()) {
42+
return false;
43+
}
4244
MultipleWindowsStat that = (MultipleWindowsStat) o;
4345
return perMinute == that.perMinute && perHour == that.perHour && perDay == that.perDay;
4446
}

‎topic/src/main/java/tech/ydb/topic/description/PartitionInfo.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@ public PartitionInfo build() {
9090

9191
@Override
9292
public boolean equals(Object o) {
93-
if (o == null || getClass() != o.getClass()) return false;
93+
if (o == null || getClass() != o.getClass()) {
94+
return false;
95+
}
9496
PartitionInfo that = (PartitionInfo) o;
9597
return partitionId == that.partitionId &&
9698
active == that.active &&

‎topic/src/main/java/tech/ydb/topic/description/PartitionStats.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,9 @@ public PartitionStats build() {
130130

131131
@Override
132132
public boolean equals(Object o) {
133-
if (o == null || getClass() != o.getClass()) return false;
133+
if (o == null || getClass() != o.getClass()) {
134+
return false;
135+
}
134136
PartitionStats that = (PartitionStats) o;
135137
return storeSizeBytes == that.storeSizeBytes &&
136138
partitionNodeId == that.partitionNodeId &&
@@ -142,6 +144,13 @@ public boolean equals(Object o) {
142144

143145
@Override
144146
public int hashCode() {
145-
return Objects.hash(partitionOffsets, storeSizeBytes, lastWriteTime, maxWriteTimeLag, bytesWritten, partitionNodeId);
147+
return Objects.hash(
148+
partitionOffsets,
149+
storeSizeBytes,
150+
lastWriteTime,
151+
maxWriteTimeLag,
152+
bytesWritten,
153+
partitionNodeId
154+
);
146155
}
147156
}

‎topic/src/main/java/tech/ydb/topic/description/SupportedCodecs.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ public SupportedCodecs build() {
5151

5252
@Override
5353
public boolean equals(Object o) {
54-
if (o == null || getClass() != o.getClass()) return false;
54+
if (o == null || getClass() != o.getClass()) {
55+
return false;
56+
}
5557
SupportedCodecs that = (SupportedCodecs) o;
5658
return Objects.equals(codecs, that.codecs);
5759
}

‎topic/src/main/java/tech/ydb/topic/description/TopicDescription.java‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,9 @@ public TopicDescription build() {
183183

184184
@Override
185185
public boolean equals(Object o) {
186-
if (o == null || getClass() != o.getClass()) return false;
186+
if (o == null || getClass() != o.getClass()) {
187+
return false;
188+
}
187189
TopicDescription that = (TopicDescription) o;
188190
return retentionStorageMb == that.retentionStorageMb &&
189191
partitionWriteSpeedBytesPerSecond == that.partitionWriteSpeedBytesPerSecond &&
@@ -200,6 +202,18 @@ public boolean equals(Object o) {
200202

201203
@Override
202204
public int hashCode() {
203-
return Objects.hash(partitioningSettings, partitions, retentionPeriod, retentionStorageMb, supportedCodecs, partitionWriteSpeedBytesPerSecond, partitionWriteBurstBytes, attributes, consumers, meteringMode, topicStats);
205+
return Objects.hash(
206+
partitioningSettings,
207+
partitions,
208+
retentionPeriod,
209+
retentionStorageMb,
210+
supportedCodecs,
211+
partitionWriteSpeedBytesPerSecond,
212+
partitionWriteBurstBytes,
213+
attributes,
214+
consumers,
215+
meteringMode,
216+
topicStats
217+
);
204218
}
205219
}

‎topic/src/main/java/tech/ydb/topic/description/TopicStats.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ public TopicStats build() {
8080

8181
@Override
8282
public boolean equals(Object o) {
83-
if (o == null || getClass() != o.getClass()) return false;
83+
if (o == null || getClass() != o.getClass()) {
84+
return false;
85+
}
8486
TopicStats that = (TopicStats) o;
8587
return storeSizeBytes == that.storeSizeBytes &&
8688
Objects.equals(minLastWriteTime, that.minLastWriteTime) &&

‎topic/src/main/java/tech/ydb/topic/impl/TopicClientImpl.java‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,15 @@ public CompletableFuture<Status> createTopic(String path, CreateTopicSettings se
111111
.setAutoPartitioningSettings(YdbTopic.AutoPartitioningSettings.newBuilder()
112112
.setStrategy(partitioningSettings.getAutoPartitioningStrategy().getProtoReference())));
113113

114-
AutoPartitioningWriteStrategySettings writeStrategySettings = partitioningSettings.getWriteStrategySettings();
114+
AutoPartitioningWriteStrategySettings writeStrategySettings = partitioningSettings
115+
.getWriteStrategySettings();
116+
115117
if (writeStrategySettings != null) {
116118
requestBuilder.getPartitioningSettingsBuilder().getAutoPartitioningSettingsBuilder()
117119
.setPartitionWriteSpeed(YdbTopic.AutoPartitioningWriteSpeedStrategy.newBuilder()
118-
.setStabilizationWindow(ProtobufUtils.durationToProto(writeStrategySettings.getStabilizationWindow()))
120+
.setStabilizationWindow(ProtobufUtils.durationToProto(
121+
writeStrategySettings.getStabilizationWindow()
122+
))
119123
.setDownUtilizationPercent(writeStrategySettings.getDownUtilizationPercent())
120124
.setUpUtilizationPercent(writeStrategySettings.getUpUtilizationPercent())
121125
);
@@ -162,9 +166,11 @@ public CompletableFuture<Status> alterTopic(String path, AlterTopicSettings sett
162166
}
163167
AutoPartitioningStrategy autoPartitioningStrategy = partitioningSettings.getAutoPartitioningStrategy();
164168
if (autoPartitioningStrategy != null) {
165-
builder.getAlterAutoPartitioningSettingsBuilder().setSetStrategy(autoPartitioningStrategy.getProtoReference());
169+
YdbTopic.AutoPartitioningStrategy protoReference = autoPartitioningStrategy.getProtoReference();
170+
builder.getAlterAutoPartitioningSettingsBuilder().setSetStrategy(protoReference);
166171
}
167-
AlterAutoPartitioningWriteStrategySettings writeStrategySettings = partitioningSettings.getWriteStrategySettings();
172+
AlterAutoPartitioningWriteStrategySettings writeStrategySettings = partitioningSettings
173+
.getWriteStrategySettings();
168174
if (writeStrategySettings != null) {
169175
Duration stabilizationWindow = writeStrategySettings.getStabilizationWindow();
170176
if (stabilizationWindow != null) {
@@ -310,14 +316,20 @@ private TopicDescription mapDescribeTopic(YdbTopic.DescribeTopicResult result) {
310316
.setMeteringMode(fromProto(result.getMeteringMode()));
311317

312318
YdbTopic.PartitioningSettings partitioningSettings = result.getPartitioningSettings();
319+
YdbTopic.AutoPartitioningSettings autoPartitioningSettings = partitioningSettings.getAutoPartitioningSettings();
320+
YdbTopic.AutoPartitioningStrategy autoPartitioningStrategy = autoPartitioningSettings.getStrategy();
321+
313322
PartitioningSettings.Builder partitioningDescription = PartitioningSettings.newBuilder()
314323
.setMinActivePartitions(partitioningSettings.getMinActivePartitions())
315324
.setPartitionCountLimit(partitioningSettings.getPartitionCountLimit())
316-
.setAutoPartitioningStrategy(AutoPartitioningStrategy.fromProto(partitioningSettings.getAutoPartitioningSettings().getStrategy()));
325+
.setAutoPartitioningStrategy(AutoPartitioningStrategy.fromProto(autoPartitioningStrategy));
317326

318-
YdbTopic.AutoPartitioningWriteSpeedStrategy partitionWriteSpeed = partitioningSettings.getAutoPartitioningSettings().getPartitionWriteSpeed();
327+
YdbTopic.AutoPartitioningWriteSpeedStrategy partitionWriteSpeed = autoPartitioningSettings
328+
.getPartitionWriteSpeed();
319329
partitioningDescription.setWriteStrategySettings(AutoPartitioningWriteStrategySettings.newBuilder()
320-
.setStabilizationWindow(ProtobufUtils.protoToDuration(partitionWriteSpeed.getStabilizationWindow()))
330+
.setStabilizationWindow(ProtobufUtils.protoToDuration(
331+
partitionWriteSpeed.getStabilizationWindow()
332+
))
321333
.setUpUtilizationPercent(partitionWriteSpeed.getUpUtilizationPercent())
322334
.setDownUtilizationPercent(partitionWriteSpeed.getDownUtilizationPercent())
323335
.build());

0 commit comments

Comments
 (0)