DATACOUCH-290 - Upgrade to java-client 2.4.4

Original pull request: #136.

src/main/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentFactoryBean.java

@@ -52,6 +52,17 @@ import org.springframework.beans.factory.config.AbstractFactoryBean;
     eventBus
     systemMetricsCollectorConfig
     networkLatencyMetricsCollectorConfig
+    requestBufferWaitStrategy
+    sslKeystore
+    memcachedHashingStrategy
+    kvIoPool
+    queryIoPool
+    searchIoPool
+    viewIoPool
+    kvServiceConfig
+    queryServiceConfig
+    searchServiceConfig
+    viewServiceConfig
    */
 
   @Override
@@ -199,4 +210,8 @@ import org.springframework.beans.factory.config.AbstractFactoryBean;
   public void setMutationTokensEnabled(boolean mutationTokensEnabled) {
     this.couchbaseEnvBuilder.mutationTokensEnabled(mutationTokensEnabled);
   }
+
+  public void setAnalyticsTimeout(long analyticsTimeout) {
+    this.couchbaseEnvBuilder.analyticsTimeout(analyticsTimeout);
+  }
 }

src/main/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentNoShutdownProxy.java

@@ -19,7 +19,7 @@ package org.springframework.data.couchbase.config;
 import java.security.KeyStore;
 import java.util.concurrent.TimeUnit;
 
-import com.couchbase.client.core.env.WaitStrategyFactory;
+import com.couchbase.client.core.env.*;
 import com.couchbase.client.core.event.EventBus;
 import com.couchbase.client.core.metrics.MetricsCollector;
 import com.couchbase.client.core.metrics.NetworkLatencyMetricsCollector;
@@ -358,4 +358,34 @@ public class CouchbaseEnvironmentNoShutdownProxy implements CouchbaseEnvironment
   public MemcachedHashingStrategy memcachedHashingStrategy() {
     return delegate.memcachedHashingStrategy();
   }
+
+  @Override
+  public long analyticsTimeout() {
+    return delegate.analyticsTimeout();
+  }
+
+  @Override
+  public long configPollInterval() {
+    return delegate.configPollInterval();
+  }
+
+  @Override
+  public KeyValueServiceConfig kvServiceConfig() {
+    return delegate.kvServiceConfig();
+  }
+
+  @Override
+  public QueryServiceConfig queryServiceConfig() {
+    return delegate.queryServiceConfig();
+  }
+
+  @Override
+  public SearchServiceConfig searchServiceConfig() {
+    return delegate.searchServiceConfig();
+  }
+
+  @Override
+  public ViewServiceConfig viewServiceConfig() {
+    return delegate.viewServiceConfig();
+  }
 }

src/main/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentParser.java

@@ -64,6 +64,7 @@ import org.springframework.util.StringUtils;
  * <li>{@link DefaultCouchbaseEnvironment.Builder#bufferPoolingEnabled(boolean) bufferPoolingEnabled}</li>
  * <li>{@link DefaultCouchbaseEnvironment.Builder#tcpNodelayEnabled(boolean) tcpNodelayEnabled}</li>
  * <li>{@link DefaultCouchbaseEnvironment.Builder#mutationTokensEnabled(boolean) mutationTokensEnabled}</li>
+ * <li>{@link DefaultCouchbaseEnvironment.Builder#analyticsTimeout(long) analyticsTimeout}</li>
  * </ul>
  *
  * @author Simon Baslé
@@ -135,6 +136,7 @@ public class CouchbaseEnvironmentParser extends AbstractSingleBeanDefinitionPars
 		setPropertyValue(envDefinitionBuilder, envElement, "bufferPoolingEnabled", "bufferPoolingEnabled");
 		setPropertyValue(envDefinitionBuilder, envElement, "tcpNodelayEnabled", "tcpNodelayEnabled");
 		setPropertyValue(envDefinitionBuilder, envElement, "mutationTokensEnabled", "mutationTokensEnabled");
+		setPropertyValue(envDefinitionBuilder, envElement, "analyticsTimeout", "analyticsTimeout");
 
 		//retry strategy is particular, in the xsd this is an enum (FailFast, BestEffort)
 		setPropertyValue(envDefinitionBuilder, envElement, "retryStrategy", "retryStrategy");