Add Confluent schema url from dev service, split Apicurio vs Confluen…

…t support.
quarkusio · Apr 7, 2022 · 83a7107 · 83a7107
1 parent 3947967
commit 83a7107
Show file tree

Hide file tree

Showing 52 changed files with 1,108 additions and 271 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -1208,6 +1208,26 @@
                 <artifactId>quarkus-avro-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-apicurio-registry-devservice</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-apicurio-registry-devservice-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-apicurio-registry-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-apicurio-registry-common-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-apicurio-registry-avro</artifactId>
@@ -1218,6 +1238,26 @@
                 <artifactId>quarkus-apicurio-registry-avro-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-apicurio-registry-confluent-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-apicurio-registry-confluent-common-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-apicurio-registry-confluent-avro</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-apicurio-registry-confluent-avro-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-smallrye-health</artifactId>
@@ -3071,6 +3111,11 @@
                 <artifactId>agroal-pool</artifactId>
                 <version>${agroal.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.apicurio</groupId>
+                <artifactId>apicurio-registry-client</artifactId>
+                <version>${apicurio-registry.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.apicurio</groupId>
                 <artifactId>apicurio-registry-serdes-avro-serde</artifactId>

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/Capability.java b/core/deployment/src/main/java/io/quarkus/deployment/Capability.java
@@ -121,4 +121,5 @@ public interface Capability {
 
     String APICURIO_REGISTRY = QUARKUS_PREFIX + "apicurio.registry";
     String APICURIO_REGISTRY_AVRO = APICURIO_REGISTRY + ".avro";
+    String CONFLUENT_REGISTRY_AVRO = APICURIO_REGISTRY + ".confluent.avro";
 }
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/Feature.java b/core/deployment/src/main/java/io/quarkus/deployment/Feature.java
@@ -12,6 +12,7 @@ public enum Feature {
     AGROAL,
     AMAZON_LAMBDA,
     APICURIO_REGISTRY_AVRO,
+    CONFLUENT_REGISTRY_AVRO,
     AWT,
     CACHE,
     CDI,

diff --git a/devtools/bom-descriptor-json/pom.xml b/devtools/bom-descriptor-json/pom.xml
@@ -201,6 +201,19 @@
                         </exclusion>
                     </exclusions>
                 </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-apicurio-registry-confluent-avro</artifactId>
+                    <version>${project.version}</version>
+                    <type>pom</type>
+                    <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
                 <dependency>
                     <groupId>io.quarkus</groupId>
                     <artifactId>quarkus-arc</artifactId>

diff --git a/docs/pom.xml b/docs/pom.xml
@@ -161,6 +161,19 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-apicurio-registry-confluent-avro-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-arc-deployment</artifactId>

diff --git a/docs/src/main/asciidoc/apicurio-registry-dev-services.adoc b/docs/src/main/asciidoc/apicurio-registry-dev-services.adoc
@@ -28,6 +28,14 @@ You can configure the registry URL for all Kafka channels in SmallRye Reactive M
 mp.messaging.connector.smallrye-kafka.apicurio.registry.url=http://localhost:8081/apis/registry/v2
 ----
 
+NOTE: if `Confluent` Serde classes are present on the app's classpath,
+Apicuiro Registry's Confluent-compatible registry url is used / set by Dev Services for Apicurio Registry by default:
+
+[source,properties]
+----
+mp.messaging.connector.smallrye-kafka.apicurio.registry.url=http://localhost:8081/apis/ccompat/v6
+----
+
 == Shared registry
 
 Most of the time you need to share the registry between applications.

diff --git a/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc b/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc
@@ -8,7 +8,7 @@ https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc
 include::./attributes.adoc[]
 
 This guide shows how your Quarkus application can use Apache Kafka, http://avro.apache.org/docs/current/[Avro] serialized
-records, and connect to a schema registry (such as the https://docs.confluent.io/platform/current/schema-registry/index.html[Confluent Schema Registry] or https://www.apicur.io/registry/[Apicurio Registry].
+records, and connect to a schema registry (such as the https://docs.confluent.io/platform/current/schema-registry/index.html[Confluent Schema Registry] or https://www.apicur.io/registry/[Apicurio Registry]).
 
 If you are not familiar with Kafka and Kafka in Quarkus in particular, consider
 first going through the xref:kafka.adoc[Using Apache Kafka with Reactive Messaging] guide.
@@ -311,6 +311,8 @@ See xref:kafka-dev-services.adoc[Dev Services for Kafka] and xref:apicurio-regis
 ====
 You might have noticed that we didn't configure the schema registry URL anywhere.
 This is because Dev Services for Apicurio Registry configures all Kafka channels in SmallRye Reactive Messaging to use the automatically started registry instance.
+If there are Confluent serde classes present on the classpath,
+the url used with Dev Services for Apicurio Registry is the Confluent-compatible one.
 
 There's no Dev Services support for Confluent Schema Registry.
 If you want to use a running instance of Confluent Schema Registry, configure its URL, together with the URL of a Kafka broker:

diff --git a/...apicurio-registry-avro/deployment/pom.xml → ...registry/apicurio/avro/deployment/pom.xml b/...apicurio-registry-avro/deployment/pom.xml → ...registry/apicurio/avro/deployment/pom.xml
@@ -14,6 +14,14 @@
     <name>Quarkus - Apicurio Registry - Avro - Deployment</name>
 
     <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-apicurio-registry-devservice-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-apicurio-registry-common-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-apicurio-registry-avro</artifactId>
@@ -28,10 +36,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-avro-deployment</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-deployment</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-smallrye-openapi-spi</artifactId>

diff --git a/...oyment/src/main/java/io/quarkus/apicurio/registry/avro/ApicurioRegistryAvroProcessor.java b/...oyment/src/main/java/io/quarkus/apicurio/registry/avro/ApicurioRegistryAvroProcessor.java
@@ -0,0 +1,45 @@
+package io.quarkus.apicurio.registry.avro;
+
+import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.annotations.BuildProducer;
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
+import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
+
+public class ApicurioRegistryAvroProcessor {
+    @BuildStep
+    FeatureBuildItem feature() {
+        return new FeatureBuildItem(Feature.APICURIO_REGISTRY_AVRO);
+    }
+
+    @BuildStep
+    public void apicurioRegistryAvro(BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+            BuildProducer<ExtensionSslNativeSupportBuildItem> sslNativeSupport) {
+
+        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false,
+                "io.apicurio.registry.serde.avro.AvroKafkaDeserializer",
+                "io.apicurio.registry.serde.avro.AvroKafkaSerializer"));
+
+        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, true,
+                "io.apicurio.registry.serde.strategy.SimpleTopicIdStrategy",
+                "io.apicurio.registry.serde.strategy.TopicIdStrategy",
+                "io.apicurio.registry.serde.avro.DefaultAvroDatumProvider",
+                "io.apicurio.registry.serde.avro.ReflectAvroDatumProvider",
+                "io.apicurio.registry.serde.avro.strategy.RecordIdStrategy",
+                "io.apicurio.registry.serde.avro.strategy.TopicRecordIdStrategy"));
+
+        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, true,
+                "io.apicurio.registry.serde.DefaultSchemaResolver",
+                "io.apicurio.registry.serde.DefaultIdHandler",
+                "io.apicurio.registry.serde.Legacy4ByteIdHandler",
+                "io.apicurio.registry.serde.fallback.DefaultFallbackArtifactProvider",
+                "io.apicurio.registry.serde.headers.DefaultHeadersHandler"));
+    }
+
+    @BuildStep
+    ExtensionSslNativeSupportBuildItem enableSslInNative() {
+        return new ExtensionSslNativeSupportBuildItem(Feature.APICURIO_REGISTRY_AVRO);
+    }
+
+}
diff --git a/extensions/apicurio-registry-avro/pom.xml → ...s/apicurio-registry/apicurio/avro/pom.xml b/extensions/apicurio-registry-avro/pom.xml → ...s/apicurio-registry/apicurio/avro/pom.xml
@@ -3,7 +3,7 @@
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
-      <artifactId>quarkus-extensions-parent</artifactId>
+      <artifactId>quarkus-apicurio-registry-apicurio-parent</artifactId>
       <groupId>io.quarkus</groupId>
       <version>999-SNAPSHOT</version>
       <relativePath>../pom.xml</relativePath>

