From 9da08b8eb588968da39414162ab6e754bf8d5a89 Mon Sep 17 00:00:00 2001
From: slinkydeveloper <francescoguard@gmail.com>
Date: Tue, 4 Jun 2019 15:00:45 +0200
Subject: [PATCH] Moved JsonCodec interfaces to io.vertx.core.spi.json

Signed-off-by: slinkydeveloper <francescoguard@gmail.com>
---
 src/main/asciidoc/override/json.adoc                         | 4 ++--
 src/main/java/io/vertx/core/json/JsonCodecLoader.java        | 1 +
 src/main/java/io/vertx/core/{ => spi}/json/JsonCodec.java    | 5 ++++-
 src/main/java/io/vertx/core/{ => spi}/json/JsonDecoder.java  | 5 ++++-
 src/main/java/io/vertx/core/{ => spi}/json/JsonEncoder.java  | 5 ++++-
 src/test/java/io/vertx/core/json/codecs/MyBooleanPojo.java   | 2 +-
 src/test/java/io/vertx/core/json/codecs/MyDoublePojo.java    | 2 +-
 src/test/java/io/vertx/core/json/codecs/MyFloatPojo.java     | 2 +-
 src/test/java/io/vertx/core/json/codecs/MyIntegerPojo.java   | 2 +-
 src/test/java/io/vertx/core/json/codecs/MyJsonArrayPojo.java | 3 +--
 .../java/io/vertx/core/json/codecs/MyJsonObjectPojo.java     | 2 +-
 src/test/java/io/vertx/core/json/codecs/MyLongPojo.java      | 2 +-
 src/test/java/io/vertx/core/json/codecs/MyShortPojo.java     | 2 +-
 ....core.json.JsonCodec => io.vertx.core.spi.json.JsonCodec} | 0
 14 files changed, 23 insertions(+), 14 deletions(-)
 rename src/main/java/io/vertx/core/{ => spi}/json/JsonCodec.java (86%)
 rename src/main/java/io/vertx/core/{ => spi}/json/JsonDecoder.java (88%)
 rename src/main/java/io/vertx/core/{ => spi}/json/JsonEncoder.java (88%)
 rename src/test/resources/META-INF/services/{io.vertx.core.json.JsonCodec => io.vertx.core.spi.json.JsonCodec} (100%)

