review comments addressed - integration test fixed;missing license added;

Author: avinash-anand

src/main/java/io/r2dbc/postgresql/codec/Point.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2017-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.r2dbc.postgresql.codec;
 
 /**

src/main/java/io/r2dbc/postgresql/codec/PointCodec.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2017-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.r2dbc.postgresql.codec;
 
 import io.netty.buffer.ByteBuf;
@@ -34,12 +50,18 @@ Point doDecode(ByteBuf buffer, PostgresqlObjectId dataType, Format format, Class
         Assert.requireNonNull(type, "type must not be null");
         Assert.requireNonNull(format, "format must not be null");
 
-        String decodedAsString = ByteBufUtils.decode(buffer);
-        String parenRemovedVal = decodedAsString.replaceAll("[()]", "");
-        String[] coordinatesAsString = parenRemovedVal.split(",");
-        double x = Double.parseDouble(coordinatesAsString[0]);
-        double y = Double.parseDouble(coordinatesAsString[1]);
-        return new Point(x, y);
+        if (format == FORMAT_BINARY) {
+            double x = buffer.readDouble();
+            double y = buffer.readDouble();
+            return new Point(x, y);
+        } else {
+            String decodedAsString = ByteBufUtils.decode(buffer);
+            String parenRemovedVal = decodedAsString.replaceAll("[()]", "");
+            String[] coordinatesAsString = parenRemovedVal.split(",");
+            double x = Double.parseDouble(coordinatesAsString[0]);
+            double y = Double.parseDouble(coordinatesAsString[1]);
+            return new Point(x, y);
+        }
     }
 
     /**
@@ -49,12 +71,16 @@ Point doDecode(ByteBuf buffer, PostgresqlObjectId dataType, Format format, Class
     @Override
     Parameter doEncode(Point value) {
         Assert.requireNonNull(value, "value must not be null");
-        return create(POINT, FORMAT_BINARY, () -> ByteBufUtils.encode(this.byteBufAllocator, value.toString()));
+        return create(POINT, FORMAT_BINARY, () -> this.byteBufAllocator.buffer(lengthInBytes()).writeDouble(value.getX()).writeDouble(value.getY()));
     }
 
     @Override
     public Parameter encodeNull() {
         return createNull(POINT, FORMAT_BINARY);
     }
 
+    public int lengthInBytes() {
+        return 16;
+    }
+
 }

src/test/java/io/r2dbc/postgresql/codec/PointCodecTest.java

@@ -1,16 +1,31 @@
+/*
+ * Copyright 2017-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package io.r2dbc.postgresql.codec;
 
+import io.netty.buffer.ByteBuf;
 import io.r2dbc.postgresql.client.Parameter;
 import io.r2dbc.postgresql.client.ParameterAssert;
-import io.r2dbc.postgresql.util.ByteBufUtils;
 import org.junit.jupiter.api.Test;
 
 import static io.r2dbc.postgresql.client.Parameter.NULL_VALUE;
 import static io.r2dbc.postgresql.message.Format.FORMAT_BINARY;
 import static io.r2dbc.postgresql.message.Format.FORMAT_TEXT;
 import static io.r2dbc.postgresql.type.PostgresqlObjectId.POINT;
 import static io.r2dbc.postgresql.type.PostgresqlObjectId.VARCHAR;
-import static io.r2dbc.postgresql.util.ByteBufUtils.encode;
 import static io.r2dbc.postgresql.util.TestByteBufAllocator.TEST;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -60,10 +75,8 @@ void doDecodeNoFormat() {
     void doDecode() {
         PointCodec codec = new PointCodec(TEST);
         Point point = new Point(1.12, 2.12);
-        String encodedValue = "(1.12,2.12)";
-
-        assertThat(codec.doDecode(ByteBufUtils.encode(TEST, encodedValue), POINT, FORMAT_BINARY, Point.class))
-            .isEqualTo(point);
+        ByteBuf pointAsBinary = TEST.buffer(codec.lengthInBytes()).writeDouble(1.12).writeDouble(2.12);
+        assertThat(codec.doDecode(pointAsBinary, POINT, FORMAT_BINARY, Point.class)).isEqualTo(point);
     }
 
     @Test
@@ -75,11 +88,12 @@ void doEncodeNoValue() {
     @Test
     void doEncode() {
         PointCodec codec = new PointCodec(TEST);
+        ByteBuf pointAsBinary = TEST.buffer(codec.lengthInBytes()).writeDouble(1.12).writeDouble(2.12);
 
         ParameterAssert.assertThat(codec.doEncode(new Point(1.12, 2.12)))
             .hasFormat(FORMAT_BINARY)
             .hasType(POINT.getObjectId())
-            .hasValue(encode(TEST, "(1.12,2.12)"));
+            .hasValue(pointAsBinary);
     }
 
     @Test