Polishing

Reformat code. Add null guards. Update readme.

[pgjdbc#282][closes pgjdbc#300]

Author: mp911de

README.md

@@ -348,7 +348,7 @@ This reference table shows the type mapping between [PostgreSQL][p] and Java dat
 | [`character`][psql-character-ref]               | [`String`][java-string-ref]|
 | [`character varying`][psql-character-ref]       | [`String`][java-string-ref]|
 | [`cidr`][psql-cidr-ref]                         | Not yet supported.|
-| [`circle`][psql-circle-ref]                     | Not yet supported.|
+| [`circle`][psql-circle-ref]                     | **`Circle`**|
 | [`date`][psql-date-ref]                         | [`LocalDate`][java-ld-ref]|
 | [`double precision`][psql-floating-point-ref]   | [**`Double`**][java-double-ref], [`Float`][java-float-ref], [`Boolean`][java-boolean-ref], [`Byte`][java-byte-ref], [`Short`][java-short-ref], [`Integer`][java-integer-ref], [`Long`][java-long-ref], [`BigDecimal`][java-bigdecimal-ref], [`BigInteger`][java-biginteger-ref]|
 | [enumerated types][psql-enum-ref]               | Client code `Enum` types through `EnumCodec`|

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

@@ -16,12 +16,21 @@
 
 package io.r2dbc.postgresql.codec;
 
+import io.r2dbc.postgresql.util.Assert;
+
+/**
+ * Value object that maps to the {@code circle} datatype in Postgres.
+ * <p>
+ * Uses {@code double} to represent the coordinates.
+ */
 public final class Circle {
+
     private final Point center;
+
     private final double radius;
 
     public Circle(Point center, double radius) {
-        this.center = center;
+        this.center = Assert.requireNonNull(center, "center must not be null");
         this.radius = radius;
     }
 
@@ -45,20 +54,20 @@ public double getRadius() {
     public boolean equals(Object obj) {
         if (obj instanceof Circle) {
             Circle circle = (Circle) obj;
-            return circle.center.equals(center) && circle.radius == radius;
+            return circle.center.equals(this.center) && circle.radius == this.radius;
         }
         return false;
     }
 
     @Override
     public int hashCode() {
-        long v = Double.doubleToLongBits(radius);
-        return (int) (center.hashCode() ^ v ^ (v >>> 32));
+        long v = Double.doubleToLongBits(this.radius);
+        return (int) (this.center.hashCode() ^ v ^ (v >>> 32));
     }
 
     @Override
     public String toString() {
-        return "<" + center.toString() + "," + radius + ">";
+        return "<" + this.center.toString() + "," + this.radius + ">";
     }
 
 }

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

@@ -74,9 +74,9 @@ Parameter doEncode(Circle value) {
         Assert.requireNonNull(value, "value must not be null");
         Point center = value.getCenter();
         return create(CIRCLE, FORMAT_BINARY, () -> this.byteBufAllocator.buffer(lengthInBytes())
-                .writeDouble(center.getX())
-                .writeDouble(center.getY())
-                .writeDouble(value.getRadius()));
+            .writeDouble(center.getX())
+            .writeDouble(center.getY())
+            .writeDouble(value.getRadius()));
     }
 
     @Override

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 the original author or authors.
+ * Copyright 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.
@@ -38,13 +38,13 @@ final class CircleCodecUnitTests {
     @Test
     void constructorNoByteBufAllocator() {
         assertThatIllegalArgumentException().isThrownBy(() -> new CircleCodec(null))
-                .withMessage("byteBufAllocator must not be null");
+            .withMessage("byteBufAllocator must not be null");
     }
 
     @Test
     void doCanDecodeNoType() {
         assertThatIllegalArgumentException().isThrownBy(() -> new CircleCodec(TEST).doCanDecode(null, FORMAT_BINARY))
-                .withMessage("type must not be null");
+            .withMessage("type must not be null");
     }
 
     @Test
@@ -59,19 +59,19 @@ void doCanDecode() {
     @Test
     void doDecodeNoByteBuf() {
         assertThatIllegalArgumentException().isThrownBy(() -> new CircleCodec(TEST).doDecode(null, CIRCLE, FORMAT_BINARY, Circle.class))
-                .withMessage("byteBuf must not be null");
+            .withMessage("byteBuf must not be null");
     }
 
     @Test
     void doDecodeNoType() {
         assertThatIllegalArgumentException().isThrownBy(() -> new CircleCodec(TEST).doDecode(TEST.buffer(), CIRCLE, FORMAT_BINARY, null))
-                .withMessage("type must not be null");
+            .withMessage("type must not be null");
     }
 
     @Test
     void doDecodeNoFormat() {
         assertThatIllegalArgumentException().isThrownBy(() -> new CircleCodec(TEST).doDecode(TEST.buffer(), CIRCLE, null, Circle.class))
-                .withMessage("format must not be null");
+            .withMessage("format must not be null");
     }
 
     @Test
@@ -86,7 +86,7 @@ void doDecode() {
     @Test
     void doEncodeNoValue() {
         assertThatIllegalArgumentException().isThrownBy(() -> new CircleCodec(TEST).doEncode(null))
-                .withMessage("value must not be null");
+            .withMessage("value must not be null");
     }
 
     @Test
@@ -95,15 +95,15 @@ void doEncode() {
         ByteBuf circleAsBinary = TEST.buffer(codec.lengthInBytes()).writeDouble(1.12).writeDouble(2.12).writeDouble(3.12);
 
         ParameterAssert.assertThat(codec.doEncode(new Circle(Point.of(1.12, 2.12), 3.12)))
-                .hasFormat(FORMAT_BINARY)
-                .hasType(CIRCLE.getObjectId())
-                .hasValue(circleAsBinary);
+            .hasFormat(FORMAT_BINARY)
+            .hasType(CIRCLE.getObjectId())
+            .hasValue(circleAsBinary);
     }
 
     @Test
     void encodeNull() {
         ParameterAssert.assertThat(new CircleCodec(TEST).encodeNull())
-                .isEqualTo(new Parameter(FORMAT_BINARY, CIRCLE.getObjectId(), NULL_VALUE));
+            .isEqualTo(new Parameter(FORMAT_BINARY, CIRCLE.getObjectId(), NULL_VALUE));
     }
 
 }