Skip to content

Commit 91beb6d

Browse files
committed
BE: Chore: Cleanup api module
1 parent 5a40117 commit 91beb6d

35 files changed

+97
-291
lines changed

api/src/main/java/io/kafbat/ui/client/RetryingKafkaConnectClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import io.kafbat.ui.connect.model.ConnectorTopics;
1313
import io.kafbat.ui.connect.model.NewConnector;
1414
import io.kafbat.ui.connect.model.TaskStatus;
15-
import io.kafbat.ui.exception.KafkaConnectConflictReponseException;
15+
import io.kafbat.ui.exception.KafkaConnectConflictResponseException;
1616
import io.kafbat.ui.exception.ValidationException;
1717
import io.kafbat.ui.util.WebClientConfigurator;
1818
import jakarta.validation.constraints.NotNull;
@@ -48,7 +48,7 @@ private static Retry conflictCodeRetry() {
4848
.fixedDelay(MAX_RETRIES, RETRIES_DELAY)
4949
.filter(e -> e instanceof WebClientResponseException.Conflict)
5050
.onRetryExhaustedThrow((spec, signal) ->
51-
new KafkaConnectConflictReponseException(
51+
new KafkaConnectConflictResponseException(
5252
(WebClientResponseException.Conflict) signal.failure()));
5353
}
5454

api/src/main/java/io/kafbat/ui/config/auth/BasicAuthSecurityConfig.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package io.kafbat.ui.config.auth;
22

3-
import io.kafbat.ui.util.EmptyRedirectStrategy;
43
import io.kafbat.ui.util.StaticFileWebFilter;
5-
import java.net.URI;
64
import lombok.extern.slf4j.Slf4j;
75
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
86
import org.springframework.context.annotation.Bean;
@@ -12,8 +10,6 @@
1210
import org.springframework.security.config.web.server.SecurityWebFiltersOrder;
1311
import org.springframework.security.config.web.server.ServerHttpSecurity;
1412
import org.springframework.security.web.server.SecurityWebFilterChain;
15-
import org.springframework.security.web.server.authentication.RedirectServerAuthenticationSuccessHandler;
16-
import org.springframework.security.web.server.authentication.logout.RedirectServerLogoutSuccessHandler;
1713
import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatchers;
1814

1915
@Configuration

api/src/main/java/io/kafbat/ui/config/auth/logout/CognitoLogoutSuccessHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public Mono<Void> handle(WebFilterExchange exchange, Authentication authenticati
4040
requestUri.getPath(), requestUri.getQuery());
4141

4242
final UriComponents baseUrl = UriComponentsBuilder
43-
.fromHttpUrl(fullUrl)
43+
.fromUriString(fullUrl)
4444
.replacePath("/")
4545
.replaceQuery(null)
4646
.fragment(null)

api/src/main/java/io/kafbat/ui/emitter/OffsetsInfo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private Map<TopicPartition, Long> firstOffsetsForPolling(Consumer<?, ?> consumer
5353
Collection<TopicPartition> partitions) {
5454
try {
5555
// we try to use offsetsForTimes() to find earliest offsets, since for
56-
// some topics (like compacted) beginningOffsets() ruturning 0 offsets
56+
// some topics (like compacted) beginningOffsets() returning 0 offsets
5757
// even when effectively first offset can be very high
5858
var offsets = consumer.offsetsForTimes(
5959
partitions.stream().collect(Collectors.toMap(p -> p, p -> 0L))

api/src/main/java/io/kafbat/ui/emitter/ResultSizeLimiter.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

api/src/main/java/io/kafbat/ui/exception/CelException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.kafbat.ui.exception;
22

33
public class CelException extends CustomBaseException {
4-
private String celOriginalExpression;
4+
private final String celOriginalExpression;
55

66
public CelException(String celOriginalExpression, String errorMessage) {
77
super("CEL error. Original expression: %s. Error message: %s".formatted(celOriginalExpression, errorMessage));

api/src/main/java/io/kafbat/ui/exception/ConnectNotFoundException.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

api/src/main/java/io/kafbat/ui/exception/DuplicateEntityException.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

api/src/main/java/io/kafbat/ui/exception/ErrorCode.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,19 @@
44
import org.slf4j.LoggerFactory;
55
import org.springframework.http.HttpStatus;
66

7-
87
public enum ErrorCode {
98

10-
FORBIDDEN(403, HttpStatus.FORBIDDEN),
11-
129
UNEXPECTED(5000, HttpStatus.INTERNAL_SERVER_ERROR),
1310
KSQL_API_ERROR(5001, HttpStatus.INTERNAL_SERVER_ERROR),
1411
BINDING_FAIL(4001, HttpStatus.BAD_REQUEST),
1512
NOT_FOUND(404, HttpStatus.NOT_FOUND),
1613
VALIDATION_FAIL(4002, HttpStatus.BAD_REQUEST),
1714
READ_ONLY_MODE_ENABLE(4003, HttpStatus.METHOD_NOT_ALLOWED),
1815
CONNECT_CONFLICT_RESPONSE(4004, HttpStatus.CONFLICT),
19-
DUPLICATED_ENTITY(4005, HttpStatus.CONFLICT),
2016
UNPROCESSABLE_ENTITY(4006, HttpStatus.UNPROCESSABLE_ENTITY),
2117
CLUSTER_NOT_FOUND(4007, HttpStatus.NOT_FOUND),
2218
TOPIC_NOT_FOUND(4008, HttpStatus.NOT_FOUND),
2319
SCHEMA_NOT_FOUND(4009, HttpStatus.NOT_FOUND),
24-
CONNECT_NOT_FOUND(4010, HttpStatus.NOT_FOUND),
25-
KSQLDB_NOT_FOUND(4011, HttpStatus.NOT_FOUND),
2620
DIR_NOT_FOUND(4012, HttpStatus.BAD_REQUEST),
2721
TOPIC_OR_PARTITION_NOT_FOUND(4013, HttpStatus.BAD_REQUEST),
2822
INVALID_REQUEST(4014, HttpStatus.BAD_REQUEST),

api/src/main/java/io/kafbat/ui/exception/GlobalErrorWebExceptionHandler.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,7 @@ private Mono<ServerResponse> render(CustomBaseException baseException, ServerReq
102102

103103
private Mono<ServerResponse> render(WebExchangeBindException exception, ServerRequest request) {
104104
Map<String, Set<String>> fieldErrorsMap = exception.getFieldErrors().stream()
105-
.collect(Collectors
106-
.toMap(FieldError::getField, f -> Set.of(extractFieldErrorMsg(f)), Sets::union));
105+
.collect(Collectors.toMap(FieldError::getField, f -> Set.of(extractFieldErrorMsg(f)), Sets::union));
107106

108107
var fieldsErrors = fieldErrorsMap.entrySet().stream()
109108
.map(e -> {
@@ -151,9 +150,7 @@ private String requestId(ServerRequest request) {
151150
}
152151

153152
private Consumer<HttpHeaders> headers(ServerRequest request) {
154-
return (HttpHeaders headers) -> {
155-
CorsGlobalConfiguration.fillCorsHeader(headers, request.exchange().getRequest());
156-
};
153+
return (HttpHeaders headers) -> CorsGlobalConfiguration.fillCorsHeader(headers, request.exchange().getRequest());
157154
}
158155

159156
private BigDecimal currentTimestamp() {

0 commit comments

Comments
 (0)