Merge pull request #11437 from GlobalDataverseCommunityConsortium/UTFTestFix

UTF8TestFix

Author: ofahimIQSS

src/main/java/edu/harvard/iq/dataverse/api/Dataverses.java

@@ -827,9 +827,9 @@ private List<DatasetFieldType> parseFacets(JsonArray facetsArray) throws Wrapped
         for (JsonString facetId : facetsArray.getValuesAs(JsonString.class)) {
             DatasetFieldType dsfType = findDatasetFieldType(facetId.getString());
             if (dsfType == null) {
-                throw new WrappedResponse(badRequest(MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.facets.error.fieldtypenotfound"), facetId)));
+                throw new WrappedResponse(badRequest(MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.facets.error.fieldtypenotfound"), facetId.getString())));
             } else if (!dsfType.isFacetable()) {
-                throw new WrappedResponse(badRequest(MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.facets.error.fieldtypenotfacetable"), facetId)));
+                throw new WrappedResponse(badRequest(MessageFormat.format(BundleUtil.getStringFromBundle("dataverse.facets.error.fieldtypenotfacetable"), facetId.getString())));
             }
             facets.add(dsfType);
         }

src/test/java/edu/harvard/iq/dataverse/api/DataversesIT.java

@@ -1329,7 +1329,7 @@ public void testAddDataverse() {
         createSubDataverseResponse = UtilIT.createSubDataverse(testDataverseAlias, null, apiToken, "root", testInputLevelNames, testInvalidFacetIds, testMetadataBlockNames);
         createSubDataverseResponse.then().assertThat()
                 .statusCode(BAD_REQUEST.getStatusCode())
-                .body("message", equalTo("Cant find dataset field type \"" + invalidFacetId + "\""));
+                .body("message", equalTo(BundleUtil.getStringFromBundle("dataverse.facets.error.fieldtypenotfound",  Arrays.asList(invalidFacetId))));
 
         // Should return error when an invalid input level is sent
         String invalidInputLevelName = "wrongInputLevel";