fixes imports

Author: otaviojava

couchbase-driver/src/main/java/org/jnosql/diana/couchbase/key/CouchbaseBucketManager.java

@@ -24,6 +24,7 @@
 import org.jnosql.diana.api.Value;
 import org.jnosql.diana.api.key.BucketManager;
 import org.jnosql.diana.api.key.KeyValueEntity;
+import org.jnosql.diana.driver.JsonbSupplier;
 import org.jnosql.diana.driver.ValueJSON;
 
 import javax.json.bind.Jsonb;
@@ -45,7 +46,7 @@ public class CouchbaseBucketManager implements BucketManager {
 
     private static final Logger LOGGER = Logger.getLogger(CouchbaseBucketManager.class.getName());
 
-    private static final Jsonb JSONB = JsonbBuilder.create();
+    private static final Jsonb JSONB = JsonbSupplier.getInstance().get();
 
     private final Bucket bucket;
 

couchbase-driver/src/main/java/org/jnosql/diana/couchbase/key/CouchbaseCollection.java

@@ -15,13 +15,14 @@
 package org.jnosql.diana.couchbase.key;
 
 
+import org.jnosql.diana.driver.JsonbSupplier;
+
 import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
 import java.util.function.Function;
 
 abstract class CouchbaseCollection<T> {
 
-    protected static final Jsonb JSONB = JsonbBuilder.create();
+    protected static final Jsonb JSONB = JsonbSupplier.getInstance().get();
 
     protected final Class<T> clazz;
 

couchbase-driver/src/main/java/org/jnosql/diana/couchbase/key/CouchbaseMap.java

@@ -17,9 +17,9 @@
 import com.couchbase.client.java.Bucket;
 import com.couchbase.client.java.document.json.JsonObject;
 import org.jnosql.diana.api.Value;
+import org.jnosql.diana.driver.JsonbSupplier;
 
 import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -42,7 +42,7 @@
  */
 class CouchbaseMap<K, V> implements Map<K, V> {
 
-    private static final Jsonb JSONB = JsonbBuilder.create();
+    private static final Jsonb JSONB = JsonbSupplier.getInstance().get();
 
 
     private final String bucketName;

diana-driver-commons/src/main/java/org/jnosql/diana/driver/ValueJSON.java

@@ -27,7 +27,7 @@
  */
 public class ValueJSON implements Value {
 
-    private static final Jsonb JSONB = JsonbBuilder.create();
+    private static final Jsonb JSONB = JsonbSupplier.getInstance().get();
 
     private final String json;
 

elasticsearch-driver/src/main/java/org/jnosql/diana/elasticsearch/document/DefaultElasticsearchDocumentCollectionManagerAsync.java

@@ -31,8 +31,6 @@
 import org.jnosql.diana.api.document.DocumentEntity;
 import org.jnosql.diana.api.document.DocumentQuery;
 
-import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.List;
@@ -45,8 +43,6 @@
 
 class DefaultElasticsearchDocumentCollectionManagerAsync implements ElasticsearchDocumentCollectionManagerAsync {
 
-    protected static final Jsonb JSONB = JsonbBuilder.create();
-
     private static final Consumer<DocumentEntity> NOOP = e -> {
     };
 

redis-driver/src/main/java/org/jnosql/diana/redis/key/DefaultRedisBucketManagerFactory.java

@@ -14,10 +14,10 @@
  */
 package org.jnosql.diana.redis.key;
 
+import org.jnosql.diana.driver.JsonbSupplier;
 import redis.clients.jedis.JedisPool;
 
 import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
@@ -27,7 +27,7 @@
 
 class DefaultRedisBucketManagerFactory implements RedisBucketManagerFactory {
 
-    private static final Jsonb JSON = JsonbBuilder.create();
+    private static final Jsonb JSON = JsonbSupplier.getInstance().get();
 
     private final JedisPool jedisPool;