Extract public API into API package

Postgres is exposing custom API extensions such as CodecRegistrar
and Notifications so we want to expose that API using a stable design.

Author: mp911de

pom.xml

@@ -235,7 +235,7 @@
                 <version>3.0.1</version>
                 <configuration>
                     <excludePackageNames>
-                        io.r2dbc.postgresql.authentication,io.r2dbc.postgresql.client,io.r2dbc.postgresql.codec,io.r2dbc.postgresql.message,io.r2dbc.postgresql.util
+                        io.r2dbc.postgresql.authentication,io.r2dbc.postgresql.client,io.r2dbc.postgresql.message,io.r2dbc.postgresql.util
                     </excludePackageNames>
                     <links>
                         <link>https://projectreactor.io/docs/core/release/api/</link>

src/main/java/io/r2dbc/postgresql/ExceptionFactory.java

@@ -16,6 +16,8 @@
 
 package io.r2dbc.postgresql;
 
+import io.r2dbc.postgresql.api.ErrorDetails;
+import io.r2dbc.postgresql.api.PostgresqlException;
 import io.r2dbc.postgresql.message.backend.BackendMessage;
 import io.r2dbc.postgresql.message.backend.ErrorResponse;
 import io.r2dbc.spi.R2dbcBadGrammarException;

src/main/java/io/r2dbc/postgresql/ExtendedQueryPostgresqlStatement.java

@@ -16,6 +16,7 @@
 
 package io.r2dbc.postgresql;
 
+import io.r2dbc.postgresql.api.PostgresqlStatement;
 import io.r2dbc.postgresql.client.Binding;
 import io.r2dbc.postgresql.client.Client;
 import io.r2dbc.postgresql.client.ExtendedQueryMessageFlow;
@@ -27,7 +28,6 @@
 import io.r2dbc.postgresql.message.backend.NoData;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.postgresql.util.GeneratedValuesUtils;
-import io.r2dbc.spi.Statement;
 import reactor.core.publisher.Flux;
 
 import java.util.ArrayList;
@@ -115,19 +115,14 @@ public ExtendedQueryPostgresqlStatement bindNull(int index, Class<?> type) {
     }
 
     @Override
