Merge branch 'release-3.0.5' into 3.0-master

Author: kkanthet

.classpath

@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

README.md

@@ -103,7 +103,7 @@ You might want to skip the tests until you have configured a test database and R
 
     $ mvn package -Dmaven.test.skip=true
 
-See [Contributing.md](Contributing.md) for more on contributing to this github project.
+See [CONTRIBUTING.md](CONTRIBUTING.md) for more on contributing to this github project.
 
 ### Running JUnit Tests
 

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>com.marklogic</groupId>
 	<artifactId>java-client-api</artifactId>
 	<packaging>jar</packaging>
-	<version>3.0.4</version>
+	<version>3.0.5</version>
 	<name>MarkLogic Java Client API</name>
 	<description>The official MarkLogic Java client API.</description>
 	<url>https://github.com/marklogic/java-client-api</url>
@@ -62,14 +62,15 @@
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>2.8.1</version>
 				<configuration>
-					<bottom><![CDATA[Copyright &#169; 2013-2015 MarkLogic Corporation.]]></bottom>
+					<bottom><![CDATA[Copyright &#169; 2013-2016 MarkLogic Corporation.]]></bottom>
 					<excludePackageNames>*.impl:*.jaxb:*.test:*.test.*</excludePackageNames>
 					<links>
 						<link>http://docs.oracle.com/javase/8/docs/api/</link>
 					</links>
 					<overview>${basedir}/src/main/javadoc/overview.html</overview>
 					<show>public</show>
 					<doctitle>${javadoc-title}</doctitle>
+					<windowtitle>${javadoc-title}</windowtitle>
 					<use/>
 				</configuration>
 				<executions>
@@ -187,20 +188,6 @@
         </plugin>
 		</plugins>
 	</build>
-	<profiles>
-		<profile>
-			<id>Java 8</id>
-			<activation>
-				<jdk>1.8</jdk>
-			</activation>
-			<properties>
-				<!-- Disable Java 8 overly strict javadoc linter when building with Java 8
-					http://blog.joda.org/2014/02/turning-off-doclint-in-jdk-8-javadoc.html
-					-->
-				<additionalparam>-Xdoclint:none</additionalparam>
-			</properties>
-		</profile>
-	</profiles>
 	<dependencies>
 		<!-- direct build / run dependencies -->
         <!--

src/main/java/com/marklogic/client/DatabaseClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 MarkLogic Corporation
+ * Copyright 2012-2016 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,10 @@
 import com.marklogic.client.pojo.PojoRepository;
 import com.marklogic.client.semantics.GraphManager;
 import com.marklogic.client.semantics.SPARQLQueryManager;
+import com.marklogic.client.DatabaseClientFactory.Authentication;
+import com.marklogic.client.DatabaseClientFactory.SSLHostnameVerifier;
+
+import javax.net.ssl.SSLContext;
 
 /**
  * A Database Client instantiates document and query managers and other objects
@@ -115,10 +119,14 @@ public interface DatabaseClient {
      */
     public ServerConfigurationManager newServerConfigManager();
 
-    /** Creates a manager for CRUD operations on semantic graphs.  */
+    /** Creates a manager for CRUD operations on semantic graphs.
+     * @return the new GraphManager instance
+     */
     public GraphManager newGraphManager();
 
-    /** Creates a manager for executing SPARQL queries and retrieving results. */
+    /** Creates a manager for executing SPARQL queries and retrieving results.
+     * @return the new SPARQLQueryManager instance
+     */
     public SPARQLQueryManager newSPARQLQueryManager();
 
     /**
@@ -130,6 +138,8 @@ public interface DatabaseClient {
      * @param clazz the class type for this PojoRepository to handle
      * @param idClass the class type of the id field for this clazz, must obviously 
      *          be Serializable or we'll struggle to marshall it
+     * @param <T> the pojo type this PojoRepository will manage
+     * @param <ID> the scalar type of the id for pojos of type &lt;T&gt;
      * @return the initialized PojoRepository
      **/
     public <T, ID extends Serializable> PojoRepository<T, ID> newPojoRepository(Class<T> clazz, Class<ID> idClass);
@@ -139,6 +149,7 @@ public interface DatabaseClient {
      * 
      * @param resourceName	the name of the extension resource
      * @param resourceManager	the manager for the extension resource
+     * @param <T> the type of ResourceManager to init for the extension resource
      * @return	the initialized resource manager
      */
     public <T extends ResourceManager> T init(String resourceName, T resourceManager);
@@ -182,6 +193,23 @@ public interface DatabaseClient {
      * xdbc:invoke privilege.  If this DatabaseClient is pointed at a database different
      * than the default for this REST server, you will need the xdbc:eval-in or xdbc:invoke-in
      * privilege.
+     * @return the new ServerEvaluationCall instance
      */
-	public ServerEvaluationCall newServerEval();
+    public ServerEvaluationCall newServerEval();
+
+    public String getHost();
+
+    public int getPort();
+
+    public String getDatabase();
+
+    public String getUser();
+
+    public String getPassword();
+
+    public Authentication getAuthentication();
+
+    public SSLContext getSSLContext();
+
+    public SSLHostnameVerifier getSSLHostnameVerifier();
 }

src/main/java/com/marklogic/client/DatabaseClientFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 MarkLogic Corporation
+ * Copyright 2012-2016 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -95,6 +95,7 @@ public interface SSLHostnameVerifier {
 		 * @param hostname	the name of the checked host
 		 * @param cns	common names for the checked host
 		 * @param subjectAlts	alternative subject names for the checked host
+		 * @throws SSLException if the hostname isn't acceptable
 		 */
 		public void verify(String hostname, String[] cns, String[] subjectAlts) throws SSLException;
 
@@ -165,6 +166,7 @@ public interface HandleFactoryRegistry {
 		 * Creates a ContentHandle if the registry has a factory
 		 * for the class of the IO representation.
 		 * @param type	the class for an IO representation
+		 * @param <C> the registered type for the returned handle
 		 * @return	a content handle or null if no factory supports the class
 		 */
 		public <C> ContentHandle<C> makeHandle(Class<C> type);
@@ -326,7 +328,7 @@ static private DatabaseClientImpl newClientImpl(String host, int port, String da
 				);
 		}
 
-		return new DatabaseClientImpl(services);		
+		return new DatabaseClientImpl(services, host, port, database, user, password, type, context, verifier);
 	}
 
 	/**

src/main/java/com/marklogic/client/FailedRequestException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 MarkLogic Corporation
+ * Copyright 2012-2016 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/marklogic/client/ForbiddenUserException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 MarkLogic Corporation
+ * Copyright 2012-2016 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/marklogic/client/MarkLogicBindingException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 MarkLogic Corporation
+ * Copyright 2012-2016 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/marklogic/client/MarkLogicIOException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 MarkLogic Corporation
+ * Copyright 2012-2016 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/main/java/com/marklogic/client/MarkLogicInternalException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 MarkLogic Corporation
+ * Copyright 2012-2016 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.