cleanup on deprecations

git-svn-id: svn+ssh://svn.marklogic.com/project/engsvn/client-api/java/branches/b2_0@164235 62cac252-8da6-4816-9e9d-6dc37b19578c

Author: ehennum

src/test/java/com/marklogic/client/test/ServerConfigurationManagerTest.java

@@ -29,7 +29,7 @@
 import com.marklogic.client.ResourceNotFoundException;
 import com.marklogic.client.ResourceNotResendableException;
 import com.marklogic.client.admin.ServerConfigurationManager;
-import com.marklogic.client.admin.ServerConfigurationManager.Policy;
+import com.marklogic.client.admin.ServerConfigurationManager.UpdatePolicy;
 
 public class ServerConfigurationManagerTest {
 	@BeforeClass
@@ -50,28 +50,28 @@ public void testSetGet()
 
 		serverConfig.readConfiguration();
 
-		Boolean initialQueryValid   = serverConfig.getQueryValidation();
-		Boolean initialOptionValid  = serverConfig.getQueryOptionValidation();
-		String  initialReadTrans    = serverConfig.getDefaultDocumentReadTransform();
-		Boolean initialReadTransAll = serverConfig.getDefaultDocumentReadTransformAll();
-		Boolean initialRequestLog   = serverConfig.getServerRequestLogging();
-		Policy  initialVersionReq   = serverConfig.getContentVersionRequests();
+		Boolean initialQueryValid      = serverConfig.getQueryValidation();
+		Boolean initialOptionValid     = serverConfig.getQueryOptionValidation();
+		String  initialReadTrans       = serverConfig.getDefaultDocumentReadTransform();
+		Boolean initialReadTransAll    = serverConfig.getDefaultDocumentReadTransformAll();
+		Boolean initialRequestLog      = serverConfig.getServerRequestLogging();
+		UpdatePolicy initialVersionReq = serverConfig.getUpdatePolicy();
 
-		Boolean modQueryValid   = initialQueryValid   ? false : true;
-		Boolean modOptionValid  = initialOptionValid  ? false : true;
-		String  modReadTrans    = "modifiedReadTransform";
-		Boolean modReadTransAll = initialReadTransAll ? false : true;
-		Boolean modRequestLog   = initialOptionValid  ? false : true;
-		Policy  modVersionReq   = (initialVersionReq == Policy.OPTIONAL) ?
-			Policy.REQUIRED : Policy.OPTIONAL;
+		Boolean      modQueryValid   = initialQueryValid   ? false : true;
+		Boolean      modOptionValid  = initialOptionValid  ? false : true;
+		String       modReadTrans    = "modifiedReadTransform";
+		Boolean      modReadTransAll = initialReadTransAll ? false : true;
+		Boolean      modRequestLog   = initialOptionValid  ? false : true;
+		UpdatePolicy modVersionReq   = (initialVersionReq == UpdatePolicy.VERSION_OPTIONAL) ?
+				UpdatePolicy.VERSION_REQUIRED : UpdatePolicy.VERSION_OPTIONAL;
 
 		serverConfig = Common.client.newServerConfigManager();
 		serverConfig.setQueryValidation(modQueryValid);
 		serverConfig.setQueryOptionValidation(modOptionValid);
 		serverConfig.setDefaultDocumentReadTransform(modReadTrans);
 		serverConfig.setDefaultDocumentReadTransformAll(modReadTransAll);
 		serverConfig.setServerRequestLogging(modRequestLog);
-		serverConfig.setContentVersionRequests(modVersionReq);
+		serverConfig.setUpdatePolicy(modVersionReq);
 		serverConfig.writeConfiguration();
 
 		serverConfig = Common.client.newServerConfigManager();
@@ -86,15 +86,15 @@ public void testSetGet()
 				modReadTransAll, serverConfig.getDefaultDocumentReadTransformAll());
 		assertEquals("Failed to change server request logging",
 				modRequestLog,   serverConfig.getServerRequestLogging());
-		assertEquals("Failed to change content version requests",
-				modVersionReq,   serverConfig.getContentVersionRequests());
+		assertEquals("Failed to change update policy ",
+				modVersionReq,   serverConfig.getUpdatePolicy());
 
 		serverConfig = Common.client.newServerConfigManager();
 		serverConfig.setQueryOptionValidation(initialOptionValid);
 		serverConfig.setDefaultDocumentReadTransform(initialReadTrans);
 		serverConfig.setDefaultDocumentReadTransformAll(initialReadTransAll);
 		serverConfig.setServerRequestLogging(initialRequestLog);
-		serverConfig.setContentVersionRequests(initialVersionReq);
+		serverConfig.setUpdatePolicy(initialVersionReq);
 		serverConfig.writeConfiguration();
 	}
 

src/test/java/com/marklogic/client/test/TransformExtensionsTest.java

@@ -21,7 +21,6 @@
 
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.Map;
 
 import org.custommonkey.xmlunit.SimpleNamespaceContext;
 import org.custommonkey.xmlunit.XMLUnit;
@@ -98,12 +97,6 @@ static ExtensionMetadata makeXSLTMetadata() {
 		return metadata;
 	}
 
-	static Map<String,String> makeParameters() {
-		Map<String,String> params = new HashMap<String,String>();
-		params.put("value", "true");
-		return params;
-	}
-
 	@Test
 	public void testTransformExtensions()
 	throws XpathException, SAXException, IOException, FailedRequestException, ResourceNotFoundException, ForbiddenUserException, ResourceNotResendableException {
@@ -165,17 +158,15 @@ public void writeXQueryTransform(TransformExtensionsManager extensionMgr)
 		extensionMgr.writeXQueryTransform(
 				XQUERY_NAME,
 				new StringHandle().withFormat(Format.TEXT).with(xqueryTransform),
-				makeXQueryMetadata(),
-				makeParameters()
+				makeXQueryMetadata()
 				);		
 	}
 	public void writeXSLTransform(TransformExtensionsManager extensionMgr)
 	throws ResourceNotFoundException, ResourceNotResendableException, ForbiddenUserException, FailedRequestException {
 		extensionMgr.writeXSLTransform(
 				XSLT_NAME,
 				new StringHandle().withFormat(Format.XML).withMimetype("application/xslt+xml").with(xslTransform),
-				makeXSLTMetadata(),
-				makeParameters()
+				makeXSLTMetadata()
 				);
 	}
 }

src/test/java/com/marklogic/client/test/TransformTest.java

@@ -79,8 +79,7 @@ public void testXQueryTransform()
 		extensionMgr.writeXQueryTransform(
 				TransformExtensionsTest.XQUERY_NAME,
 				new StringHandle().withFormat(Format.TEXT).with(xqueryTransform),
-				TransformExtensionsTest.makeXQueryMetadata(),
-				TransformExtensionsTest.makeParameters()
+				TransformExtensionsTest.makeXQueryMetadata()
 				);
 
 		runTransform(TransformExtensionsTest.XQUERY_NAME);
@@ -96,8 +95,7 @@ public void testXSLTransform()
 		extensionMgr.writeXSLTransform(
 				TransformExtensionsTest.XSLT_NAME,
 				new StringHandle().with(xslTransform),
-				TransformExtensionsTest.makeXSLTMetadata(),
-				TransformExtensionsTest.makeParameters()
+				TransformExtensionsTest.makeXSLTMetadata()
 				);
 
 		runTransform(TransformExtensionsTest.XSLT_NAME);