Skip to content

Commit e52d6cc

Browse files
committed
Merge branch 'fix/type-casting-errors' into feature/reset-connector-offsets
2 parents 67599c1 + 2aebcf6 commit e52d6cc

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
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;
1617
import io.kafbat.ui.model.InternalReplica;
1718
import io.kafbat.ui.model.InternalTopic;
1819
import io.kafbat.ui.model.InternalTopicConfig;
@@ -143,14 +144,12 @@ private Mono<InternalPartitionsOffsets> getPartitionOffsets(Map<String, TopicDes
143144
var descriptions = descriptionsMap.values();
144145
return ac.listOffsets(descriptions, OffsetSpec.earliest())
145146
.zipWith(ac.listOffsets(descriptions, OffsetSpec.latest()),
146-
(earliest, latest) ->
147-
Sets.intersection(earliest.keySet(), latest.keySet())
148-
.stream()
149-
.map(tp ->
150-
Map.entry(tp,
151-
new InternalPartitionsOffsets.Offsets(
152-
earliest.get(tp), latest.get(tp))))
153-
.collect(toMap(Map.Entry::getKey, Map.Entry::getValue)))
147+
(earliest, latest) -> (Map<TopicPartition, Offsets>) Sets.intersection(earliest.keySet(), latest.keySet())
148+
.stream()
149+
.map(tp -> Map.entry(tp,
150+
new InternalPartitionsOffsets.Offsets(
151+
earliest.get(tp), latest.get(tp))))
152+
.collect(toMap(Map.Entry::getKey, Map.Entry::getValue)))
154153
.map(InternalPartitionsOffsets::new);
155154
}
156155

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::extractUser)
184+
.map(AuditService::extractUserFromObject)
185185
.switchIfEmpty(Mono.just(UNKNOWN_USER));
186186
}
187187

188-
private static AuthenticatedUser extractUser(Object principal) {
188+
private static AuthenticatedUser extractUserFromObject(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)