Skip to content

Commit 0e1bdb9

Browse files
committed
rollback forced typing leftovers
1 parent e802bf1 commit 0e1bdb9

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

api/src/main/java/io/kafbat/ui/service/TopicsService.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import io.kafbat.ui.model.InternalLogDirStats;
1414
import io.kafbat.ui.model.InternalPartition;
1515
import io.kafbat.ui.model.InternalPartitionsOffsets;
16-
import io.kafbat.ui.model.InternalPartitionsOffsets.Offsets;
1716
import io.kafbat.ui.model.InternalReplica;
1817
import io.kafbat.ui.model.InternalTopic;
1918
import io.kafbat.ui.model.InternalTopicConfig;
@@ -144,11 +143,13 @@ private Mono<InternalPartitionsOffsets> getPartitionOffsets(Map<String, TopicDes
144143
var descriptions = descriptionsMap.values();
145144
return ac.listOffsets(descriptions, OffsetSpec.earliest())
146145
.zipWith(ac.listOffsets(descriptions, OffsetSpec.latest()),
147-
(earliest, latest) -> (Map<TopicPartition, Offsets>) Sets.intersection(earliest.keySet(), latest.keySet())
146+
(earliest, latest) ->
147+
Sets.intersection(earliest.keySet(), latest.keySet())
148148
.stream()
149-
.map(tp -> Map.entry(tp,
150-
new InternalPartitionsOffsets.Offsets(
151-
earliest.get(tp), latest.get(tp))))
149+
.map(tp ->
150+
Map.entry(tp,
151+
new InternalPartitionsOffsets.Offsets(
152+
earliest.get(tp), latest.get(tp))))
152153
.collect(toMap(Map.Entry::getKey, Map.Entry::getValue)))
153154
.map(InternalPartitionsOffsets::new);
154155
}

api/src/main/java/io/kafbat/ui/service/audit/AuditService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,11 @@ private Mono<AuthenticatedUser> extractUser(Signal<?> sig) {
181181

182182
return sig.getContextView().<Mono<SecurityContext>>get(key)
183183
.map(context -> context.getAuthentication().getPrincipal())
184-
.map(AuditService::extractUserFromObject)
184+
.map(AuditService::extractUser)
185185
.switchIfEmpty(Mono.just(UNKNOWN_USER));
186186
}
187187

188-
private static AuthenticatedUser extractUserFromObject(Object principal) {
188+
private static AuthenticatedUser extractUser(Object principal) {
189189
if (principal instanceof UserDetails u) {
190190
return new AuthenticatedUser(u.getUsername(), Set.of());
191191
} else if (principal instanceof AuthenticatedPrincipal p) {

0 commit comments

Comments
 (0)