Allow plus sign in mimetype subtype, expand tests

hapifhir · Jun 21, 2024 · 944db4a · 944db4a
1 parent 7743496
commit 944db4a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...l7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/MimeTypeUtil.java b/...l7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/MimeTypeUtil.java
@@ -2,7 +2,7 @@
 
 public class MimeTypeUtil {
   public static String checkValidMimeType(String mt) {
-    if (!mt.matches("^(\\w+|\\*)/([\\w-]+|\\*)((;\\s*(\\w+)=\\s*(\\S+))?)$")) {
+    if (!mt.matches("^(\\w+|\\*)/([\\w-+]+|\\*)((;\\s*(\\w+)=\\s*(\\S+))?)$")) {
       return "Mime type invalid";
     }
     return null;

diff --git a/...hir.validation/src/test/java/org/hl7/fhir/validation/instance/utils/MimeTypeUtilTest.java b/...hir.validation/src/test/java/org/hl7/fhir/validation/instance/utils/MimeTypeUtilTest.java
@@ -12,16 +12,18 @@ public class MimeTypeUtilTest {
   @ValueSource(strings = {
     "application/fhir",
     "text/plain",
+    "text/plain;charset=UTF-8",
     "application/octet-stream",
-    //"application/xhtml+xml", // This is technically valid but doesn't currently pass
+    "application/xhtml+xml",
   })
   public void testValidMimeTypes(String mimeType) {
     testMimeType(mimeType, true);
   }
 
   @ParameterizedTest
   @ValueSource(strings = {
-    "application/fhir;anything" // semicolon and everything after shouldn't work.
+    "application/fhir;anything", // semicolon and everything after shouldn't work if it's not a parameter=value pair
+    "application/fhir;parameter=", // parameter without value shouldn't work.
   })
   public void testInvalidMimeTypes(String mimeType) {
     testMimeType(mimeType, false);