-    public Flux<PostgresqlResult> execute() {
+    public Flux<io.r2dbc.postgresql.api.PostgresqlResult> execute() {
         if (this.generatedColumns == null) {
             return execute(this.sql);
         }
 
         return execute(GeneratedValuesUtils.augment(this.sql, this.generatedColumns));
     }
 
-    @Override
-    public Statement fetchSize(int rows) {
-        return this;
-    }
-
     @Override
     public ExtendedQueryPostgresqlStatement returnGeneratedValues(String... columns) {
         Assert.requireNonNull(columns, "columns must not be null");
@@ -182,7 +177,7 @@ private static int expectedSize(String sql) {
         return count;
     }
 
-    private Flux<PostgresqlResult> execute(String sql) {
+    private Flux<io.r2dbc.postgresql.api.PostgresqlResult> execute(String sql) {
         this.bindings.finish();
 
         ExceptionFactory factory = ExceptionFactory.withSql(sql);

src/main/java/io/r2dbc/postgresql/NotificationResponseWrapper.java

@@ -16,6 +16,7 @@
 
 package io.r2dbc.postgresql;
 
+import io.r2dbc.postgresql.api.Notification;
 import io.r2dbc.postgresql.message.backend.NotificationResponse;
 
 /**

src/main/java/io/r2dbc/postgresql/PostgresqlBatch.java

@@ -28,7 +28,7 @@
 /**
  * An implementation of {@link Batch} for executing a collection of statements in a batch against a PostgreSQL database.
  */
-public final class PostgresqlBatch implements Batch {
+final class PostgresqlBatch implements io.r2dbc.postgresql.api.PostgresqlBatch {
 
     private final Client client;
 
@@ -54,7 +54,7 @@ public PostgresqlBatch add(String sql) {
     }
 
     @Override
-    public Flux<PostgresqlResult> execute() {
+    public Flux<io.r2dbc.postgresql.api.PostgresqlResult> execute() {
         return new SimpleQueryPostgresqlStatement(this.client, this.codecs, String.join("; ", this.statements))
             .execute();
     }

src/main/java/io/r2dbc/postgresql/PostgresqlColumnMetadata.java

@@ -27,7 +27,7 @@
 /**
  * An implementation of {@link ColumnMetadata} for a PostgreSQL database.
  */
-public final class PostgresqlColumnMetadata implements ColumnMetadata {
+final class PostgresqlColumnMetadata implements io.r2dbc.postgresql.api.PostgresqlColumnMetadata {
 
     private final Codecs codecs;
 

src/main/java/io/r2dbc/postgresql/PostgresqlConnection.java

@@ -16,6 +16,9 @@
 
 package io.r2dbc.postgresql;
 
+import io.r2dbc.postgresql.api.Notification;
+import io.r2dbc.postgresql.api.PostgresqlResult;
+import io.r2dbc.postgresql.api.PostgresqlStatement;
 import io.r2dbc.postgresql.client.Client;
 import io.r2dbc.postgresql.client.PortalNameSupplier;
 import io.r2dbc.postgresql.client.SimpleQueryMessageFlow;
@@ -46,7 +49,7 @@
 /**
  * An implementation of {@link Connection} for connecting to a PostgreSQL database.
  */
-public final class PostgresqlConnection implements Connection {
+final class PostgresqlConnection implements io.r2dbc.postgresql.api.PostgresqlConnection {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
@@ -151,6 +154,7 @@ public PostgresqlStatement createStatement(String sql) {
      *
      * @return a hot {@link Flux} of {@link Notification Notifications}.
      */
+    @Override
     public Flux<Notification> getNotifications() {
 
         NotificationAdapter notifications = this.notificationAdapter.get();

src/main/java/io/r2dbc/postgresql/PostgresqlConnectionFactory.java

@@ -30,6 +30,7 @@
 import io.r2dbc.postgresql.message.backend.AuthenticationMessage;
 import io.r2dbc.postgresql.util.Assert;
 import io.r2dbc.spi.ConnectionFactory;
+import io.r2dbc.spi.ConnectionFactoryMetadata;
 import io.r2dbc.spi.IsolationLevel;
 import io.r2dbc.spi.R2dbcException;
 import io.r2dbc.spi.R2dbcNonTransientResourceException;
@@ -83,7 +84,7 @@ private static Extensions getExtensions(PostgresqlConnectionConfiguration config
     }
 
     @Override
-    public Mono<PostgresqlConnection> create() {
+    public Mono<io.r2dbc.postgresql.api.PostgresqlConnection> create() {
         SSLConfig sslConfig = this.configuration.getSslConfig();
         Predicate<Throwable> isAuthSpecificationError = e -> e instanceof ExceptionFactory.PostgresqlAuthenticationFailure;
         return this.tryConnectWithConfig(sslConfig)
@@ -112,7 +113,7 @@ public Mono<PostgresqlConnection> create() {
                         return prepareConnection(connection, client.getByteBufAllocator(), codecs);
                     })
                     .onErrorResume(throwable -> this.closeWithError(client, throwable));
-            }).onErrorMap(this::cannotConnect);
+            }).onErrorMap(this::cannotConnect).cast(io.r2dbc.postgresql.api.PostgresqlConnection.class);
     }
 
     private Mono<Client> tryConnectWithConfig(SSLConfig sslConfig) {
@@ -152,7 +153,7 @@ private Throwable cannotConnect(Throwable throwable) {
     }
 
     @Override
-    public PostgresqlConnectionFactoryMetadata getMetadata() {
+    public ConnectionFactoryMetadata getMetadata() {
         return PostgresqlConnectionFactoryMetadata.INSTANCE;
     }
 

src/main/java/io/r2dbc/postgresql/PostgresqlConnectionFactoryMetadata.java

@@ -21,7 +21,7 @@
 /**
  * An implementation of {@link ConnectionFactoryMetadata} for a PostgreSQL database.
  */
-public final class PostgresqlConnectionFactoryMetadata implements ConnectionFactoryMetadata {
+final class PostgresqlConnectionFactoryMetadata implements ConnectionFactoryMetadata {
 
     /**
      * The name of the PostgreSQL database product.

src/main/java/io/r2dbc/postgresql/PostgresqlConnectionMetadata.java

@@ -17,12 +17,11 @@
 package io.r2dbc.postgresql;
 
 import io.r2dbc.postgresql.client.Version;
-import io.r2dbc.spi.ConnectionMetadata;
 
 /**
  * Connection metadata for a connection connected to a PostgreSQL database.
  */
-public final class PostgresqlConnectionMetadata implements ConnectionMetadata {
+final class PostgresqlConnectionMetadata implements io.r2dbc.postgresql.api.PostgresqlConnectionMetadata {
 
     private final Version version;