Merge pull request #192 from paxtonhare/prep-okhttp

support for marklogic-client-api 4.0.2

Author: rjrudin

.travis.yml

@@ -1,6 +1,6 @@
 language: java
 jdk:
-  - oraclejdk7
+  - oraclejdk8
 sudo: true
 before_install:
   - echo 'America/Los_Angeles' | sudo tee /etc/timezone
@@ -13,4 +13,5 @@ script:
 #whitelist
 branches:
   only:
+    - master
     - dev

build.gradle

@@ -4,11 +4,11 @@ plugins {
   id "eclipse"
   id "idea"
   id "com.jfrog.bintray" version "1.5"
-	id "com.github.jk1.dependency-license-report" version "0.3.11"
+  id "com.github.jk1.dependency-license-report" version "0.3.11"
 }
 
-sourceCompatibility = "1.7"
-targetCompatibility = "1.7"
+sourceCompatibility = "1.8"
+targetCompatibility = "1.8"
 
 repositories {
   jcenter()
@@ -24,10 +24,10 @@ dependencies {
   testCompile ('com.marklogic:ml-junit:3.0-alpha1')
   testCompile('commons-io:commons-io:2.5')
 
-	// Forcing Spring to use logback instead of commons-logging
-	runtime "ch.qos.logback:logback-classic:1.1.8"
-	runtime group: "org.slf4j", name: "jcl-over-slf4j", version: "1.7.22"
-	runtime group: "org.slf4j", name: "slf4j-api", version: "1.7.22"
+  // Forcing Spring to use logback instead of commons-logging
+  runtime "ch.qos.logback:logback-classic:1.1.8"
+  runtime group: "org.slf4j", name: "jcl-over-slf4j", version: "1.7.22"
+  runtime group: "org.slf4j", name: "slf4j-api", version: "1.7.22"
 }
 
 // This ensures that Gradle includes in the published jar any non-java files under src/main/java
@@ -70,3 +70,10 @@ if (project.hasProperty("myBintrayUser")) {
     }
   }
 }
+
+test {
+  testLogging {
+    events 'started','passed', 'skipped', 'failed'
+    exceptionFormat 'full'
+  }
+}

shared/dev-tasks/travis-install-ml.sh

@@ -16,14 +16,14 @@ set | grep TRAVIS
 test $1 && arg1=$1
 if [[ $arg1 = 'release' ]]; then
   ver=${ML_VERSION}
-  fname=MarkLogic-RHEL6-${ver}.x86_64.rpm
+  fname=MarkLogic-${ver}.x86_64.rpm
   fnamedeb="marklogic_"
   fnamedeb=$fnamedeb$ver
   suff="_amd64.deb"
   fnamedeb=$fnamedeb$suff
 
   curl -c cookies.txt --data "email=${MLBUILD_USER}&password=${MLBUILD_PASSWORD}" https://developer.marklogic.com/login
