Packages restructured

Author: marat-gainullin

README.md

@@ -45,7 +45,7 @@ db.queryRows("select unnest('{ hello, world }'::text[] as message)")
 
 ### Creating a Db
 
-Db is a connection pool that is created with [`com.github.pgasync.ConnectionPoolBuilder`](https://github.com/alaisi/postgres-async-driver/blob/master/src/main/java/com/github/pgasync/ConnectionPoolBuilder.java)
+Db is a connection pool that is created with [`ConnectionPoolBuilder`](https://github.com/alaisi/postgres-async-driver/blob/master/src/main/java/com/github/pgasync/ConnectionPoolBuilder.java)
 
 ```java
 Db db = new ConnectionPoolBuilder()
@@ -87,7 +87,7 @@ db.begin()
 
 ### Custom data types
 
-Support for additional data types requires registering converters to [`com.github.pgasync.ConnectionPoolBuilder`](https://github.com/alaisi/postgres-async-driver/blob/master/src/main/java/com/github/pgasync/ConnectionPoolBuilder.java)
+Support for additional data types requires registering converters to [`ConnectionPoolBuilder`](https://github.com/alaisi/postgres-async-driver/blob/master/src/main/java/com/github/pgasync/ConnectionPoolBuilder.java)
 
 ```java
 class JsonConverter implements Converter<example.Json> {

src/main/java/com/github/pgasync/impl/Oid.java renamed to src/main/java/com/github/pgasync/Oid.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.github.pgasync.impl;
+package com.github.pgasync;
 
 /**
  * Object identifiers, copied from org.postgresql.core.Oid.

src/main/java/com/github/pgasync/impl/PgColumn.java renamed to src/main/java/com/github/pgasync/PgColumn.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.github.pgasync.impl;
+package com.github.pgasync;
 
 /**
  * Column index/type pair.

src/main/java/com/github/pgasync/impl/PgConnection.java renamed to src/main/java/com/github/pgasync/PgConnection.java

@@ -12,9 +12,9 @@
  * limitations under the License.
  */
 
-package com.github.pgasync.impl;
+package com.github.pgasync;
 
-import static com.github.pgasync.impl.message.backend.RowDescription.ColumnDescription;
+import static com.github.pgasync.message.backend.RowDescription.ColumnDescription;
 
 import java.nio.charset.Charset;
 import java.util.ArrayList;
@@ -30,24 +30,24 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import com.github.pgasync.Connection;
-import com.github.pgasync.Listening;
-import com.github.pgasync.PreparedStatement;
-import com.github.pgasync.ResultSet;
-import com.github.pgasync.Row;
-import com.github.pgasync.Transaction;
-import com.github.pgasync.impl.conversion.DataConverter;
-import com.github.pgasync.impl.message.backend.Authentication;
-import com.github.pgasync.impl.message.backend.RowDescription;
-import com.github.pgasync.impl.message.frontend.Bind;
-import com.github.pgasync.impl.message.frontend.Close;
-import com.github.pgasync.impl.message.frontend.Describe;
-import com.github.pgasync.impl.message.frontend.Execute;
-import com.github.pgasync.impl.message.Message;
-import com.github.pgasync.impl.message.frontend.Parse;
-import com.github.pgasync.impl.message.frontend.PasswordMessage;
-import com.github.pgasync.impl.message.frontend.Query;
-import com.github.pgasync.impl.message.frontend.StartupMessage;
+import com.pgasync.Connection;
+import com.pgasync.Listening;
+import com.pgasync.PreparedStatement;
+import com.pgasync.ResultSet;
+import com.pgasync.Row;
+import com.pgasync.Transaction;
+import com.github.pgasync.conversion.DataConverter;
+import com.github.pgasync.message.backend.Authentication;
+import com.github.pgasync.message.backend.RowDescription;
+import com.github.pgasync.message.frontend.Bind;
+import com.github.pgasync.message.frontend.Close;
+import com.github.pgasync.message.frontend.Describe;
+import com.github.pgasync.message.frontend.Execute;
+import com.github.pgasync.message.Message;
+import com.github.pgasync.message.frontend.Parse;
+import com.github.pgasync.message.frontend.PasswordMessage;
+import com.github.pgasync.message.frontend.Query;
+import com.github.pgasync.message.frontend.StartupMessage;
 
 /**
  * A connection to Postgres backend. The postmaster forks a backend process for

src/main/java/com/github/pgasync/impl/PgConnectionPool.java renamed to src/main/java/com/github/pgasync/PgConnectionPool.java

@@ -12,11 +12,18 @@
  * limitations under the License.
  */
 
-package com.github.pgasync.impl;
-
-import com.github.pgasync.*;
-import com.github.pgasync.ConnectionPoolBuilder.PoolProperties;
-import com.github.pgasync.impl.conversion.DataConverter;
+package com.github.pgasync;
+
+import com.github.pgasync.conversion.DataConverter;
+import com.pgasync.Connection;
+import com.pgasync.Listening;
+import com.pgasync.PreparedStatement;
+import com.pgasync.Row;
+import com.pgasync.SqlException;
+import com.pgasync.ConnectionPool;
+import com.pgasync.ConnectionPoolBuilder;
+import com.pgasync.ResultSet;
+import com.pgasync.Transaction;
 
 import javax.annotation.concurrent.GuardedBy;
 import java.net.InetSocketAddress;
@@ -201,8 +208,9 @@ public CompletableFuture<Integer> fetch(BiConsumer<Map<String, PgColumn>, PgColu
     private final int maxConnections;
     private final int maxStatements;
     private final String validationQuery;
-    protected final Charset encoding;
     private final ReentrantLock lock = new ReentrantLock();
+    protected final Charset encoding;
+
     @GuardedBy("lock")
     private int size;
     @GuardedBy("lock")
@@ -220,7 +228,7 @@ public CompletableFuture<Integer> fetch(BiConsumer<Map<String, PgColumn>, PgColu
 
     protected final Executor futuresExecutor;
 
-    public PgConnectionPool(PoolProperties properties, Executor futuresExecutor) {
+    public PgConnectionPool(ConnectionPoolBuilder.PoolProperties properties, Executor futuresExecutor) {
         this.address = InetSocketAddress.createUnresolved(properties.getHostname(), properties.getPort());
         this.username = properties.getUsername();
         this.password = properties.getPassword();

src/main/java/com/github/pgasync/impl/PgProtocolStream.java renamed to src/main/java/com/github/pgasync/PgProtocolStream.java

@@ -12,17 +12,16 @@
  * limitations under the License.
  */
 
-package com.github.pgasync.impl;
-
-import com.github.pgasync.impl.message.Message;
-import com.github.pgasync.impl.message.backend.CommandComplete;
-import com.github.pgasync.impl.message.backend.DataRow;
-import com.github.pgasync.impl.message.backend.RowDescription;
-import com.github.pgasync.impl.message.frontend.Execute;
-import com.github.pgasync.impl.message.frontend.Parse;
-import com.github.pgasync.impl.message.frontend.PasswordMessage;
-import com.github.pgasync.impl.message.frontend.Query;
-import com.github.pgasync.impl.message.frontend.StartupMessage;
+package com.github.pgasync;
+
+import com.github.pgasync.message.Message;
+import com.github.pgasync.message.backend.CommandComplete;
+import com.github.pgasync.message.backend.DataRow;
+import com.github.pgasync.message.backend.RowDescription;
+import com.github.pgasync.message.frontend.Execute;
+import com.github.pgasync.message.frontend.PasswordMessage;
+import com.github.pgasync.message.frontend.Query;
+import com.github.pgasync.message.frontend.StartupMessage;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;

src/main/java/com/github/pgasync/impl/PgResultSet.java renamed to src/main/java/com/github/pgasync/PgResultSet.java

@@ -12,10 +12,10 @@
  * limitations under the License.
  */
 
-package com.github.pgasync.impl;
+package com.github.pgasync;
 
-import com.github.pgasync.ResultSet;
-import com.github.pgasync.Row;
+import com.pgasync.ResultSet;
+import com.pgasync.Row;
 
 import java.util.*;
 

src/main/java/com/github/pgasync/impl/PgRow.java renamed to src/main/java/com/github/pgasync/PgRow.java

@@ -12,12 +12,12 @@
  * limitations under the License.
  */
 
-package com.github.pgasync.impl;
+package com.github.pgasync;
 
-import com.github.pgasync.Row;
-import com.github.pgasync.SqlException;
-import com.github.pgasync.impl.conversion.DataConverter;
-import com.github.pgasync.impl.message.backend.DataRow;
+import com.pgasync.Row;
+import com.pgasync.SqlException;
+import com.github.pgasync.conversion.DataConverter;
+import com.github.pgasync.message.backend.DataRow;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

src/main/java/com/github/pgasync/impl/conversion/ArrayConversions.java renamed to src/main/java/com/github/pgasync/conversion/ArrayConversions.java

@@ -1,6 +1,6 @@
-package com.github.pgasync.impl.conversion;
+package com.github.pgasync.conversion;
 
-import com.github.pgasync.impl.Oid;
+import com.github.pgasync.Oid;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;

src/main/java/com/github/pgasync/impl/conversion/BlobConversions.java renamed to src/main/java/com/github/pgasync/conversion/BlobConversions.java

@@ -1,10 +1,7 @@
-package com.github.pgasync.impl.conversion;
+package com.github.pgasync.conversion;
 
-import com.github.pgasync.SqlException;
-import com.github.pgasync.impl.Oid;
-
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
+import com.pgasync.SqlException;
+import com.github.pgasync.Oid;
 
 import static javax.xml.bind.DatatypeConverter.parseHexBinary;
 import static javax.xml.bind.DatatypeConverter.printHexBinary;

src/main/java/com/github/pgasync/impl/conversion/BooleanConversions.java renamed to src/main/java/com/github/pgasync/conversion/BooleanConversions.java

@@ -1,7 +1,7 @@
-package com.github.pgasync.impl.conversion;
+package com.github.pgasync.conversion;
 
-import com.github.pgasync.SqlException;
-import com.github.pgasync.impl.Oid;
+import com.pgasync.SqlException;
+import com.github.pgasync.Oid;
 
 /**
  * @author Antti Laisi

src/main/java/com/github/pgasync/impl/conversion/DataConverter.java renamed to src/main/java/com/github/pgasync/conversion/DataConverter.java

@@ -1,7 +1,7 @@
-package com.github.pgasync.impl.conversion;
+package com.github.pgasync.conversion;
 
-import com.github.pgasync.Converter;
-import com.github.pgasync.impl.Oid;
+import com.pgasync.Converter;
+import com.github.pgasync.Oid;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

src/main/java/com/github/pgasync/impl/conversion/NumericConversions.java renamed to src/main/java/com/github/pgasync/conversion/NumericConversions.java

@@ -1,7 +1,7 @@
-package com.github.pgasync.impl.conversion;
+package com.github.pgasync.conversion;
 
-import com.github.pgasync.SqlException;
-import com.github.pgasync.impl.Oid;
+import com.pgasync.SqlException;
+import com.github.pgasync.Oid;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;

src/main/java/com/github/pgasync/impl/conversion/StringConversions.java renamed to src/main/java/com/github/pgasync/conversion/StringConversions.java

@@ -1,7 +1,7 @@
-package com.github.pgasync.impl.conversion;
+package com.github.pgasync.conversion;
 
-import com.github.pgasync.SqlException;
-import com.github.pgasync.impl.Oid;
+import com.pgasync.SqlException;
+import com.github.pgasync.Oid;
 
 /**
  * @author Antti Laisi

src/main/java/com/github/pgasync/impl/conversion/TemporalConversions.java renamed to src/main/java/com/github/pgasync/conversion/TemporalConversions.java

@@ -1,7 +1,7 @@
-package com.github.pgasync.impl.conversion;
+package com.github.pgasync.conversion;
 
-import com.github.pgasync.SqlException;
-import com.github.pgasync.impl.Oid;
+import com.pgasync.SqlException;
+import com.github.pgasync.Oid;
 
 import java.sql.Date;
 import java.sql.Time;

src/main/java/com/github/pgasync/impl/message/frontend/SSLRequest.java

@@ -12,9 +12,9 @@
  * limitations under the License.
  */
 
-package com.github.pgasync.impl.io;
+package com.github.pgasync.io;
 
-import com.github.pgasync.impl.message.Message;
+import com.github.pgasync.message.Message;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;

src/main/java/com/github/pgasync/impl/io/Decoder.java renamed to src/main/java/com/github/pgasync/io/Decoder.java

@@ -12,9 +12,9 @@
  * limitations under the License.
  */
 
-package com.github.pgasync.impl.io;
+package com.github.pgasync.io;
 
-import com.github.pgasync.impl.message.Message;
+import com.github.pgasync.message.Message;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;

src/main/java/com/github/pgasync/impl/io/Encoder.java renamed to src/main/java/com/github/pgasync/io/Encoder.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package com.github.pgasync.impl.io;
+package com.github.pgasync.io;
 
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;

src/main/java/com/github/pgasync/impl/io/IO.java renamed to src/main/java/com/github/pgasync/io/IO.java

@@ -12,10 +12,10 @@
  * limitations under the License.
  */
 
-package com.github.pgasync.impl.io.backend;
+package com.github.pgasync.io.backend;
 
-import com.github.pgasync.impl.io.Decoder;
-import com.github.pgasync.impl.message.backend.Authentication;
+import com.github.pgasync.io.Decoder;
+import com.github.pgasync.message.backend.Authentication;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;

src/main/java/com/github/pgasync/impl/io/backend/AuthenticationDecoder.java renamed to src/main/java/com/github/pgasync/io/backend/AuthenticationDecoder.java

@@ -12,10 +12,10 @@
  * limitations under the License.
  */
 
-package com.github.pgasync.impl.io.backend;
+package com.github.pgasync.io.backend;
 
-import com.github.pgasync.impl.io.Decoder;
-import com.github.pgasync.impl.message.backend.BIndicators;
+import com.github.pgasync.io.Decoder;
+import com.github.pgasync.message.backend.BIndicators;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;

src/main/java/com/github/pgasync/impl/io/backend/BindCompleteDecoder.java renamed to src/main/java/com/github/pgasync/io/backend/BindCompleteDecoder.java

@@ -12,10 +12,10 @@
  * limitations under the License.
  */
 
-package com.github.pgasync.impl.io.backend;
+package com.github.pgasync.io.backend;
 
-import com.github.pgasync.impl.io.Decoder;
-import com.github.pgasync.impl.message.backend.BIndicators;
+import com.github.pgasync.io.Decoder;
+import com.github.pgasync.message.backend.BIndicators;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;

src/main/java/com/github/pgasync/impl/io/backend/CloseCompleteDecoder.java renamed to src/main/java/com/github/pgasync/io/backend/CloseCompleteDecoder.java

@@ -12,15 +12,15 @@
  * limitations under the License.
  */
 
-package com.github.pgasync.impl.io.backend;
+package com.github.pgasync.io.backend;
 
-import com.github.pgasync.impl.io.Decoder;
-import com.github.pgasync.impl.message.backend.CommandComplete;
+import com.github.pgasync.io.Decoder;
+import com.github.pgasync.message.backend.CommandComplete;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 
-import static com.github.pgasync.impl.io.IO.getCString;
+import static com.github.pgasync.io.IO.getCString;
 
 /**
  * See <a href="www.postgresql.org/docs/9.3/static/protocol-message-formats.html">Postgres message formats</a>

src/main/java/com/github/pgasync/impl/io/backend/CommandCompleteDecoder.java renamed to src/main/java/com/github/pgasync/io/backend/CommandCompleteDecoder.java

@@ -12,10 +12,10 @@
  * limitations under the License.
  */
 
-package com.github.pgasync.impl.io.backend;
+package com.github.pgasync.io.backend;
 
-import com.github.pgasync.impl.io.Decoder;
-import com.github.pgasync.impl.message.backend.DataRow;
+import com.github.pgasync.io.Decoder;
+import com.github.pgasync.message.backend.DataRow;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;