diff --git a/...ns/apicurio-registry-avro/runtime/pom.xml → ...io-registry/apicurio/avro/runtime/pom.xml b/...ns/apicurio-registry-avro/runtime/pom.xml → ...io-registry/apicurio/avro/runtime/pom.xml
@@ -12,7 +12,7 @@
 
     <artifactId>quarkus-apicurio-registry-avro</artifactId>
     <name>Quarkus - Apicurio Registry - Avro - Runtime</name>
-    <description>Provide support for the Apicurio Registry Avro library</description>
+
     <dependencies>
         <dependency>
             <groupId>io.apicurio</groupId>
@@ -24,31 +24,13 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>io.apicurio</groupId>
-            <artifactId>apicurio-common-rest-client-vertx</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-kubernetes-service-binding</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-avro</artifactId>
+            <artifactId>quarkus-apicurio-registry-devservice</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
+            <artifactId>quarkus-apicurio-registry-common</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/...resources/META-INF/quarkus-extension.yaml → ...resources/META-INF/quarkus-extension.yaml b/...resources/META-INF/quarkus-extension.yaml → ...resources/META-INF/quarkus-extension.yaml
diff --git a/extensions/apicurio-registry/apicurio/common/deployment/pom.xml b/extensions/apicurio-registry/apicurio/common/deployment/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>quarkus-apicurio-registry-common-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>quarkus-apicurio-registry-common-deployment</artifactId>
+    <name>Quarkus - Apicurio Registry - Common Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-apicurio-registry-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-core-deployment</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-vertx-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-openapi-spi</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/...y/avro/ApicurioRegistryAvroProcessor.java → ...mmon/ApicurioRegistryClientProcessor.java b/...y/avro/ApicurioRegistryAvroProcessor.java → ...mmon/ApicurioRegistryClientProcessor.java
@@ -1,49 +1,23 @@
-package io.quarkus.apicurio.registry.avro;
+package io.quarkus.apicurio.registry.common;
 
 import java.io.IOException;
 
 import io.apicurio.rest.client.spi.ApicurioHttpClientProvider;