-  dl_link=$(curl -b cookies.txt --data "download=/download/binaries/8.0/${fname}" https://developer.marklogic.com/get-download-url | perl -pe 's/.*"path":"([^"]+).*/\1/')
+  dl_link=$(curl -b cookies.txt --data "download=/download/binaries/9.0/${fname}" https://developer.marklogic.com/get-download-url | perl -pe 's/.*"path":"([^"]+).*/\1/')
   url="https://developer.marklogic.com${dl_link}"
 
   echo "********* Downloading MarkLogic $ver"
@@ -45,7 +45,7 @@ else
   # if the user passed a day string as a param then use it instead
   test $1 && day=$1
   # make a version number out of the date
-  ver="8.0-$day"
+  ver="9.0-$day"
 
   echo "********* Downloading MarkLogic nightly $ver"
 
@@ -56,7 +56,7 @@ else
   suff="_amd64.deb"
   fnamedeb=$fnamedeb$suff
 
-  url="https://root.marklogic.com/nightly/builds/linux64/rh6-intel64-80-test-1.marklogic.com/b8_0/pkgs.$day/$fname"
+  url="https://root.marklogic.com/nightly/builds/linux64-rh7/rh7v-intel64-90-test-build.marklogic.com/b9_0/pkgs.$day/$fname"
 
   status=$(curl -k --anyauth -u $MLBUILD_USER:$MLBUILD_PASSWORD --head --write-out %{http_code} --silent --output /dev/null $url)
   if [[ $status = 200 ]]; then

src/main/java/com/marklogic/appdeployer/command/modules/AllButAssetsModulesFinder.java

@@ -3,12 +3,10 @@
 import com.marklogic.client.ext.modulesloader.Modules;
 import com.marklogic.client.ext.modulesloader.impl.BaseModulesFinder;
 
-import java.io.File;
-
 public class AllButAssetsModulesFinder extends BaseModulesFinder {
 
     @Override
-    public Modules findModules(File baseDir) {
+    protected Modules findModulesWithResolvedBaseDir(String baseDir) {
         Modules modules = new Modules();
         addNamespaces(modules, baseDir);
         addOptions(modules, baseDir);

src/main/java/com/marklogic/appdeployer/command/modules/AssetModulesFinder.java

@@ -3,12 +3,10 @@
 import com.marklogic.client.ext.modulesloader.Modules;
 import com.marklogic.client.ext.modulesloader.impl.BaseModulesFinder;
 
-import java.io.File;
-
 public class AssetModulesFinder extends BaseModulesFinder {
 
     @Override
-    public Modules findModules(File baseDir) {
+    protected Modules findModulesWithResolvedBaseDir(String baseDir) {
         Modules modules = new Modules();
         addAssetDirectories(modules, baseDir);
         return modules;

src/main/java/com/marklogic/appdeployer/command/modules/LoadModulesCommand.java

@@ -63,12 +63,12 @@ protected void loadModulesIntoMainServer(CommandContext context) {
 		try {
 			for (String modulesPath : config.getModulePaths()) {
 				logger.info("Loading asset modules from dir: " + modulesPath);
-				modulesLoader.loadModules(new File(modulesPath), new AssetModulesFinder(), client);
+				modulesLoader.loadModules(modulesPath, new AssetModulesFinder(), client);
 			}
 
 			for (String modulesPath : config.getModulePaths()) {
 				logger.info("Loading all non-asset modules from dir: " + modulesPath);
-				modulesLoader.loadModules(new File(modulesPath), new AllButAssetsModulesFinder(), client);
+				modulesLoader.loadModules(modulesPath, new AllButAssetsModulesFinder(), client);
 			}
 		} finally {
 			client.release();
@@ -88,7 +88,7 @@ protected void loadModulesIntoTestServer(CommandContext context) {
 		try {
 			for (String modulesPath : config.getModulePaths()) {
 				logger.info("Loading modules into test server from dir: " + modulesPath);
-				testLoader.loadModules(new File(modulesPath), new TestServerModulesFinder(), client);
+				testLoader.loadModules(modulesPath, new TestServerModulesFinder(), client);
 			}
 		} finally {
 			client.release();

src/main/java/com/marklogic/appdeployer/util/ModulesWatcher.java

@@ -49,7 +49,7 @@ public void run() {
 		ModulesFinder finder = new DefaultModulesFinder();
 		while (true) {
 			for (String modulesPath : paths) {
-				loader.loadModules(new File(modulesPath), finder, client);
+				loader.loadModules(modulesPath, finder, client);
 			}
 			try {
 				Thread.sleep(sleepTime);

src/test/java/com/marklogic/appdeployer/command/es/GenerateModelArtifactsTest.java

@@ -13,7 +13,6 @@
 
 import java.io.File;
 
-@Ignore("Ignoring until ML9 is released")
 public class GenerateModelArtifactsTest extends AbstractAppDeployerTest {
 
 	@After

src/test/java/com/marklogic/appdeployer/export/ExportAmpsTest.java

@@ -22,15 +22,15 @@ public class ExportAmpsTest extends AbstractExportTest {
 	public void test() throws Exception {
 		String amp1 = "{\n" +
 			"  \"namespace\": \"http://example.com/uri\",\n" +
-			"  \"local-name\": \"abctest-amp\",\n" +
+			"  \"local-name\": \"abctest-docs-amp\",\n" +
 			"  \"document-uri\": \"/module/path/name\",\n" +
 			"  \"modules-database\": \"Documents\",\n" +
 			"  \"role\": [\"rest-writer\"]\n" +
 			"}";
 
 		String amp2 = "{\n" +
 			"  \"namespace\": \"http://example.com/uri\",\n" +
-			"  \"local-name\": \"abctest-amp\",\n" +
+			"  \"local-name\": \"abctest-mods-amp\",\n" +
 			"  \"document-uri\": \"/module/path/name\",\n" +
 			"  \"modules-database\": \"Modules\",\n" +
 			"  \"role\": [\"rest-writer\"]\n" +
@@ -61,8 +61,8 @@ private void verifyAmpsCanBeExportedViaRegex() throws Exception {
 
 	private void verifyAmpsCanBeExportedViaProperties() throws Exception {
 		Properties props = new Properties();
-		props.put("amps", "/manage/v2/amps/abctest-amp?namespace=http://example.com/uri&document-uri=/module/path/name&modules-database=Documents," +
-			"/manage/v2/amps/abctest-amp?namespace=http://example.com/uri&document-uri=/module/path/name&modules-database=Modules");
+		props.put("amps", "/manage/v2/amps/abctest-docs-amp?namespace=http://example.com/uri&document-uri=/module/path/name&modules-database=Documents," +
+			"/manage/v2/amps/abctest-mods-amp?namespace=http://example.com/uri&document-uri=/module/path/name&modules-database=Modules");
 		PropertiesResourceSelector selector = new PropertiesResourceSelector(props);
 		verifyAmpsCanBeExported(selector);
 	}
@@ -76,16 +76,21 @@ private void verifyAmpsCanBeExported(ResourceSelector selector) throws Exception
 		// Kick the tires on our JSON annotations on Amp
 		ResourceMapper mapper = new DefaultResourceMapper(new API(manageClient));
 
-		Amp amp = mapper.readResource(new String(FileCopyUtils.copyToByteArray(files.get(0))), Amp.class);
-		assertEquals("http://example.com/uri", amp.getNamespace());
-		assertEquals("abctest-amp", amp.getLocalName());
-		assertEquals("/module/path/name", amp.getDocumentUri());
-		assertEquals("Documents", amp.getModulesDatabase());
+		// order of amps is not very reliable
+		for (File file : files) {
+			Amp amp = mapper.readResource(new String(FileCopyUtils.copyToByteArray(files.get(0))), Amp.class);
+			assertEquals("http://example.com/uri", amp.getNamespace());
+			assertEquals("/module/path/name", amp.getDocumentUri());
 
-		amp = mapper.readResource(new String(FileCopyUtils.copyToByteArray(files.get(1))), Amp.class);
-		assertEquals("http://example.com/uri", amp.getNamespace());
-		assertEquals("abctest-amp", amp.getLocalName());
-		assertEquals("/module/path/name", amp.getDocumentUri());
-		assertEquals("Modules", amp.getModulesDatabase());
+			if (amp.getLocalName().equals("abctest-docs-amp")) {
+				assertEquals("Documents", amp.getModulesDatabase());
+			}
+			else if (amp.getLocalName().equals("abctest-mods-amp")) {
+				assertEquals("Modules", amp.getModulesDatabase());
+			}
+			else {
+				fail("Invalid amp name");
+			}
+		}
 	}
 }