Merge pull request #201 from marklogic/release/4.7

Release/4.7

Author: rjrudin

Jenkinsfile

@@ -14,7 +14,7 @@ pipeline{
   stages{
     stage('tests'){
       steps{
-        copyRPM 'Release','10.0-9.4'
+        copyRPM 'Release','11.1.0'
         setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
         sh label:'test', script: '''#!/bin/bash
           export JAVA_HOME=$JAVA_HOME_DIR

build.gradle

@@ -10,11 +10,11 @@ plugins {
 
 	// For deploying the test app.
 	id 'net.saliman.properties' version '1.5.2'
-	id "com.marklogic.ml-gradle" version "4.5.2"
+	id "com.marklogic.ml-gradle" version "4.6.1"
 }
 
 group = "com.marklogic"
-version = "4.6.0"
+version = "4.7.0"
 
 java {
 	sourceCompatibility = 1.8
@@ -24,33 +24,33 @@ java {
 repositories {
 	mavenLocal()
 	maven {
-		url "https://nexus.marklogic.com/repository/maven-snapshots/"
+		url "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
 	}
 	mavenCentral()
 }
 
 dependencies {
-	api 'com.marklogic:marklogic-client-api:6.3.0'
-	api 'com.marklogic:marklogic-xcc:11.0.3'
-	api 'org.springframework:spring-context:5.3.29'
+	api 'com.marklogic:marklogic-client-api:6.5.0'
+	api 'com.marklogic:marklogic-xcc:11.1.0'
+	api 'org.springframework:spring-context:5.3.31'
 
 	implementation 'org.jdom:jdom2:2.0.6.1'
 
-	implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
+	implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.3'
 
 	// This is currently an implementation dependency, though perhaps should be an api dependency due to its usage in
 	// LoggingObject; not clear yet on whether the protected Logger in that class should make this an api dependency or not
 	implementation 'org.slf4j:slf4j-api:1.7.36'
 
-	testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
-	testImplementation 'org.springframework:spring-test:5.3.29'
+	testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
+	testImplementation 'org.springframework:spring-test:5.3.31'
 	testImplementation 'org.mockito:mockito-core:4.11.0'
 
 	// Used for testing loading modules from the classpath
 	testImplementation files("lib/modules.jar")
 
 	// Forcing Spring to use logback instead of commons-logging
-	testImplementation "ch.qos.logback:logback-classic:1.3.5" // Not using 1.4.x yet as it requires Java 11
+	testImplementation "ch.qos.logback:logback-classic:1.3.14" // Not using 1.4.x yet as it requires Java 11
 	testImplementation "org.slf4j:jcl-over-slf4j:1.7.36"
 	testImplementation "org.slf4j:slf4j-api:1.7.36"
 
@@ -73,12 +73,12 @@ test {
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-	classifier 'sources'
+	archiveClassifier = 'sources'
 	from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-	classifier "javadoc"
+	archiveClassifier = "javadoc"
 	from javadoc
 }
 javadoc.failOnError = false

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/marklogic/client/ext/DatabaseClientConfig.java

@@ -49,6 +49,15 @@ public class DatabaseClientConfig {
 	private String cloudApiKey;
 	private String basePath;
 
+	private String keyStorePath;
+	private String keyStorePassword;
+	private String keyStoreType;
+	private String keyStoreAlgorithm;
+	private String trustStorePath;
+	private String trustStorePassword;
+	private String trustStoreType;
+	private String trustStoreAlgorithm;
+
 	public DatabaseClientConfig() {
 	}
 
@@ -236,4 +245,148 @@ public String getSamlToken() {
 	public void setSamlToken(String samlToken) {
 		this.samlToken = samlToken;
 	}
+
+	/**
+	 *
+	 * @return
+	 * @since 4.7.0
+	 */
+	public String getKeyStorePath() {
+		return keyStorePath;
+	}
+
+	/**
+	 *
+	 * @param keyStorePath
+	 * @since 4.7.0
+	 */
+	public void setKeyStorePath(String keyStorePath) {
+		this.keyStorePath = keyStorePath;
+	}
+
+	/**
+	 *
+	 * @return
+	 * @since 4.7.0
+	 */
+	public String getKeyStorePassword() {
+		return keyStorePassword;
+	}
+
+	/**
+	 *
+	 * @param keyStorePassword
+	 * @since 4.7.0
+	 */
+	public void setKeyStorePassword(String keyStorePassword) {
+		this.keyStorePassword = keyStorePassword;
+	}
+
+	/**
+	 *
+	 * @return
+	 * @since 4.7.0
+	 */
+	public String getKeyStoreType() {
+		return keyStoreType;
+	}
+
+	/**
+	 *
+	 * @param keyStoreType
+	 * @since 4.7.0
+	 */
+	public void setKeyStoreType(String keyStoreType) {
+		this.keyStoreType = keyStoreType;
+	}
+
+	/**
+	 *
+	 * @return
+	 * @since 4.7.0
+	 */
+	public String getKeyStoreAlgorithm() {
+		return keyStoreAlgorithm;
+	}
+
+	/**
+	 *
+	 * @param keyStoreAlgorithm
+	 * @since 4.7.0
+	 */
+	public void setKeyStoreAlgorithm(String keyStoreAlgorithm) {
+		this.keyStoreAlgorithm = keyStoreAlgorithm;
+	}
+
+	/**
+	 *
+	 * @return
+	 * @since 4.7.0
+	 */
+	public String getTrustStorePath() {
+		return trustStorePath;
+	}
+
+	/**
+	 *
+	 * @param trustStorePath
+	 * @since 4.7.0
+	 */
+	public void setTrustStorePath(String trustStorePath) {
+		this.trustStorePath = trustStorePath;
+	}
+
+	/**
+	 *
+	 * @return
+	 * @since 4.7.0
+	 */
+	public String getTrustStorePassword() {
+		return trustStorePassword;
+	}
+
+	/**
+	 *
+	 * @param trustStorePassword
+	 * @since 4.7.0
+	 */
+	public void setTrustStorePassword(String trustStorePassword) {
+		this.trustStorePassword = trustStorePassword;
+	}
+
+	/**
+	 *
+	 * @return
+	 * @since 4.7.0
+	 */
+	public String getTrustStoreType() {
+		return trustStoreType;
+	}
+
+	/**
+	 *
+	 * @param trustStoreType
+	 * @since 4.7.0
+	 */
+	public void setTrustStoreType(String trustStoreType) {
+		this.trustStoreType = trustStoreType;
+	}
+
+	/**
+	 *
+	 * @return
+	 * @since 4.7.0
+	 */
+	public String getTrustStoreAlgorithm() {
+		return trustStoreAlgorithm;
+	}
+
+	/**
+	 *
+	 * @param trustStoreAlgorithm
+	 * @since 4.7.0
+	 */
+	public void setTrustStoreAlgorithm(String trustStoreAlgorithm) {
+		this.trustStoreAlgorithm = trustStoreAlgorithm;
+	}
 }

src/main/java/com/marklogic/client/ext/DefaultConfiguredDatabaseClientFactory.java

@@ -48,7 +48,16 @@ public DatabaseClient newDatabaseClient(DatabaseClientConfig config) {
 			.withSAMLToken(config.getSamlToken())
 			.withCloudApiKey(config.getCloudApiKey())
 			.withSSLProtocol(config.getSslProtocol())
-			.withSSLHostnameVerifier(config.getSslHostnameVerifier());
+			.withSSLHostnameVerifier(config.getSslHostnameVerifier())
+			// The following 8 were added for 4.7.0 based on Java Client 6.5.0
+			.withKeyStorePath(config.getKeyStorePath())
+			.withKeyStorePassword(config.getKeyStorePassword())
+			.withKeyStoreType(config.getKeyStoreType())
+			.withKeyStoreAlgorithm(config.getKeyStoreAlgorithm())
+			.withTrustStorePath(config.getTrustStorePath())
+			.withTrustStorePassword(config.getTrustStorePassword())
+			.withTrustStoreType(config.getTrustStoreType())
+			.withTrustStoreAlgorithm(config.getTrustStoreAlgorithm());
 
 		if (config.getSecurityContextType() != null) {
 			builder.withAuthType(config.getSecurityContextType().name());

src/main/java/com/marklogic/client/ext/file/CollectionsFileDocumentFileProcessor.java

@@ -15,8 +15,6 @@
  */
 package com.marklogic.client.ext.file;
 
-import java.util.Properties;
-
 /**
  * Looks for a special file in each directory - defaults to collections.properties - that contains properties where the
  * key is the name of a file in the directory, and the value is a comma-delimited list of collections to load the file
@@ -34,18 +32,8 @@ public CollectionsFileDocumentFileProcessor(String propertiesFilename) {
 		super(propertiesFilename);
 	}
 
-	@Override
-	protected void processProperties(DocumentFile documentFile, Properties properties) {
-		String name = documentFile.getFile().getName();
-		if (properties.containsKey(name)) {
-			String value = getPropertyValue(properties, name);
-			documentFile.getDocumentMetadata().withCollections(value.split(delimiter));
-		}
-
-		if (properties.containsKey(WILDCARD_KEY)) {
-			String value = getPropertyValue(properties, WILDCARD_KEY);
-			documentFile.getDocumentMetadata().withCollections(value.split(delimiter));
-		}
+	protected void applyPropertyMatch(DocumentFile documentFile, String pattern, String value) {
+		documentFile.getDocumentMetadata().withCollections(value.split(delimiter));
 	}
 
 	public String getDelimiter() {

src/main/java/com/marklogic/client/ext/file/PermissionsFileDocumentFileProcessor.java

@@ -17,6 +17,10 @@
 
 import com.marklogic.client.ext.util.DocumentPermissionsParser;
 
+import java.nio.file.FileSystems;
+import java.nio.file.Path;
+import java.nio.file.PathMatcher;
+import java.util.Enumeration;
 import java.util.Properties;
 
 /**
@@ -46,26 +50,11 @@ public PermissionsFileDocumentFileProcessor(String propertiesFilename, DocumentP
 		this.documentPermissionsParser = documentPermissionsParser;
 	}
 
-	@Override
-	protected void processProperties(DocumentFile documentFile, Properties properties) {
-		String name = documentFile.getFile().getName();
-		if (properties.containsKey(name)) {
-			String value = getPropertyValue(properties, name);
-			if (documentPermissionsParser != null) {
-				documentPermissionsParser.parsePermissions(value, documentFile.getDocumentMetadata().getPermissions());
-			} else {
-				documentFile.getDocumentMetadata().getPermissions().addFromDelimitedString(value);
-			}
-
-		}
-
-		if (properties.containsKey(WILDCARD_KEY)) {
-			String value = getPropertyValue(properties, WILDCARD_KEY);
-			if (documentPermissionsParser != null) {
-				documentPermissionsParser.parsePermissions(value, documentFile.getDocumentMetadata().getPermissions());
-			} else {
-				documentFile.getDocumentMetadata().getPermissions().addFromDelimitedString(value);
-			}
+	protected void applyPropertyMatch(DocumentFile documentFile, String pattern, String value) {
+		if (documentPermissionsParser != null) {
+			documentPermissionsParser.parsePermissions(value, documentFile.getDocumentMetadata().getPermissions());
+		} else {
+			documentFile.getDocumentMetadata().getPermissions().addFromDelimitedString(value);
 		}
 	}