Handle charset as part of Content-Type headers (#110)

zanata · Apr 12, 2016 · c2a5565 · c2a5565
1 parent 46844fb
commit c2a5565
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/zanata-rest-client/src/main/java/org/zanata/rest/client/InvalidContentTypeFilter.java b/zanata-rest-client/src/main/java/org/zanata/rest/client/InvalidContentTypeFilter.java
@@ -52,7 +52,7 @@ public class InvalidContentTypeFilter extends ClientFilter {
 
     // we assume only xml or json are the valid types (wildcard type is also considered compatible)
     private static final Pattern VALID_TYPES_REGEX =
-            Pattern.compile("application/.*\\+?(\\*|xml|json)");
+            Pattern.compile("application/.*\\+?(\\*|xml|json)(;.*)?");
 
     @Override
     public ClientResponse handle(ClientRequest clientRequest)

diff --git a/zanata-rest-client/src/test/java/org/zanata/rest/client/InvalidContentTypeFilterTest.java b/zanata-rest-client/src/test/java/org/zanata/rest/client/InvalidContentTypeFilterTest.java
@@ -9,10 +9,12 @@
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.*;
 import static org.zanata.rest.client.InvalidContentTypeFilter.isContentTypeCompatible;
 
 public class InvalidContentTypeFilterTest {
+    // WildFly 8 and 9 have been known to add ";charset=ISO-8859-1" to
+    // Content-Type headers.
+    private static final String LATIN_1 = "ISO-8859-1";
 
     private String sampleText =
             "<!DOCTYPE composition PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" +
@@ -61,8 +63,23 @@ public void testValidateContentTypes() {
         MatcherAssert.assertThat(
                 isContentTypeCompatible(MediaType.WILDCARD_TYPE),
                 equalTo(true));
+
+        MediaType zanataXmlType = new MediaType(
+                "application", "vnd.zanata+xml");
+        MatcherAssert.assertThat(isContentTypeCompatible(zanataXmlType),
+                equalTo(true));
+        MatcherAssert.assertThat(isContentTypeCompatible(
+                zanataXmlType.withCharset(LATIN_1)),
+                equalTo(true));
+
+        MediaType zanataVersionXmlType = new MediaType(
+                "application", "vnd.zanata.version+xml");
+        MatcherAssert.assertThat(isContentTypeCompatible(zanataVersionXmlType),
+                equalTo(true));
         MatcherAssert.assertThat(isContentTypeCompatible(
-                new MediaType("application", "vnd.zanata+xml")), equalTo(true));
+                zanataVersionXmlType.withCharset(LATIN_1)),
+                equalTo(true));
+
         MatcherAssert.assertThat(
                 isContentTypeCompatible(MediaType.TEXT_PLAIN_TYPE),
                 equalTo(true));