Merge pull request #90 from eclipse/json_provider

Defines a default class to provider JSON-B

Author: otaviojava

arangodb-driver/src/main/java/org/jnosql/diana/arangodb/key/ArangoDBBucketManager.java

@@ -20,10 +20,10 @@
 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;
-import javax.json.bind.JsonbBuilder;
 import java.time.Duration;
 import java.util.Objects;
 import java.util.Optional;
@@ -43,7 +43,7 @@ public class ArangoDBBucketManager implements BucketManager {
 
     private static final String VALUE = "_value";
     private static final Function<BaseDocument, String> TO_JSON = e -> e.getAttribute(VALUE).toString();
-    private static final Jsonb JSONB = JsonbBuilder.create();
+    private static final Jsonb JSONB = JsonbSupplier.getInstance().get();
 
     private final ArangoDB arangoDB;
 

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

@@ -24,10 +24,10 @@
 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;
-import javax.json.bind.JsonbBuilder;
 import java.time.Duration;
 import java.util.Objects;
 import java.util.Optional;
@@ -45,7 +45,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/DefaultJsonbSupplier.java

@@ -0,0 +1,54 @@
+/*
+ *  Copyright (c) 2017 Otávio Santana and others
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   and Apache License v2.0 which accompanies this distribution.
+ *   The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ *   and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
+ *
+ *   You may elect to redistribute this code under either of these licenses.
+ *
+ *   Contributors:
+ *
+ *   Otavio Santana
+ */
+package org.jnosql.diana.driver;
+
+import javax.json.bind.Jsonb;
+import javax.json.bind.JsonbBuilder;
+import javax.json.bind.JsonbConfig;
+import javax.json.bind.config.PropertyVisibilityStrategy;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+enum DefaultJsonbSupplier implements JsonbSupplier {
+
+    INSTANCE;
+
+    {
+        JsonbConfig config = new JsonbConfig().withPropertyVisibilityStrategy(new PrivateVisibilityStrategy());
+        this.json = JsonbBuilder.newBuilder().withConfig(config).build();
+    }
+
+    private final Jsonb json;
+
+    @Override
+    public Jsonb get() {
+        return json;
+    }
+
+
+    class PrivateVisibilityStrategy implements PropertyVisibilityStrategy {
+
+        @Override
+        public boolean isVisible(Field field) {
+            return true;
+        }
+
+        @Override
+        public boolean isVisible(Method method) {
+            return false;
+        }
+
+    }
+}

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

@@ -0,0 +1,34 @@
+/*
+ *  Copyright (c) 2017 Otávio Santana and others
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   and Apache License v2.0 which accompanies this distribution.
+ *   The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ *   and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
+ *
+ *   You may elect to redistribute this code under either of these licenses.
+ *
+ *   Contributors:
+ *
+ *   Otavio Santana
+ */
+package org.jnosql.diana.driver;
+
+import javax.json.bind.Jsonb;
+import java.util.function.Supplier;
+
+/**
+ * Defines a supplier to {@link Jsonb} already configured and ready to use in the drivers whose need a JSON processor.
+ */
+public interface JsonbSupplier extends Supplier<Jsonb> {
+
+    /**
+     * It returns a {@link JsonbSupplier} from {@link java.util.ServiceLoader} otherwise,
+     * it will return the default JsonbSupplier that reads from the field instead of the method.
+     *
+     * @return {@link JsonbSupplier} instance
+     */
+    static JsonbSupplier getInstance() {
+        return JsonbSupplierServiceLoader.getInstance();
+    }
+}

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

@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2017 Otávio Santana and others
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   and Apache License v2.0 which accompanies this distribution.
+ *   The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ *   and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
+ *
+ *   You may elect to redistribute this code under either of these licenses.
+ *
+ *   Contributors:
+ *
+ *   Otavio Santana
+ */
+package org.jnosql.diana.driver;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.ServiceLoader;
+import java.util.stream.StreamSupport;
+
+import static java.util.stream.Collectors.toList;
+
+final class JsonbSupplierServiceLoader {
+
+    private static final List<JsonbSupplier> LOADERS;
+
+    static final Optional<JsonbSupplier> INSTANCE;
+
+    static {
+        ServiceLoader<JsonbSupplier> serviceLoader = ServiceLoader.load(JsonbSupplier.class);
+        LOADERS = StreamSupport.stream(serviceLoader.spliterator(), false).collect(toList());
+        INSTANCE = LOADERS.stream().findFirst();
+    }
+
+    private JsonbSupplierServiceLoader() {
+    }
+
+    static JsonbSupplier getInstance() {
+        return INSTANCE.orElse(DefaultJsonbSupplier.INSTANCE);
+    }
+}

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

@@ -18,7 +18,6 @@
 import org.jnosql.diana.api.Value;
 
 import javax.json.bind.Jsonb;
-import javax.json.bind.JsonbBuilder;
 import java.util.Objects;
 
 
@@ -27,7 +26,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;
 

diana-driver-commons/src/test/java/org/jnosql/diana/driver/DefaultJsonBSupplierTest.java

@@ -0,0 +1,46 @@
+/*
+ *  Copyright (c) 2017 Otávio Santana and others
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   and Apache License v2.0 which accompanies this distribution.
+ *   The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ *   and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
+ *
+ *   You may elect to redistribute this code under either of these licenses.
+ *
+ *   Contributors:
+ *
+ *   Otavio Santana
+ */
+package org.jnosql.diana.driver;
+
+import org.junit.jupiter.api.Test;
+
+import javax.json.bind.Jsonb;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class DefaultJsonBSupplierTest {
+
+    @Test
+    public void shouldReturnDefaultInstance() {
+        assertNotNull(JsonbSupplier.getInstance());
+    }
+
+    @Test
+    public void shouldProvideJSON() {
+        JsonbSupplier supplier = JsonbSupplier.getInstance();
+        assertNotNull(supplier);
+        assertNotNull(supplier.get());
+    }
+
+    @Test
+    public void shouldReadFromField() {
+        Jsonb jsonb = JsonbSupplier.getInstance().get();
+        User user = new User("Ada", 32);
+        String json = jsonb.toJson(user);
+        assertNotNull(json);
+        assertEquals(user, jsonb.fromJson(json, User.class));
+    }
+}

diana-driver-commons/src/test/java/org/jnosql/diana/driver/User.java

@@ -0,0 +1,60 @@
+/*
+ *  Copyright (c) 2017 Otávio Santana and others
+ *   All rights reserved. This program and the accompanying materials
+ *   are made available under the terms of the Eclipse Public License v1.0
+ *   and Apache License v2.0 which accompanies this distribution.
+ *   The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ *   and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
+ *
+ *   You may elect to redistribute this code under either of these licenses.
+ *
+ *   Contributors:
+ *
+ *   Otavio Santana
+ */
+package org.jnosql.diana.driver;
+
+import java.util.Objects;
+
+public class User {
+
+    private String name;
+
+    private Integer age;
+
+    public User() {
+    }
+
+    public User(String name, Integer age) {
+        this.name = name;
+        this.age = age;
+    }
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof User)) {
+            return false;
+        }
+        User user = (User) o;
+        return Objects.equals(name, user.name) &&
+                Objects.equals(age, user.age);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(name, age);
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder("User{");
+        sb.append("name='").append(name).append('\'');
+        sb.append(", age=").append(age);
+        sb.append('}');
+        return sb.toString();
+    }
+}