Spring/spring-data-couchbase
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACOUCH-389 - Update to Couchbase-Java-Client 2.6.0

Browse Source 
Added the new committed environment configurables to the xml based
configuration parser info. Also added couchbase FLE encryption library as bean
instantiation introspects class methods and fails with ClassNotFound
exception.

Original Pull Request: #165.
This commit is contained in:
Subhashni Balakrishnan
2018-07-12 11:29:09 -07:00
parent e5af0254ef
commit 076dcc0219
6 changed files with 75 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentFactoryBean.java
View File

@@ -63,6 +63,9 @@ import org.springframework.beans.factory.config.AbstractFactoryBean;
queryServiceConfig
searchServiceConfig
viewServiceConfig
cryptoManager
tracer
orphanResponseReporter
*/
@Override
@@ -210,4 +213,36 @@ import org.springframework.beans.factory.config.AbstractFactoryBean;
public void setAnalyticsTimeout(long analyticsTimeout) {
this.couchbaseEnvBuilder.analyticsTimeout(analyticsTimeout);
}
}
public void setConfigPollInterval(long configPollInterval) {
this.couchbaseEnvBuilder.configPollInterval(configPollInterval);
}
public void setConfigPollFloorInterval(long configPollFloorInterval) {
this.couchbaseEnvBuilder.configPollFloorInterval(configPollFloorInterval);
}
public void setCertAuthEnabled(boolean certAuthEnabled) {
this.couchbaseEnvBuilder.certAuthEnabled(certAuthEnabled);
}
public void setOperationTracingEnabled(boolean operationTracingEnabled) {
this.couchbaseEnvBuilder.operationTracingEnabled(operationTracingEnabled);
}
public void setOperationTracingServerDurationEnabled(boolean operationTracingServerDurationEnabled) {
this.couchbaseEnvBuilder.operationTracingServerDurationEnabled(operationTracingServerDurationEnabled);
}
public void setOrphanResponseReportingEnabled(boolean orphanResponseReportingEnabled) {
this.couchbaseEnvBuilder.orphanResponseReportingEnabled(orphanResponseReportingEnabled);
}
public void setCompressionMinSize(int compressionMinSize) {
this.couchbaseEnvBuilder.compressionMinSize(compressionMinSize);
}
public void setCompressionMinRatio(double compressionMinRatio) {
this.couchbaseEnvBuilder.compressionMinRatio(compressionMinRatio);
}
}

8
src/main/java/org/springframework/data/couchbase/config/CouchbaseEnvironmentParser.java
View File

@@ -135,6 +135,14 @@ public class CouchbaseEnvironmentParser extends AbstractSingleBeanDefinitionPars
setPropertyValue(envDefinitionBuilder, envElement, "tcpNodelayEnabled", "tcpNodelayEnabled");
setPropertyValue(envDefinitionBuilder, envElement, "mutationTokensEnabled", "mutationTokensEnabled");
setPropertyValue(envDefinitionBuilder, envElement, "analyticsTimeout", "analyticsTimeout");
setPropertyValue(envDefinitionBuilder, envElement, "configPollInterval", "configPollInterval");
setPropertyValue(envDefinitionBuilder, envElement, "configPollFloorInterval", "configPollFloorInterval");
setPropertyValue(envDefinitionBuilder, envElement, "certAuthEnabled", "certAuthEnabled");
setPropertyValue(envDefinitionBuilder, envElement, "operationTracingEnabled", "operationTracingEnabled");
setPropertyValue(envDefinitionBuilder, envElement, "operationTracingServerDurationEnabled", "operationTracingServerDurationEnabled");
setPropertyValue(envDefinitionBuilder, envElement, "orphanResponseReportingEnabled", "orphanResponseReportingEnabled");
setPropertyValue(envDefinitionBuilder, envElement, "compressionMinSize", "compressionMinSize");
setPropertyValue(envDefinitionBuilder, envElement, "compressionMinRatio", "compressionMinRatio");
//retry strategy is particular, in the xsd this is an enum (FailFast, BestEffort)
setPropertyValue(envDefinitionBuilder, envElement, "retryStrategy", "retryStrategy");