optimzes set in factory

eclipse · Feb 21, 2018 · 0481377 · 0481377
1 parent 81522c3
commit 0481377
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...er/src/main/java/org/jnosql/diana/couchbase/key/DefaultCouchbaseBucketManagerFactory.java b/...er/src/main/java/org/jnosql/diana/couchbase/key/DefaultCouchbaseBucketManagerFactory.java
@@ -18,6 +18,7 @@
 import com.couchbase.client.java.CouchbaseCluster;
 import com.couchbase.client.java.datastructures.collections.CouchbaseArrayList;
 import com.couchbase.client.java.datastructures.collections.CouchbaseArraySet;
+import com.couchbase.client.java.document.json.JsonValue;
 import org.jnosql.diana.couchbase.util.CouchbaseClusterUtil;
 
 import java.util.List;
@@ -96,7 +97,7 @@ public <T> Queue<T> getQueue(String bucketName, Class<T> clazz) {
     public <T> Set<T> getSet(String bucketName, Class<T> clazz) {
         requireNonNull(bucketName, "bucketName is required");
         requireNonNull(clazz, "valueValue is required");
-        if (JsonValueCheck.checkType(clazz)) {
+        if (JsonValueCheck.checkType(clazz) && !JsonValue.class.isAssignableFrom(clazz)) {
             return new CouchbaseArraySet<>(bucketName + SET, getBucket(bucketName));
         } else {
             return new CouchbaseSet<>(getBucket(bucketName), bucketName, clazz);
@@ -133,7 +134,7 @@ public <T> Set<T> getSet(String bucketName, String key, Class<T> clazz) {
         requireNonNull(bucketName, "bucketName is required");
         requireNonNull(clazz, "valueValue is required");
         requireNonNull(key, "key is required");
-        if (JsonValueCheck.checkType(clazz)) {
+        if (JsonValueCheck.checkType(clazz) && !JsonValue.class.isAssignableFrom(clazz)) {
             return new CouchbaseArraySet<>(bucketName + SET, getBucket(key));
         } else {
             return new CouchbaseSet<>(getBucket(key), bucketName, clazz);