alexey.rassokhin/tet123
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

DBZ-4790 Cleanup of apicurio related class names

Browse Source
This commit is contained in:
jcechace 2022-03-08 12:52:55 +01:00 committed by Jiri Pechanec
parent a5c7ada379
commit 48b94c5d83
5 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debezium-testing/debezium-testing-system/src/main/java/io/debezium/testing/system/tools/kafka/ConnectorConfigBuilder.java
View File

@ -46,7 +46,7 @@ public Map<String, Object> get() {
return config;
}
public ConnectorConfigBuilder addApicurioV2AvroSupport(String apicurioUrl) {
public ConnectorConfigBuilder addApicurioAvroSupport(String apicurioUrl) {
config.put("key.converter", "io.apicurio.registry.utils.converter.AvroConverter");
config.put("key.converter.apicurio.registry.url", apicurioUrl);
config.put("key.converter.apicurio.registry.auto-register", true);

8
debezium-testing/debezium-testing-system/src/main/java/io/debezium/testing/system/tools/registry/OcpApicurioV2Controller.java → debezium-testing/debezium-testing-system/src/main/java/io/debezium/testing/system/tools/registry/OcpApicurioController.java
View File

@ -31,18 +31,18 @@
* This class provides control over Apicurio registry instance deployed in OpenShift
* @author Jakub Cechacek
*/
public class OcpApicurioV2Controller extends AbstractOcpApicurioController implements RegistryController {
public class OcpApicurioController extends AbstractOcpApicurioController implements RegistryController {
public static final String APICURIO_CRD_DESCRIPTOR = "/crd/v1/apicurioregistries_crd.yaml";
private static final Logger LOGGER = LoggerFactory.getLogger(OcpApicurioV2Controller.class);
private static final Logger LOGGER = LoggerFactory.getLogger(OcpApicurioController.class);
public OcpApicurioV2Controller(ApicurioRegistry registry, OpenShiftClient ocp, OkHttpClient http) {
public OcpApicurioController(ApicurioRegistry registry, OpenShiftClient ocp, OkHttpClient http) {
super(registry, ocp, http);
}
@Override
protected NonNamespaceOperation<ApicurioRegistry, ApicurioRegistryList, Resource<ApicurioRegistry>> registryOperation() {
CustomResourceDefinition crd = ocp.apiextensions().v1().customResourceDefinitions()
.load(OcpApicurioV2Controller.class.getResourceAsStream(APICURIO_CRD_DESCRIPTOR))
.load(OcpApicurioController.class.getResourceAsStream(APICURIO_CRD_DESCRIPTOR))
.get();
CustomResourceDefinitionContext context = CustomResourceDefinitionContext.fromCrd(crd);
return ocp.customResources(context, ApicurioRegistry.class, ApicurioRegistryList.class).inNamespace(project);

18
debezium-testing/debezium-testing-system/src/main/java/io/debezium/testing/system/tools/registry/OcpApicurioV2Deployer.java → debezium-testing/debezium-testing-system/src/main/java/io/debezium/testing/system/tools/registry/OcpApicurioDeployer.java
View File

@ -22,11 +22,11 @@
* Deployment management for Apicurio service registry OCP deployment
* @author Jakub Cechacek
*/
public class OcpApicurioV2Deployer extends AbstractOcpApicurioDeployer<OcpApicurioV2Controller> {
private static final Logger LOGGER = LoggerFactory.getLogger(OcpApicurioV2Deployer.class);
public class OcpApicurioDeployer extends AbstractOcpApicurioDeployer<OcpApicurioController> {
private static final Logger LOGGER = LoggerFactory.getLogger(OcpApicurioDeployer.class);
public static final String APICURIO_CRD_DESCRIPTOR = "/crd/v1/apicurioregistries_crd.yaml";
private OcpApicurioV2Deployer(
private OcpApicurioDeployer(
String project,
String yamlPath,
OpenShiftClient ocp,
@ -36,22 +36,22 @@ private OcpApicurioV2Deployer(
protected NonNamespaceOperation<ApicurioRegistry, ApicurioRegistryList, Resource<ApicurioRegistry>> registryOperation() {
CustomResourceDefinition crd = ocp.apiextensions().v1().customResourceDefinitions()
.load(OcpApicurioV2Deployer.class.getResourceAsStream(APICURIO_CRD_DESCRIPTOR))
.load(OcpApicurioDeployer.class.getResourceAsStream(APICURIO_CRD_DESCRIPTOR))
.get();
CustomResourceDefinitionContext context = CustomResourceDefinitionContext.fromCrd(crd);
return ocp.customResources(context, ApicurioRegistry.class, ApicurioRegistryList.class).inNamespace(project);
}
@Override
protected OcpApicurioV2Controller getController(ApicurioRegistry registry) {
return new OcpApicurioV2Controller(registry, ocp, http);
protected OcpApicurioController getController(ApicurioRegistry registry) {
return new OcpApicurioController(registry, ocp, http);
}
public static class Builder extends AbstractOcpApicurioDeployer.RegistryBuilder<Builder, OcpApicurioV2Deployer> {
public static class Builder extends AbstractOcpApicurioDeployer.RegistryBuilder<Builder, OcpApicurioDeployer> {
@Override
public OcpApicurioV2Deployer build() {
return new OcpApicurioV2Deployer(
public OcpApicurioDeployer build() {
return new OcpApicurioDeployer(
project,
yamlPath,
ocpClient,

2
debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/registry/ApicurioAvroConnectorDecorator.java
View File

@ -17,6 +17,6 @@ default void decorateConnectorConfig(ConnectorConfigBuilder config) {
String registryApiAddress = getRegistryController()
.orElseThrow(() -> new IllegalStateException("No registry controller"))
.getRegistryApiAddress();
config.addApicurioV2AvroSupport(registryApiAddress);
config.addApicurioAvroSupport(registryApiAddress);
}
}

29
debezium-testing/debezium-testing-system/src/test/java/io/debezium/testing/system/fixtures/registry/OcpApicurio.java
View File

@ -10,8 +10,8 @@
import io.debezium.testing.system.fixtures.kafka.KafkaRuntimeFixture;
import io.debezium.testing.system.tools.ConfigProperties;
import io.debezium.testing.system.tools.registry.ApicurioOperatorController;
import io.debezium.testing.system.tools.registry.OcpApicurioV2Controller;
import io.debezium.testing.system.tools.registry.OcpApicurioV2Deployer;
import io.debezium.testing.system.tools.registry.OcpApicurioController;
import io.debezium.testing.system.tools.registry.OcpApicurioDeployer;
import io.fabric8.openshift.client.OpenShiftClient;
import okhttp3.OkHttpClient;
@ -20,12 +20,21 @@ public interface OcpApicurio
extends TestSetupFixture, RegistrySetupFixture, RegistryRuntimeFixture,
KafkaRuntimeFixture, OcpClient {
String REGISTRY_V2_DEPLOYMENT_PATH = "/registry-resources/v1/010-registry-kafkasql.yaml";
String REGISTRY_DEPLOYMENT_PATH = "/registry-resources/v1/010-registry-kafkasql.yaml";
@Override
default void setupRegistry() throws Exception {
updateApicurioOperator(ConfigProperties.OCP_PROJECT_REGISTRY, getOcpClient());
setupApicurioV2();
OcpApicurioDeployer deployer = new OcpApicurioDeployer.Builder()
.withOcpClient(getOcpClient())
.withHttpClient(new OkHttpClient())
.withProject(ConfigProperties.OCP_PROJECT_REGISTRY)
.withYamlPath(REGISTRY_DEPLOYMENT_PATH)
.build();
OcpApicurioController controller = deployer.deploy();
setRegistryController(controller);
}
default void updateApicurioOperator(String project, OpenShiftClient ocp) {
@ -41,16 +50,4 @@ default void teardownRegistry() {
// no-op
// Registry is reused across tests
}
default void setupApicurioV2() throws InterruptedException {
OcpApicurioV2Deployer deployer = new OcpApicurioV2Deployer.Builder()
.withOcpClient(getOcpClient())
.withHttpClient(new OkHttpClient())
.withProject(ConfigProperties.OCP_PROJECT_REGISTRY)
.withYamlPath(REGISTRY_V2_DEPLOYMENT_PATH)
.build();
OcpApicurioV2Controller controller = deployer.deploy();
setRegistryController(controller);
}
}