TIKA-4362 -- expand coverage of message classes for MAPI (#2076)

* TIKA-4362 -- expand coverage of message classes for MAPI

tika-core/src/main/java/org/apache/tika/metadata/MAPI.java

@@ -17,24 +17,28 @@
 package org.apache.tika.metadata;
 
 /**
- * Office Document properties collection. These properties apply to
- * Office / Productivity Documents of all forms, including (but not limited
- * to) MS Office and OpenDocument formats.
- * This is a logical collection of properties, which may be drawn from a
- * few different external definitions.
  *
- * @since Apache Tika 1.2
+ * Properties that typically appear in MSG/PST message format files.
+ *
+ * @since Apache Tika 4.0
  */
 public interface MAPI {
 
     String PREFIX_MAPI_META = "mapi" + TikaCoreProperties.NAMESPACE_PREFIX_DELIMITER;
 
     /**
      * MAPI message class.  What type of .msg/MAPI file is it?
+     * This is normalized via "mapi_message_classes.properties
      */
     Property MESSAGE_CLASS =
-            Property.internalClosedChoise(PREFIX_MAPI_META + "message-class", "APPOINTMENT", "CONTACT", "NOTE", "STICKY_NOTE",
-                    "POST", "TASK", "UNKNOWN", "UNSPECIFIED");
+            Property.internalText(PREFIX_MAPI_META + "message-class");
+
+    /**
+     * MAPI message class.  What type of .msg/MAPI file is it?
+     * This is the raw value that is retrieved from the underlying chunk
+     */
+    Property MESSAGE_CLASS_RAW =
+            Property.internalText(PREFIX_MAPI_META + "message-class-raw");
 
     Property SENT_BY_SERVER_TYPE = Property.internalText(PREFIX_MAPI_META + "sent-by-server-type");