add support for ExtensionMetadata.ScriptLanguage so we can specify when we're registering a non-xquery resource extension

Author: sammefford

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

@@ -24,6 +24,7 @@
 import com.marklogic.client.document.TextDocumentManager;
 import com.marklogic.client.document.XMLDocumentManager;
 import com.marklogic.client.extensions.ResourceManager;
+import com.marklogic.client.admin.ExtensionMetadata;
 import com.marklogic.client.query.QueryManager;
 import com.marklogic.client.alerting.RuleManager;
 import com.marklogic.client.util.RequestLogger;
@@ -118,6 +119,17 @@ public interface DatabaseClient {
      */
     public <T extends ResourceManager> T init(String resourceName, T resourceManager);
 
+    /**
+     * Initializes a manager for a extension resource.
+     * 
+     * @param resourceName	the name of the extension resource
+     * @param resourceManager	the manager for the extension resource
+     * @param scriptLanguage	the script language for the extension resource, either XQUERY (default) or JAVASCRIPT
+     * @return	the initialized resource manager
+     */
+    public <T extends ResourceManager> T init(String resourceName, T resourceManager, 
+	  ExtensionMetadata.ScriptLanguage scriptLanguage);
+
     /**
      * Creates a logger for document and query requests.  To merge the logging output
      * with the output from other loggers, pass the output stream used by the other

src/main/java/com/marklogic/client/extensions/ResourceServices.java

@@ -17,6 +17,7 @@
 
 import java.util.Iterator;
 
+import com.marklogic.client.admin.ExtensionMetadata;
 import com.marklogic.client.io.Format;
 import com.marklogic.client.util.RequestLogger;
 import com.marklogic.client.util.RequestParameters;
@@ -40,6 +41,12 @@ public interface ResourceServices {
 	 */
 	public String getResourceName();
 
+	/**
+	 * Returns the script language of the resource.
+	 * @return	the script language
+	 */
+	public ExtensionMetadata.ScriptLanguage getScriptLanguage();
+
 	/**
 	 * Reads resource content by calling a GET service.
 	 * @param params	the parameters for the call

src/main/java/com/marklogic/client/impl/DatabaseClientImpl.java

@@ -20,6 +20,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.marklogic.client.admin.ExtensionMetadata;
 import com.marklogic.client.document.BinaryDocumentManager;
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.FailedRequestException;
@@ -127,6 +128,12 @@ public RequestLogger newLogger(OutputStream out) {
 
 	@Override
     public <T extends ResourceManager> T init(String resourceName, T resourceManager) {
+		return init(resourceName, resourceManager, null);
+	}
+
+	@Override
+    public <T extends ResourceManager> T init(String resourceName, T resourceManager, 
+	  ExtensionMetadata.ScriptLanguage scriptLanguage) {
 		if (resourceManager == null)
 			throw new IllegalArgumentException("Cannot initialize null resource manager");
 		if (resourceName == null)
@@ -135,7 +142,7 @@ public <T extends ResourceManager> T init(String resourceName, T resourceManager
 			throw new IllegalArgumentException("Cannot initialize resource manager with empty resource name");
 
 		((ResourceManagerImplementation) resourceManager).init(
-				new ResourceServicesImpl(services,resourceName)
+				new ResourceServicesImpl(services,resourceName,scriptLanguage)
 				);
 
 		return resourceManager;

src/main/java/com/marklogic/client/impl/ResourceServicesImpl.java

@@ -15,6 +15,7 @@
  */
 package com.marklogic.client.impl;
 
+import com.marklogic.client.admin.ExtensionMetadata;
 import com.marklogic.client.Transaction;
 import com.marklogic.client.extensions.ResourceServices;
 import com.marklogic.client.io.marker.AbstractReadHandle;
@@ -28,11 +29,13 @@ class ResourceServicesImpl
 {
 	private String       resourceName;
 	private RESTServices services;
+	private ExtensionMetadata.ScriptLanguage scriptLanguage = ExtensionMetadata.XQUERY;
 
-	ResourceServicesImpl(RESTServices services, String resourceName) {
+	ResourceServicesImpl(RESTServices services, String resourceName, ExtensionMetadata.ScriptLanguage scriptLanguage) {
 		super();
 		this.services     = services;
 		this.resourceName = resourceName;
+		if ( scriptLanguage != null ) this.scriptLanguage = scriptLanguage;
 	}
 
 	@Override
@@ -43,6 +46,11 @@ private String getResourcePath() {
 		return "resources/"+getResourceName();
 	}
 
+	@Override
+	public ExtensionMetadata.ScriptLanguage getScriptLanguage() {
+		return scriptLanguage;
+	}
+
 	@Override
 	public <R extends AbstractReadHandle> R get(RequestParameters params, R output) {
 		return get(params, null, output);