0ct0pu5/kafka-ui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve exception message about schema registry back compatibility

Browse source 
* [ISSUE-1250] Introduced new exception for attempt at creating new PROTOBUF/JSON schemas via a deprecated version of Schema Registry.

* [issue-1250] fixed formatting

* [ISSUE-1250] updated exception message
This commit is contained in:
ValentinPrischepa 2021-12-22 23:43:10 -08:00 • committed by GitHub
parent e34520f6e9
commit 49285bee9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kafka-ui-api/src/main/java/com/provectus/kafka/ui/exception/SchemaTypeIsNotSupportedException.java Normal file
View file

@ -0,0 +1,12 @@
package com.provectus.kafka.ui.exception;
public class SchemaTypeIsNotSupportedException extends UnprocessableEntityException {
private static final String REQUIRED_SCHEMA_REGISTRY_VERSION = "5.5.0";
public SchemaTypeIsNotSupportedException() {
super(String.format("Current version of Schema Registry does "
+ "not support provided schema type,"
+ " version %s or later is required here.", REQUIRED_SCHEMA_REGISTRY_VERSION));
}
}

15
kafka-ui-api/src/main/java/com/provectus/kafka/ui/service/SchemaRegistryService.java
View file

@ -5,6 +5,7 @@ import static org.springframework.http.HttpStatus.UNPROCESSABLE_ENTITY;
import com.provectus.kafka.ui.exception.DuplicateEntityException; import com.provectus.kafka.ui.exception.DuplicateEntityException;
import com.provectus.kafka.ui.exception.SchemaNotFoundException; import com.provectus.kafka.ui.exception.SchemaNotFoundException;
import com.provectus.kafka.ui.exception.SchemaTypeIsNotSupportedException;
import com.provectus.kafka.ui.exception.UnprocessableEntityException; import com.provectus.kafka.ui.exception.UnprocessableEntityException;
import com.provectus.kafka.ui.exception.ValidationException; import com.provectus.kafka.ui.exception.ValidationException;
import com.provectus.kafka.ui.mapper.ClusterMapper; import com.provectus.kafka.ui.mapper.ClusterMapper;
@ -51,6 +52,8 @@ public class SchemaRegistryService {
private static final String URL_SUBJECT_BY_VERSION = "/subjects/{schemaName}/versions/{version}"; private static final String URL_SUBJECT_BY_VERSION = "/subjects/{schemaName}/versions/{version}";
private static final String LATEST = "latest"; private static final String LATEST = "latest";
private static final String UNRECOGNIZED_FIELD_SCHEMA_TYPE = "Unrecognized field: schemaType";
private final ClusterMapper mapper; private final ClusterMapper mapper;
private final WebClient webClient; private final WebClient webClient;
@ -195,7 +198,9 @@ public class SchemaRegistryService {
.retrieve() .retrieve()
.onStatus(UNPROCESSABLE_ENTITY::equals, .onStatus(UNPROCESSABLE_ENTITY::equals,
r -> r.bodyToMono(ErrorResponse.class) r -> r.bodyToMono(ErrorResponse.class)
.flatMap(x -> Mono.error(new UnprocessableEntityException(x.getMessage())))) .flatMap(x -> Mono.error(isUnrecognizedFieldSchemaTypeMessage(x.getMessage())
? new SchemaTypeIsNotSupportedException()
: new UnprocessableEntityException(x.getMessage()))))
.bodyToMono(SubjectIdResponse.class); .bodyToMono(SubjectIdResponse.class);
} }
@ -213,7 +218,9 @@ public class SchemaRegistryService {
.onStatus(NOT_FOUND::equals, res -> Mono.empty()) .onStatus(NOT_FOUND::equals, res -> Mono.empty())
.onStatus(UNPROCESSABLE_ENTITY::equals, .onStatus(UNPROCESSABLE_ENTITY::equals,
r -> r.bodyToMono(ErrorResponse.class) r -> r.bodyToMono(ErrorResponse.class)
.flatMap(x -> Mono.error(new UnprocessableEntityException(x.getMessage())))) .flatMap(x -> Mono.error(isUnrecognizedFieldSchemaTypeMessage(x.getMessage())
? new SchemaTypeIsNotSupportedException()
: new UnprocessableEntityException(x.getMessage()))))
.bodyToMono(SchemaSubjectDTO.class) .bodyToMono(SchemaSubjectDTO.class)
.filter(s -> Objects.isNull(s.getId())) .filter(s -> Objects.isNull(s.getId()))
.switchIfEmpty(Mono.error(new DuplicateEntityException("Such schema already exists"))); .switchIfEmpty(Mono.error(new DuplicateEntityException("Such schema already exists")));
@ -321,4 +328,8 @@ public class SchemaRegistryService {
.uri(schemaRegistry.getFirstUrl() + uri, params) .uri(schemaRegistry.getFirstUrl() + uri, params)
.headers(headers -> setBasicAuthIfEnabled(schemaRegistry, headers)); .headers(headers -> setBasicAuthIfEnabled(schemaRegistry, headers));
} }
private boolean isUnrecognizedFieldSchemaTypeMessage(String errorMessage) {
return errorMessage.contains(UNRECOGNIZED_FIELD_SCHEMA_TYPE);
}
} }