diff --git a/src/main/asciidoc/override/json.adoc b/src/main/asciidoc/override/json.adoc
index ad08e232f..c0b7a2a98 100644
--- a/src/main/asciidoc/override/json.adoc
+++ b/src/main/asciidoc/override/json.adoc
@@ -119,7 +119,7 @@ You use {@link io.vertx.core.json.JsonArray#encode} to encode the array to a Str
 
 === JsonCodec
 
-If you want to define a custom way to encode and decode Json, you can define a {@link io.vertx.core.json.JsonCodec} for it.
+If you want to define a custom way to encode and decode Json, you can define a {@link io.vertx.core.spi.json.JsonCodec} for it.
 A `JsonCodec` for type `X` is a concrete class that implements the interface `JsonCodec<X, J>`, where `J` must be any of these:
 
 * `JsonArray` or `JsonObject`
@@ -128,4 +128,4 @@ A `JsonCodec` for type `X` is a concrete class that implements the interface `Js
 * `Boolean`
 
 These `JsonCodec`s can be used in several components of Vert.x stack, like in vertx-web-client, using the SPI
-`io.vertx.core.json.JsonCodec`.
+`io.vertx.core.spi.json.JsonCodec`.
diff --git a/src/main/java/io/vertx/core/json/JsonCodecLoader.java b/src/main/java/io/vertx/core/json/JsonCodecLoader.java
index f1ef8fb80..70761f9d6 100644
--- a/src/main/java/io/vertx/core/json/JsonCodecLoader.java
+++ b/src/main/java/io/vertx/core/json/JsonCodecLoader.java
@@ -1,6 +1,7 @@
 package io.vertx.core.json;
 
 import io.vertx.core.buffer.Buffer;
+import io.vertx.core.spi.json.JsonCodec;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/io/vertx/core/json/JsonCodec.java b/src/main/java/io/vertx/core/spi/json/JsonCodec.java
similarity index 86%
rename from src/main/java/io/vertx/core/json/JsonCodec.java
rename to src/main/java/io/vertx/core/spi/json/JsonCodec.java
index 737d796fc..3b55856b9 100644
--- a/src/main/java/io/vertx/core/json/JsonCodec.java
+++ b/src/main/java/io/vertx/core/spi/json/JsonCodec.java
@@ -1,4 +1,7 @@
-package io.vertx.core.json;
+package io.vertx.core.spi.json;
+
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
 
 /**
  * This interface represents the Vert.x json representation of TARGET_TYPE. <br/>
diff --git a/src/main/java/io/vertx/core/json/JsonDecoder.java b/src/main/java/io/vertx/core/spi/json/JsonDecoder.java
similarity index 88%
rename from src/main/java/io/vertx/core/json/JsonDecoder.java
rename to src/main/java/io/vertx/core/spi/json/JsonDecoder.java
index ea4ae9a14..842793263 100644
--- a/src/main/java/io/vertx/core/json/JsonDecoder.java
+++ b/src/main/java/io/vertx/core/spi/json/JsonDecoder.java
@@ -1,4 +1,7 @@
-package io.vertx.core.json;
+package io.vertx.core.spi.json;
+
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
 
 /**
  * Primitive for conversion JSON_TYPE -> TARGET_TYPE <br/>
diff --git a/src/main/java/io/vertx/core/json/JsonEncoder.java b/src/main/java/io/vertx/core/spi/json/JsonEncoder.java
similarity index 88%
rename from src/main/java/io/vertx/core/json/JsonEncoder.java
rename to src/main/java/io/vertx/core/spi/json/JsonEncoder.java
index 852022e74..201f9ac99 100644
--- a/src/main/java/io/vertx/core/json/JsonEncoder.java
+++ b/src/main/java/io/vertx/core/spi/json/JsonEncoder.java
@@ -1,4 +1,7 @@
-package io.vertx.core.json;
+package io.vertx.core.spi.json;
+
+import io.vertx.core.json.JsonArray;
+import io.vertx.core.json.JsonObject;
 
 /**
  * Primitive for conversion TARGET_TYPE -> JSON_TYPE<br/>
diff --git a/src/test/java/io/vertx/core/json/codecs/MyBooleanPojo.java b/src/test/java/io/vertx/core/json/codecs/MyBooleanPojo.java
index c72b74532..4e9542943 100644
--- a/src/test/java/io/vertx/core/json/codecs/MyBooleanPojo.java
+++ b/src/test/java/io/vertx/core/json/codecs/MyBooleanPojo.java
@@ -1,6 +1,6 @@
 package io.vertx.core.json.codecs;
 
-import io.vertx.core.json.JsonCodec;
+import io.vertx.core.spi.json.JsonCodec;
 
 import java.util.Objects;
 
diff --git a/src/test/java/io/vertx/core/json/codecs/MyDoublePojo.java b/src/test/java/io/vertx/core/json/codecs/MyDoublePojo.java
index 4fdb41457..d300d0b8d 100644
--- a/src/test/java/io/vertx/core/json/codecs/MyDoublePojo.java
+++ b/src/test/java/io/vertx/core/json/codecs/MyDoublePojo.java
@@ -1,6 +1,6 @@
 package io.vertx.core.json.codecs;
 
-import io.vertx.core.json.JsonCodec;
+import io.vertx.core.spi.json.JsonCodec;
 
 import java.util.Objects;
 
diff --git a/src/test/java/io/vertx/core/json/codecs/MyFloatPojo.java b/src/test/java/io/vertx/core/json/codecs/MyFloatPojo.java
index 3bf82c4d0..0e1fd8850 100644
--- a/src/test/java/io/vertx/core/json/codecs/MyFloatPojo.java
+++ b/src/test/java/io/vertx/core/json/codecs/MyFloatPojo.java
@@ -1,6 +1,6 @@
 package io.vertx.core.json.codecs;
 
-import io.vertx.core.json.JsonCodec;
+import io.vertx.core.spi.json.JsonCodec;
 
 import java.util.Objects;
 
diff --git a/src/test/java/io/vertx/core/json/codecs/MyIntegerPojo.java b/src/test/java/io/vertx/core/json/codecs/MyIntegerPojo.java
index 76962e9aa..702d1999a 100644
--- a/src/test/java/io/vertx/core/json/codecs/MyIntegerPojo.java
+++ b/src/test/java/io/vertx/core/json/codecs/MyIntegerPojo.java
@@ -1,6 +1,6 @@
 package io.vertx.core.json.codecs;
 
-import io.vertx.core.json.JsonCodec;
+import io.vertx.core.spi.json.JsonCodec;
 
 import java.util.Objects;
 
diff --git a/src/test/java/io/vertx/core/json/codecs/MyJsonArrayPojo.java b/src/test/java/io/vertx/core/json/codecs/MyJsonArrayPojo.java
index 843bcb5ae..32246782b 100644
--- a/src/test/java/io/vertx/core/json/codecs/MyJsonArrayPojo.java
+++ b/src/test/java/io/vertx/core/json/codecs/MyJsonArrayPojo.java
@@ -1,9 +1,8 @@
 package io.vertx.core.json.codecs;
 
-import io.vertx.core.json.JsonCodec;
+import io.vertx.core.spi.json.JsonCodec;
 import io.vertx.core.json.JsonArray;
 
-import java.util.Arrays;
 import java.util.Objects;
 
 public class MyJsonArrayPojo {
diff --git a/src/test/java/io/vertx/core/json/codecs/MyJsonObjectPojo.java b/src/test/java/io/vertx/core/json/codecs/MyJsonObjectPojo.java
index 7939fb1d8..b69e919bb 100644
--- a/src/test/java/io/vertx/core/json/codecs/MyJsonObjectPojo.java
+++ b/src/test/java/io/vertx/core/json/codecs/MyJsonObjectPojo.java
@@ -1,6 +1,6 @@
 package io.vertx.core.json.codecs;
 
-import io.vertx.core.json.JsonCodec;
+import io.vertx.core.spi.json.JsonCodec;
 import io.vertx.core.json.JsonObject;
 
 import java.util.Objects;
diff --git a/src/test/java/io/vertx/core/json/codecs/MyLongPojo.java b/src/test/java/io/vertx/core/json/codecs/MyLongPojo.java
index 5be185c9e..2a4bf0627 100644
--- a/src/test/java/io/vertx/core/json/codecs/MyLongPojo.java
+++ b/src/test/java/io/vertx/core/json/codecs/MyLongPojo.java
@@ -1,6 +1,6 @@
 package io.vertx.core.json.codecs;
 
-import io.vertx.core.json.JsonCodec;
+import io.vertx.core.spi.json.JsonCodec;
 
 import java.util.Objects;
 
diff --git a/src/test/java/io/vertx/core/json/codecs/MyShortPojo.java b/src/test/java/io/vertx/core/json/codecs/MyShortPojo.java
index 926c85d79..b2320d577 100644
--- a/src/test/java/io/vertx/core/json/codecs/MyShortPojo.java
+++ b/src/test/java/io/vertx/core/json/codecs/MyShortPojo.java
@@ -1,6 +1,6 @@
 package io.vertx.core.json.codecs;
 
-import io.vertx.core.json.JsonCodec;
+import io.vertx.core.spi.json.JsonCodec;
 
 import java.util.Objects;
 
diff --git a/src/test/resources/META-INF/services/io.vertx.core.json.JsonCodec b/src/test/resources/META-INF/services/io.vertx.core.spi.json.JsonCodec
similarity index 100%
rename from src/test/resources/META-INF/services/io.vertx.core.json.JsonCodec
rename to src/test/resources/META-INF/services/io.vertx.core.spi.json.JsonCodec