#272 Reverting using JSON UTF8 for all calls

Was causing a number of test failures, need to dig deeper

Author: rjrudin

src/main/java/com/marklogic/mgmt/ManageClient.java

@@ -258,15 +258,15 @@ public Fragment getXmlAsSecurityUser(String path, String... namespacePrefixesAnd
     public String getJson(String path) {
         logRequest(path, "JSON", "GET");
         HttpHeaders headers = new HttpHeaders();
-        headers.set("Accept", MediaType.APPLICATION_JSON_UTF8_VALUE);
+        headers.set("Accept", MediaType.APPLICATION_JSON_VALUE);
         return getRestTemplate().exchange(buildUri(path), HttpMethod.GET, new HttpEntity<>(headers), String.class)
                 .getBody();
     }
 
     public String getJson(URI uri) {
         logRequest(uri.toString(), "JSON", "GET");
         HttpHeaders headers = new HttpHeaders();
-        headers.set("Accept", MediaType.APPLICATION_JSON_UTF8_VALUE);
+        headers.set("Accept", MediaType.APPLICATION_JSON_VALUE);
         return getRestTemplate().exchange(uri, HttpMethod.GET, new HttpEntity<>(headers), String.class).getBody();
     }
 
@@ -284,7 +284,7 @@ public String getJsonAsAdmin(String path) {
 	public String getJsonAsSecurityUser(String path) {
 		logSecurityUserRequest(path, "JSON", "GET");
 		HttpHeaders headers = new HttpHeaders();
-		headers.set("Accept", MediaType.APPLICATION_JSON_UTF8_VALUE);
+		headers.set("Accept", MediaType.APPLICATION_JSON_VALUE);
 		return securityUserRestTemplate.exchange(buildUri(path), HttpMethod.GET, new HttpEntity<>(headers), String.class)
 			.getBody();
 	}
@@ -319,7 +319,7 @@ public void deleteAsSecurityUser(String path) {
 	 */
 	public HttpEntity<String> buildJsonEntity(String json) {
         HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+        headers.setContentType(MediaType.APPLICATION_JSON);
         if (manageConfig != null && manageConfig.isCleanJsonPayloads()) {
         	json = cleanJsonPayload(json);
         }

src/main/java/com/marklogic/mgmt/admin/AdminManager.java

@@ -62,7 +62,7 @@ public void init(String licenseKey, String licensee) {
             @Override
             public boolean execute() {
                 HttpHeaders headers = new HttpHeaders();
-                headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+                headers.setContentType(MediaType.APPLICATION_JSON);
                 HttpEntity<String> entity = new HttpEntity<String>(payload, headers);
                 try {
                     ResponseEntity<String> response = restTemplate.exchange(uri, HttpMethod.POST, entity, String.class);
@@ -108,7 +108,7 @@ public void installAdmin(String username, String password) {
             @Override
             public boolean execute() {
                 HttpHeaders headers = new HttpHeaders();
-                headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
+                headers.setContentType(MediaType.APPLICATION_JSON);
                 HttpEntity<String> entity = new HttpEntity<String>(payload, headers);
                 try {
                     ResponseEntity<String> response = restTemplate.exchange(uri, HttpMethod.POST, entity, String.class);

src/test/resources/sample-app/db-only-config/databases/content-database.json

@@ -1,13 +1,3 @@
 {
-	"database-name": "%%DATABASE%%",
-	"range-element-index": [
-		{
-			"collation": "http://marklogic.com/collation/",
-			"invalid-values": "reject",
-			"localname": "ÉÉÉ",
-			"namespace-uri": "",
-			"range-value-positions": false,
-			"scalar-type": "string"
-		}
-	]
+	"database-name": "%%DATABASE%%"
 }