Add defaultBucket option to JDBC and url parameters

Author: kornilova203

driver/src/main/java/com/intellij/CouchbaseClientURI.java

@@ -20,7 +20,7 @@ class CouchbaseClientURI {
     private static final String HTTPS_SCHEMA = "couchbases://";
 
     private static final Set<String> JDBC_KEYS = new HashSet<>(ContainerUtil.map(
-        Arrays.asList(USER, PASSWORD, ENABLE_SSL, VERIFY_SERVER_CERTIFICATE),
+        Arrays.asList(USER, PASSWORD, ENABLE_SSL, VERIFY_SERVER_CERTIFICATE, DEFAULT_BUCKET),
         key -> key.toLowerCase(Locale.ENGLISH)));
 
     private final String connectionString;
@@ -63,7 +63,7 @@ public CouchbaseClientURI(@NotNull String uri, @Nullable Properties info) {
         this.verifyServerCert = isTrue(getOption(info, options, VERIFY_SERVER_CERTIFICATE,
                 VERIFY_SERVER_CERTIFICATE_DEFAULT));
         this.hosts = serverPart;
-        this.defaultBucket = nsPart;
+        this.defaultBucket = nsPart != null && !nsPart.isEmpty() ? nsPart : getOption(info, options, DEFAULT_BUCKET, null);
         this.connectionString = createConnectionString(serverPart, options);
     }
 

driver/src/main/java/com/intellij/DriverPropertyInfoHelper.java

@@ -25,10 +25,13 @@ public class DriverPropertyInfoHelper {
     public static final String META_SAMPLING_SIZE = "meta.sampling.size";
     public static final int META_SAMPLING_SIZE_DEFAULT = 1000;
 
+    public static final String DEFAULT_BUCKET = "defaultBucket";
+
 
     public static DriverPropertyInfo[] getPropertyInfo() {
         ArrayList<DriverPropertyInfo> propInfos = new ArrayList<>();
 
+        addPropInfo(propInfos, DEFAULT_BUCKET, "", "If you are connecting to a pre Couchbase 6.5 cluster, a default bucket must be specified in order to properly initialize the connection.", null);
         addPropInfo(propInfos, ENABLE_SSL, ENABLE_SSL_DEFAULT, "Enable ssl.", BOOL_CHOICES);
         addPropInfo(propInfos, VERIFY_SERVER_CERTIFICATE, VERIFY_SERVER_CERTIFICATE_DEFAULT,
                 "Configure a connection that uses SSL but does not verify the identity of the server.",

driver/src/test/com/intellij/CouchbaseClientURITest.java

@@ -125,4 +125,25 @@ public void testDefaultBucketWithOptions() {
         assertEquals("default", uri.getDefaultBucket());
         assertEquals("localhost:9042?kv.timeout=123s&retry=exponential", uri.getConnectionString());
     }
+
+    @Test
+    public void testDefaultBucketInProperties() {
+        Properties properties = new Properties();
+        properties.put("defaultBucket", "default");
+        CouchbaseClientURI uri = new CouchbaseClientURI(
+            "jdbc:couchbase:localhost:9042",
+            properties);
+        assertEquals("default", uri.getDefaultBucket());
+        assertEquals("localhost:9042", uri.getConnectionString());
+    }
+
+    @Test
+    public void testDefaultBucketInUrlParameters() {
+        Properties properties = new Properties();
+        CouchbaseClientURI uri = new CouchbaseClientURI(
+            "jdbc:couchbase:localhost:9042?defaultBucket=default",
+            properties);
+        assertEquals("default", uri.getDefaultBucket());
+        assertEquals("localhost:9042?", uri.getConnectionString());
+    }
 }