fixes bucket factory

Author: otaviojava

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

@@ -67,6 +67,12 @@ public <K, V> Map<K, V> getMap(String bucketName, Class<K> keyValue, Class<V> va
         requireNonNull(bucketName, "bucketName is required");
         requireNonNull(valueValue, "valueValue is required");
         requireNonNull(keyValue, "keyValue is required");
+
+        if(!String.class.isAssignableFrom(keyValue)) {
+            throw new UnsupportedOperationException("Couchbase Map does not support a not String key instead of: "
+            + keyValue);
+        }
+
         return new CouchbaseMap<>(getBucket(bucketName), bucketName, keyValue, valueValue);
     }
 
@@ -77,6 +83,17 @@ public <K, V> Map<K, V> getMap(String bucketName, String key, Class<K> keyValue,
         requireNonNull(key, "key is required");
         requireNonNull(valueValue, "valueValue is required");
         requireNonNull(keyValue, "keyValue is required");
+
+        if(!String.class.isAssignableFrom(keyValue)) {
+            throw new UnsupportedOperationException("Couchbase Map does not support a not String key instead of: "
+                    + keyValue);
+        }
+
+        if (JsonValueCheck.checkType(valueValue)) {
+            return (Map<K, V>)
+                    new com.couchbase.client.java.datastructures.collections.CouchbaseMap<V>(key, getBucket(bucketName));
+        }
+
         return new CouchbaseMap<>(getBucket(bucketName), key, keyValue, valueValue);
     }
 
@@ -121,7 +138,7 @@ public <T> Queue<T> getQueue(String bucketName, String key, Class<T> clazz) {
         requireNonNull(clazz, "valueValue is required");
         requireNonNull(key, "key is required");
         if (JsonValueCheck.checkType(clazz)) {
-            return new com.couchbase.client.java.datastructures.collections.CouchbaseQueue<>(bucketName + QUEUE,
+            return new com.couchbase.client.java.datastructures.collections.CouchbaseQueue<>(key + QUEUE,
                     getBucket(bucketName));
         } else {
             return new CouchbaseQueue<>(getBucket(bucketName), key, clazz);
@@ -135,7 +152,7 @@ public <T> Set<T> getSet(String bucketName, String key, Class<T> clazz) {
         requireNonNull(clazz, "valueValue is required");
         requireNonNull(key, "key is required");
         if (JsonValueCheck.checkType(clazz) && !JsonValue.class.isAssignableFrom(clazz)) {
-            return new CouchbaseArraySet<>(bucketName + SET, getBucket(key));
+            return new CouchbaseArraySet<>(key + SET, getBucket(key));
         } else {
             return new CouchbaseSet<>(getBucket(key), bucketName, clazz);
         }
@@ -148,7 +165,7 @@ public <T> List<T> getList(String bucketName, String key, Class<T> clazz) {
         requireNonNull(clazz, "valueValue is required");
         requireNonNull(key, "key is required");
         if (JsonValueCheck.checkType(clazz)) {
-            return new CouchbaseArrayList<>(bucketName + LIST, getBucket(key));
+            return new CouchbaseArrayList<>(key + LIST, getBucket(key));
         } else {
             return new CouchbaseList<>(getBucket(bucketName), key, clazz);
         }