Align Postgres Debezium Extension for Quarkus with new SPI, agroal and test-suite [DBZ-9553]

quarkus-debezium-parent/quarkus-debezium-postgres-parent/deployment/pom.xml

@@ -30,8 +30,8 @@
             <artifactId>quarkus-jdbc-postgresql-deployment</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-agroal-deployment</artifactId>
+            <groupId>io.debezium.quarkus</groupId>
+            <artifactId>quarkus-debezium-agroal-deployment</artifactId>
         </dependency>
 
         <dependency>
@@ -63,6 +63,17 @@
             <artifactId>quarkus-jdbc-postgresql</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.debezium.quarkus</groupId>
+            <artifactId>quarkus-debezium-testsuite-deployment</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-suite</artifactId>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 

quarkus-debezium-parent/quarkus-debezium-postgres-parent/deployment/src/main/java/io/quarkus/debezium/postgres/deployment/PostgresEngineProcessor.java

@@ -5,71 +5,46 @@
  */
 package io.quarkus.debezium.postgres.deployment;
 
-import java.util.List;
-
-import jakarta.inject.Singleton;
-
 import io.debezium.connector.postgresql.Module;
 import io.debezium.connector.postgresql.PostgresConnector;
 import io.debezium.connector.postgresql.PostgresConnectorTask;
 import io.debezium.connector.postgresql.PostgresSourceInfoStructMaker;
 import io.debezium.connector.postgresql.snapshot.lock.NoSnapshotLock;
 import io.debezium.connector.postgresql.snapshot.lock.SharedSnapshotLock;
 import io.debezium.connector.postgresql.snapshot.query.SelectAllSnapshotQuery;
-import io.debezium.runtime.configuration.QuarkusDatasourceConfiguration;
-import io.quarkus.agroal.spi.JdbcDataSourceBuildItem;
-import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.datasource.deployment.spi.DevServicesDatasourceResultBuildItem;
-import io.quarkus.debezium.configuration.DatasourceRecorder;
+import io.quarkus.debezium.agroal.configuration.AgroalDatasourceConfiguration;
+import io.quarkus.debezium.deployment.QuarkusEngineProcessor;
 import io.quarkus.debezium.deployment.items.DebeziumConnectorBuildItem;
+import io.quarkus.debezium.deployment.items.DebeziumExtensionNameBuildItem;
 import io.quarkus.debezium.engine.PostgresEngineProducer;
 import io.quarkus.deployment.IsNormal;
 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.DevServicesResultBuildItem;
-import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.dev.devservices.DevServicesConfig;
 import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
 
-public class PostgresEngineProcessor {
+public class PostgresEngineProcessor implements QuarkusEngineProcessor<AgroalDatasourceConfiguration> {
 
     public static final String POSTGRESQL = Module.name();
 
     @BuildStep
-    FeatureBuildItem feature() {
-        return new FeatureBuildItem("debezium-" + POSTGRESQL);
+    @Override
+    public DebeziumExtensionNameBuildItem debeziumExtensionNameBuildItem() {
+        return new DebeziumExtensionNameBuildItem(POSTGRESQL);
     }
 
     @BuildStep
+    @Override
     public DebeziumConnectorBuildItem engine() {
         return new DebeziumConnectorBuildItem(POSTGRESQL, PostgresEngineProducer.class);
     }
 
-    @BuildStep
-    @Record(ExecutionTime.RUNTIME_INIT)
-    public void generateDatasourceConfig(
-                                         DatasourceRecorder datasourceRecorder,
-                                         BuildProducer<SyntheticBeanBuildItem> producer,
-                                         List<JdbcDataSourceBuildItem> jdbcDataSources) {
-
-        jdbcDataSources
-                .stream()
-                .filter(item -> item.getDbKind().equals(POSTGRESQL))
-                .forEach(item -> producer.produce(SyntheticBeanBuildItem
-                        .configure(QuarkusDatasourceConfiguration.class)
-                        .scope(Singleton.class)
-                        .supplier(datasourceRecorder.convert(item.getName(), item.isDefault()))
-                        .setRuntimeInit()
-                        .named(item.getDbKind() + item.getName())
-                        .done()));
-    }
-
     @BuildStep(onlyIfNot = IsNormal.class, onlyIf = DevServicesConfig.Enabled.class)
-    void configure(BuildProducer<DevServicesResultBuildItem> devServicesProducer,
-                   DevServicesDatasourceResultBuildItem devServicesDatasourceResultBuildItem) {
+    void devServices(BuildProducer<DevServicesResultBuildItem> devServicesProducer,
+                     DevServicesDatasourceResultBuildItem devServicesDatasourceResultBuildItem) {
         DevServicesDatasourceResultBuildItem.DbResult datasource = devServicesDatasourceResultBuildItem.getDefaultDatasource();
 
         if (datasource == null) {
@@ -82,12 +57,13 @@ void configure(BuildProducer<DevServicesResultBuildItem> devServicesProducer,
 
         devServicesProducer.produce(new DevServicesResultBuildItem("debezium-postgres",
                 "debezium",
-                QuarkusDatasource.generateDebeziumConfiguration(datasource.getConfigProperties())));
+                datasource.getConfigProperties()));
     }
 
     @BuildStep(onlyIf = NativeOrNativeSourcesBuild.class)
-    void registerClassesThatAreLoadedThroughReflection(BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) {
-        reflectiveClasses.produce(ReflectiveClassBuildItem.builder(
+    @Override
+    public void registerClassesThatAreLoadedThroughReflection(BuildProducer<ReflectiveClassBuildItem> reflectiveClassBuildItemBuildProducer) {
+        reflectiveClassBuildItemBuildProducer.produce(ReflectiveClassBuildItem.builder(
                 PostgresConnector.class,
                 PostgresSourceInfoStructMaker.class,
                 PostgresConnectorTask.class,
@@ -98,4 +74,9 @@ void registerClassesThatAreLoadedThroughReflection(BuildProducer<ReflectiveClass
                 .build());
     }
 
+    @Override
+    public Class<AgroalDatasourceConfiguration> quarkusDatasourceConfiguration() {
+        return AgroalDatasourceConfiguration.class;
+    }
+
 }