Fix to allow uris with different characters.

Author: anu3990

marklogic-client-api/src/main/java/com/marklogic/client/impl/OkHttpServices.java

@@ -3569,8 +3569,13 @@ public <R extends AbstractReadHandle> R postBulkDocuments(
           mimeType = defaultFormat.getDefaultMimetype();
         }
         headers.add(HEADER_CONTENT_TYPE, mimeType);
-        String disposition = DISPOSITION_TYPE_ATTACHMENT + "; " +
-          DISPOSITION_PARAM_FILENAME + "=" + escapeContentDispositionFilename(write.getUri()) + contentDispositionTemporal;
+          String disposition = null;
+          try {
+              disposition = DISPOSITION_TYPE_ATTACHMENT + "; " +
+                      DISPOSITION_PARAM_FILENAME + "*=UTF-8''" + URLEncoder.encode(write.getUri(), "UTF-8") + contentDispositionTemporal;
+          } catch (Exception ex) {
+              ex.printStackTrace();
+          }
         headers.add(HEADER_CONTENT_DISPOSITION, disposition);
         headerList.add(headers);
         writeHandles.add(write.getContent());

marklogic-client-api/src/test/java/com/marklogic/client/test/datamovement/WriteBatcherTest.java

@@ -1141,4 +1141,24 @@ public void testIssue793() {
     moveMgr.startJob(batcher);
     moveMgr.stopJob(batcher);
   }
+
+  @Test
+  public void testUrisWithDifferentCharacters() {
+    GenericDocumentManager docMgr = client.newDocumentManager();
+    DocumentWriteSet writeSet = docMgr.newWriteSet();
+    StringHandle handle1 = new StringHandle("{hello:\"test1\"}");
+    StringHandle handle2 = new StringHandle("{hello:\"test2\"}");
+
+    writeSet.add("/CXXXX_Ü_9999.json", handle1);
+    writeSet.add("Ä_9999.json", handle2);
+    docMgr.write(writeSet);
+
+    DocumentPage documentsPage = docMgr.read("/CXXXX_Ü_9999.json","Ä_9999.json");
+    assertTrue("All the documents were not written.",documentsPage.size() == 2);
+    assertEquals("First document content not as expected.",handle1,documentsPage.next().getContent(handle1));
+    assertEquals("Second document content not as expected.",handle2,documentsPage.next().getContent(handle2));
+
+    client.newDocumentManager().delete("/CXXXX_Ü_9999.json");
+    client.newDocumentManager().delete("Ä_9999.json");
+  }
 }