Feature/concurrency tests

project.gradle

@@ -16,8 +16,9 @@ project.ext {
 dependencies {
 
     compile([
-            "org.apache.avro:avro:1.8.0",
-            "org.slf4j:slf4j-api:1.7.18"
+            "org.apache.avro:avro:1.8.1",
+            "org.slf4j:slf4j-api:1.7.18",
+            "com.google.code.findbugs:jsr305:3.0.1"
     ])
 
     testCompile([

src/main/java/io/datanerds/avropatch/Patch.java

@@ -1,30 +1,41 @@
 package io.datanerds.avropatch;
 
+import io.datanerds.avropatch.operation.DefaultSchema;
 import io.datanerds.avropatch.operation.Operation;
+import io.datanerds.avropatch.value.conversion.*;
 import org.apache.avro.Schema;
 import org.apache.avro.io.*;
-import org.apache.avro.reflect.ReflectData;
-import org.apache.avro.reflect.ReflectDatumReader;
-import org.apache.avro.reflect.ReflectDatumWriter;
+import org.apache.avro.reflect.AvroSchema;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
+/**
+ * This class represents a JSON PATCH operation holding a sequence of operations to apply to a given object.
+ *
+ * @see <a href="https://tools.ietf.org/html/rfc6902">https://tools.ietf.org/html/rfc6902</a>
+ */
 public class Patch {
 
-    public static final Schema SCHEMA = ReflectData.get().getSchema(Patch.class);
-    private static final DatumWriter<Patch> writer = new ReflectDatumWriter<>(SCHEMA);
+    private static final PatchSerializer SERIALIZER = new PatchSerializer();
+
+    @AvroSchema(DefaultSchema.HEADERS)
+    private final Map<String, ?> headers;
     private final List<Operation> operations;
 
     public Patch() {
-        operations = new ArrayList<>();
+        this(new ArrayList<>(), new HashMap<>());
     }
 
     public Patch(List<Operation> operations) {
         this.operations = new ArrayList<>(operations);
+        this.headers = new HashMap<>();
+    }
+
+    public Patch(List<Operation> operations, Map<String, ?> headers) {
+        this.operations = new ArrayList<>(operations);
+        this.headers = new HashMap<>(headers);
     }
 
     public boolean addOperation(Operation operation) {
@@ -35,16 +46,29 @@ public List<Operation> getOperations() {
         return Collections.unmodifiableList(operations);
     }
 
+    public Map<String, ?> getHeaders() {
+        return Collections.unmodifiableMap(headers);
+    }
+
     public byte[] toBytes() throws IOException {
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         Encoder binaryEncoder = EncoderFactory.get().directBinaryEncoder(outputStream, null);
-
-        writer.write(this, binaryEncoder);
+        SERIALIZER.writer.write(this, binaryEncoder);
         return outputStream.toByteArray();
     }
 
     public static Patch of(byte[] bytes) throws IOException {
-        DatumReader<Patch> reader = new ReflectDatumReader<>(SCHEMA);
-        return reader.read(null, DecoderFactory.get().binaryDecoder(bytes, null));
+        return SERIALIZER.reader.read(null, DecoderFactory.get().binaryDecoder(bytes, null));
+    }
+
+    private static class PatchSerializer {
+        final DatumWriter<Patch> writer;
+        final DatumReader<Patch> reader;
+
+        private PatchSerializer() {
+            Schema schema = AvroData.get().getSchema(Patch.class);
+            writer = AvroData.get().createDatumWriter(schema);
+            reader = AvroData.get().createDatumReader(schema);
+        }
     }
 }

src/main/java/io/datanerds/avropatch/operation/Add.java

@@ -7,26 +7,26 @@
  * This class represents the "add" operation of RFC 6902 'JavaScript Object Notation (JSON) Patch'.
  *
  * @see <a href="https://tools.ietf.org/html/rfc6902#section-4.1">https://tools.ietf.org/html/rfc6902#section-4.1</a>
- * @param <T> Value type of <i>add</i> operation
+ * @param <T> DefaultSchema type of <i>add</i> operation
  */
 public final class Add<T> implements Operation {
     @AvroIgnore
     public static final String op = "add";
     public final Path path;
-    @AvroSchema(Value.SCHEMA)
+    @AvroSchema(DefaultSchema.VALUE)
     public final T value;
 
+    @SuppressWarnings("unused") // no arg constructor needed by Avro
     private Add() {
-        this.path = null;
-        this.value = null;
+        this(null, null);
     }
 
     /**
      *
      * @param path Path pointing out where the JSON value should be added
      * @param value Actual value to <i>add</i> to patched object
      *
-     * @see Value
+     * @see DefaultSchema
      */
     public Add(Path path, T value) {
         this.path = path;

src/main/java/io/datanerds/avropatch/operation/Copy.java

@@ -13,9 +13,9 @@ public final class Copy implements Operation {
     public final Path from;
     public final Path path;
 
+    @SuppressWarnings("unused") // no arg constructor needed by Avro
     private Copy() {
-        from = null;
-        path = null;
+        this(null, null);
     }
 
     /**

src/main/java/io/datanerds/avropatch/operation/DefaultSchema.java

@@ -0,0 +1,84 @@
+package io.datanerds.avropatch.operation;
+
+/**
+ * This interface holds the schema for all valid value types.
+ */
+public interface DefaultSchema {
+    String VALUE =
+            "[{"
+                    + "    \"type\": \"record\","
+                    + "    \"name\": \"decimal\","
+                    + "    \"fields\": [{"
+                    + "        \"name\": \"unscaledValue\","
+                    + "        \"type\": {"
+                    + "            \"type\": \"bytes\","
+                    + "            \"logicalType\": \"big-integer\""
+                    + "        }"
+                    + "    }, {"
+                    + "        \"name\": \"scale\","
+                    + "        \"type\": \"int\""
+                    + "    }],"
+                    + "    \"logicalType\": \"big-decimal\""
+                    + "}, {"
+                    + "    \"type\": \"bytes\","
+                    + "    \"logicalType\": \"big-integer\""
+                    + "}, \"boolean\", {"
+                    + "    \"type\": \"fixed\","
+                    + "    \"name\": \"timestamp\","
+                    + "    \"size\": 8,"
+                    + "    \"logicalType\": \"timestamp\""
+                    + "}, \"double\", \"float\", \"int\", \"long\", \"null\", \"string\", {"
+                    + "    \"type\": \"fixed\","
+                    + "    \"name\": \"uuid\","
+                    + "    \"size\": 16,"
+                    + "    \"logicalType\": \"uuid\""
+                    + "}, {"
+                    + "    \"type\": \"array\","
+                    + "    \"items\": [\"decimal\", {"
+                    + "        \"type\": \"bytes\","
+                    + "        \"logicalType\": \"big-integer\""
+                    + "    }, \"boolean\", \"timestamp\", \"double\", \"float\", \"int\", \"long\", \"null\", \"string\", \"uuid\"]"
+                    + "}, {\n"
+                    + "    \"type\": \"map\","
+                    + "    \"values\": [\"decimal\", {"
+                    + "        \"type\": \"bytes\","
+                    + "        \"logicalType\": \"big-integer\""
+                    + "    }, \"boolean\", \"timestamp\", \"double\", \"float\", \"int\", \"long\", \"null\", \"string\", \"uuid\"]"
+                    + "}]";
+
+    String HEADERS =
+            "{\n"
+                    + "    \"type\": \"map\",\n"
+                    + "    \"values\": [\"boolean\", \"double\", \"float\", \"int\", \"long\", \"string\", {\n"
+                    + "        \"type\": \"record\",\n"
+                    + "        \"name\": \"decimal\",\n"
+                    + "        \"doc\": \"BigDecimal value represented via it's scale and unscaled value.\",\n"
+                    + "        \"fields\": [{\n"
+                    + "            \"name\": \"unscaledValue\",\n"
+                    + "            \"type\": {\n"
+                    + "                \"type\": \"bytes\",\n"
+                    + "                \"logicalType\": \"big-integer\"\n"
+                    + "            }\n"
+                    + "        }, {\n"
+                    + "            \"name\": \"scale\",\n"
+                    + "            \"type\": \"int\"\n"
+                    + "        }],\n"
+                    + "        \"logicalType\": \"big-decimal\"\n"
+                    + "    }, {\n"
+                    + "        \"type\": \"bytes\",\n"
+                    + "        \"logicalType\": \"big-integer\"\n"
+                    + "    }, {\n"
+                    + "        \"type\": \"fixed\",\n"
+                    + "        \"name\": \"timestamp\",\n"
+                    + "        \"doc\": \"Timestamp representing the number of milliseconds since January 1, 1970, 00:00:00 GMT\",\n"
+                    + "        \"size\": 8,\n"
+                    + "        \"logicalType\": \"timestamp\"\n"
+                    + "    }, {\n"
+                    + "        \"type\": \"fixed\",\n"
+                    + "        \"name\": \"uuid\",\n"
+                    + "        \"doc\": \"UUID serialized via two long values: It's most significant and least significant 64 bits.\",\n"
+                    + "        \"size\": 16,\n"
+                    + "        \"logicalType\": \"uuid\"\n"
+                    + "    }]\n"
+                    + "}";
+}

src/main/java/io/datanerds/avropatch/operation/Move.java

@@ -13,9 +13,9 @@ public final class Move implements Operation {
     public final Path from;
     public final Path path;
 
+    @SuppressWarnings("unused") // no arg constructor needed by Avro
     private Move() {
-        this.from = null;
-        this.path = null;
+        this(null, null);
     }
 
     /**

src/main/java/io/datanerds/avropatch/operation/Path.java

@@ -1,7 +1,6 @@
 package io.datanerds.avropatch.operation;
 
 import io.datanerds.avropatch.exception.InvalidPathException;
-import org.apache.avro.reflect.AvroSchema;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -16,7 +15,6 @@ public class Path {
 
     private static final Pattern VALID_PATTERN = Pattern.compile("[0-9a-zA-Z][0-9a-zA-Z_-]*");
 
-    @AvroSchema("{\"type\": \"array\", \"items\": \"string\"}")
     private final List<String> parts;
 
     private Path() {

src/main/java/io/datanerds/avropatch/operation/Remove.java

@@ -12,8 +12,9 @@ public final class Remove implements Operation {
     public static final String op = "remove";
     public final Path path;
 
+    @SuppressWarnings("unused") // no arg constructor needed by Avro
     private Remove() {
-        this.path = null;
+        this(null);
     }
 
     /**

src/main/java/io/datanerds/avropatch/operation/Replace.java

@@ -12,20 +12,20 @@ public final class Replace<T> implements Operation {
     @AvroIgnore
     public static final String op = "replace";
     public final Path path;
-    @AvroSchema(Value.SCHEMA)
+    @AvroSchema(DefaultSchema.VALUE)
     public final T value;
 
+    @SuppressWarnings("unused") // no arg constructor needed by Avro
     private Replace() {
-        this.path = null;
-        this.value = null;
+        this(null, null);
     }
 
     /**
      *
      * @param path Path pointing out where the JSON value should be replaced
      * @param value Actual value to <i>replace</i> in patched object
      *
-     * @see Value
+     * @see DefaultSchema
      */
     public Replace(Path path, T value) {
         this.path = path;

src/main/java/io/datanerds/avropatch/operation/Test.java

@@ -12,20 +12,20 @@ public final class Test<T> implements Operation {
     @AvroIgnore
     public static final String op = "test";
     public final Path path;
-    @AvroSchema(Value.SCHEMA)
+    @AvroSchema(DefaultSchema.VALUE)
     public final T value;
 
+    @SuppressWarnings("unused") // no arg constructor needed by Avro
     private Test() {
-        this.path = null;
-        this.value = null;
+        this(null, null);
     }
 
     /**
      *
      * @param path Path pointing out which JSON value should be tested against
      * @param value Actual value to <i>test</i> against
      *
-     * @see Value
+     * @see DefaultSchema
      */
     public Test(Path path, T value) {
         this.path = path;