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

ISSUE-886 Schema registry multiple urls (#888)

Browse source
This commit is contained in:
German Osin 2021-09-17 11:35:34 +03:00 • committed by GitHub
parent 315b6ed6d5
commit 5e74bda56e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
kafka-ui-api/src/main/java/com/provectus/kafka/ui/mapper/ClusterMapper.java
View file

@ -33,6 +33,8 @@ import com.provectus.kafka.ui.model.schemaregistry.InternalCompatibilityCheck;
import com.provectus.kafka.ui.model.schemaregistry.InternalCompatibilityLevel; import com.provectus.kafka.ui.model.schemaregistry.InternalCompatibilityLevel;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Arrays;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
@ -101,7 +103,11 @@ public interface ClusterMapper {
InternalSchemaRegistry.InternalSchemaRegistryBuilder internalSchemaRegistry = InternalSchemaRegistry.InternalSchemaRegistryBuilder internalSchemaRegistry =
InternalSchemaRegistry.builder(); InternalSchemaRegistry.builder();
internalSchemaRegistry.url(clusterProperties.getSchemaRegistry()); internalSchemaRegistry.url(
clusterProperties.getSchemaRegistry() != null
? Arrays.asList(clusterProperties.getSchemaRegistry().split(","))
: Collections.emptyList()
);
if (clusterProperties.getSchemaRegistryAuth() != null) { if (clusterProperties.getSchemaRegistryAuth() != null) {
internalSchemaRegistry.username(clusterProperties.getSchemaRegistryAuth().getUsername()); internalSchemaRegistry.username(clusterProperties.getSchemaRegistryAuth().getUsername());

8
kafka-ui-api/src/main/java/com/provectus/kafka/ui/model/InternalSchemaRegistry.java
View file

@ -1,5 +1,6 @@
package com.provectus.kafka.ui.model; package com.provectus.kafka.ui.model;
import java.util.List;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -8,5 +9,10 @@ import lombok.Data;
public class InternalSchemaRegistry { public class InternalSchemaRegistry {
private final String username; private final String username;
private final String password; private final String password;
private final String url; private final List<String> url;
public String getFirstUrl() {
return url != null && !url.isEmpty() ? url.iterator().next() : null;
}
} }

4
kafka-ui-api/src/main/java/com/provectus/kafka/ui/serde/schemaregistry/SchemaRegistryAwareRecordSerDe.java
View file

@ -90,7 +90,7 @@ public class SchemaRegistryAwareRecordSerDe implements RecordSerDe {
"You specified password but do not specified username"); "You specified password but do not specified username");
} }
return new CachedSchemaRegistryClient( return new CachedSchemaRegistryClient(
Collections.singletonList(cluster.getSchemaRegistry().getUrl()), cluster.getSchemaRegistry().getUrl(),
CLIENT_IDENTITY_MAP_CAPACITY, CLIENT_IDENTITY_MAP_CAPACITY,
schemaProviders, schemaProviders,
configs configs
@ -218,7 +218,7 @@ public class SchemaRegistryAwareRecordSerDe implements RecordSerDe {
private String convertSchema(SchemaMetadata schema) { private String convertSchema(SchemaMetadata schema) {
String jsonSchema; String jsonSchema;
URI basePath = new URI(cluster.getSchemaRegistry().getUrl()) URI basePath = new URI(cluster.getSchemaRegistry().getFirstUrl())
.resolve(Integer.toString(schema.getId())); .resolve(Integer.toString(schema.getId()));
final ParsedSchema schemaById = Objects.requireNonNull(schemaRegistryClient) final ParsedSchema schemaById = Objects.requireNonNull(schemaRegistryClient)
.getSchemaById(schema.getId()); .getSchemaById(schema.getId());

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

@ -343,8 +343,9 @@ public class SchemaRegistryService {
private WebClient.RequestBodySpec configuredWebClient(InternalSchemaRegistry schemaRegistry, private WebClient.RequestBodySpec configuredWebClient(InternalSchemaRegistry schemaRegistry,
HttpMethod method, String uri, HttpMethod method, String uri,
Object... params) { Object... params) {
return webClient.method(method) return webClient
.uri(schemaRegistry.getUrl() + uri, params) .method(method)
.uri(schemaRegistry.getFirstUrl() + uri, params)
.headers(headers -> setBasicAuthIfEnabled(schemaRegistry, headers)); .headers(headers -> setBasicAuthIfEnabled(schemaRegistry, headers));
} }
} }