-import io.quarkus.deployment.Feature;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem;
-import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
 import io.quarkus.smallrye.openapi.deployment.spi.IgnoreStaticDocumentBuildItem;
 import io.quarkus.vertx.deployment.VertxBuildItem;
 
-public class ApicurioRegistryAvroProcessor {
-    @BuildStep
-    FeatureBuildItem feature() {
-        return new FeatureBuildItem(Feature.APICURIO_REGISTRY_AVRO);
-    }
+public class ApicurioRegistryClientProcessor {
 
     @BuildStep
-    public void apicurioRegistryAvro(BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
+    public void apicurioRegistryClient(BuildProducer<ReflectiveClassBuildItem> reflectiveClass,
             BuildProducer<ExtensionSslNativeSupportBuildItem> sslNativeSupport) {
-
-        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, false,
-                "io.apicurio.registry.serde.avro.AvroKafkaDeserializer",
-                "io.apicurio.registry.serde.avro.AvroKafkaSerializer"));
-
-        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, true,
-                "io.apicurio.registry.serde.strategy.SimpleTopicIdStrategy",
-                "io.apicurio.registry.serde.strategy.TopicIdStrategy",
-                "io.apicurio.registry.serde.avro.DefaultAvroDatumProvider",
-                "io.apicurio.registry.serde.avro.ReflectAvroDatumProvider",
-                "io.apicurio.registry.serde.avro.strategy.RecordIdStrategy",
-                "io.apicurio.registry.serde.avro.strategy.TopicRecordIdStrategy"));
-
-        reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, true,
-                "io.apicurio.registry.serde.DefaultSchemaResolver",
-                "io.apicurio.registry.serde.DefaultIdHandler",
-                "io.apicurio.registry.serde.Legacy4ByteIdHandler",
-                "io.apicurio.registry.serde.fallback.DefaultFallbackArtifactProvider",
-                "io.apicurio.registry.serde.headers.DefaultHeadersHandler"));
-
         reflectiveClass.produce(new ReflectiveClassBuildItem(true, true, true,
                 "io.apicurio.rest.client.auth.exception.NotAuthorizedException",
                 "io.apicurio.rest.client.auth.exception.ForbiddenException",
@@ -78,9 +52,4 @@ public void apicurioRegistryClient(VertxBuildItem vertx, ApicurioRegistryClient
         client.setup(vertx.getVertx());
     }
 
-    @BuildStep
-    ExtensionSslNativeSupportBuildItem enableSslInNative() {
-        return new ExtensionSslNativeSupportBuildItem(Feature.APICURIO_REGISTRY_AVRO);
-    }
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,6 +12,7 @@ public enum Feature { @@
         AGROAL,
         AMAZON_LAMBDA,
         APICURIO_REGISTRY_AVRO,
+        CONFLUENT_REGISTRY_AVRO,
         AWT,
         CACHE,
         CDI,
@@ Expand Down @@