@@ -124,7 +124,7 @@ public HttpField getContentTypeField(Charset charset)
124124 private final Charset _charset ;
125125 private final String _charsetString ;
126126 private final boolean _assumedCharset ;
127- private final HttpField _field ;
127+ private final ContentTypeField _field ;
128128
129129 Type (String name )
130130 {
@@ -133,18 +133,18 @@ public HttpField getContentTypeField(Charset charset)
133133 _charset = null ;
134134 _charsetString = null ;
135135 _assumedCharset = false ;
136- _field = new PreEncodedHttpField ( HttpHeader . CONTENT_TYPE , _string );
136+ _field = new ContentTypeField ( this );
137137 }
138138
139139 Type (String name , Type base )
140140 {
141141 _string = name ;
142- _base = base ;
142+ _base = Objects . requireNonNull ( base ) ;
143143 int i = name .indexOf (";charset=" );
144144 _charset = Charset .forName (name .substring (i + 9 ));
145145 _charsetString = _charset .toString ().toLowerCase (Locale .ENGLISH );
146146 _assumedCharset = false ;
147- _field = new PreEncodedHttpField ( HttpHeader . CONTENT_TYPE , _string );
147+ _field = new ContentTypeField ( this );
148148 }
149149
150150 Type (String name , Charset cs )
@@ -154,9 +154,12 @@ public HttpField getContentTypeField(Charset charset)
154154 _charset = cs ;
155155 _charsetString = _charset == null ? null : _charset .toString ().toLowerCase (Locale .ENGLISH );
156156 _assumedCharset = true ;
157- _field = new PreEncodedHttpField ( HttpHeader . CONTENT_TYPE , _string );
157+ _field = new ContentTypeField ( this );
158158 }
159159
160+ /**
161+ * @return The {@link Charset} for this type or {@code null} if it is not known
162+ */
160163 public Charset getCharset ()
161164 {
162165 return _charset ;
@@ -167,6 +170,11 @@ public String getCharsetString()
167170 return _charsetString ;
168171 }
169172
173+ /**
174+ * Check if this type is equal to the type passed as a string
175+ * @param type The type to compare to
176+ * @return {@code true} if this is the same type
177+ */
170178 public boolean is (String type )
171179 {
172180 return _string .equalsIgnoreCase (type );
@@ -183,6 +191,9 @@ public String toString()
183191 return _string ;
184192 }
185193
194+ /**
195+ * @return {@code true} If the {@link Charset} for this type is assumed rather than being explicitly declared.
196+ */
186197 public boolean isCharsetAssumed ()
187198 {
188199 return _assumedCharset ;
@@ -200,6 +211,10 @@ public HttpField getContentTypeField(Charset charset)
200211 return new HttpField (HttpHeader .CONTENT_TYPE , getContentTypeWithoutCharset (_string ) + ";charset=" + charset .name ());
201212 }
202213
214+ /**
215+ * Get the base type of this type, which is the type without a charset specified
216+ * @return The base type or this type if it is a base type
217+ */
203218 public Type getBaseType ()
204219 {
205220 return _base ;
@@ -227,23 +242,34 @@ public Type getBaseType()
227242 })
228243 .build ();
229244
245+ /**
246+ * Get the base value, stripped of any parameters
247+ * @param value The value
248+ * @return A string with any semicolon separated parameters removed
249+ */
250+ public static String getBase (String value )
251+ {
252+ int index = value .indexOf (';' );
253+ return index == -1 ? value : value .substring (0 , index );
254+ }
255+
256+ /**
257+ * Get the base type of this type, which is the type without a charset specified
258+ * @param contentType The mimetype as a string
259+ * @return The base type or this type if it is a base type
260+ */
230261 public static Type getBaseType (String contentType )
231262 {
232263 if (StringUtil .isEmpty (contentType ))
233264 return null ;
234265 Type type = CACHE .getBest (contentType );
235266 if (type == null )
236- return null ;
237- if (type .asString ().length () == contentType .length ())
238- return type .getBaseType ();
239- if (contentType .charAt (type .asString ().length ()) == ';' )
240- return type .getBaseType ();
241- contentType = contentType .replace (" " , "" );
242- if (type .asString ().length () == contentType .length ())
243- return type .getBaseType ();
244- if (contentType .charAt (type .asString ().length ()) == ';' )
245- return type .getBaseType ();
246- return null ;
267+ {
268+ type = CACHE .get (getBase (contentType ));
269+ if (type == null )
270+ return null ;
271+ }
272+ return type .getBaseType ();
247273 }
248274
249275 public static boolean isKnownLocale (Locale locale )
@@ -326,6 +352,23 @@ public MimeTypes(MimeTypes defaults)
326352 }
327353 }
328354
355+ /**
356+ * Get the explicit, assumed, or inferred Charset for a HttpField containing a mime type value
357+ * @param field HttpField with a mime type value (e.g. Content-Type)
358+ * @return A {@link Charset} or null;
359+ * @throws IllegalCharsetNameException
360+ * If the given charset name is illegal
361+ * @throws UnsupportedCharsetException
362+ * If no support for the named charset is available
363+ * in this instance of the Java virtual machine
364+ */
365+ public Charset getCharset (HttpField field ) throws IllegalCharsetNameException , UnsupportedCharsetException
366+ {
367+ if (field instanceof ContentTypeField contentTypeField )
368+ return contentTypeField .getMimeType ().getCharset ();
369+ return getCharset (field .getValue ());
370+ }
371+
329372 /**
330373 * Get the explicit, assumed, or inferred Charset for a mime type
331374 * @param mimeType String form or a mimeType
@@ -638,6 +681,46 @@ private static String normalizeMimeType(String type)
638681 return StringUtil .asciiToLowerCase (type );
639682 }
640683
684+ public static MimeTypes .Type getMimeTypeFromContentType (HttpField field )
685+ {
686+ if (field == null )
687+ return null ;
688+
689+ assert field .getHeader () == HttpHeader .CONTENT_TYPE ;
690+
691+ if (field instanceof MimeTypes .ContentTypeField contentTypeField )
692+ return contentTypeField .getMimeType ();
693+
694+ return MimeTypes .CACHE .get (field .getValue ());
695+ }
696+
697+ /**
698+ * Efficiently extract the charset value from a {@code Content-Type} {@link HttpField}.
699+ * @param field A {@code Content-Type} field.
700+ * @return The {@link Charset}
701+ */
702+ public static Charset getCharsetFromContentType (HttpField field )
703+ {
704+ if (field == null )
705+ return null ;
706+
707+ assert field .getHeader () == HttpHeader .CONTENT_TYPE ;
708+
709+ if (field instanceof ContentTypeField contentTypeField )
710+ return contentTypeField ._type .getCharset ();
711+
712+ String charset = getCharsetFromContentType (field .getValue ());
713+ if (charset == null )
714+ return null ;
715+
716+ return Charset .forName (charset );
717+ }
718+
719+ /**
720+ * Efficiently extract the charset value from a {@code Content-Type} string
721+ * @param value A content-type value (e.g. {@code text/plain; charset=utf8}).
722+ * @return The charset value (e.g. {@code utf-8}).
723+ */
641724 public static String getCharsetFromContentType (String value )
642725 {
643726 if (value == null )
@@ -751,6 +834,11 @@ else if (' ' != b)
751834 return null ;
752835 }
753836
837+ /**
838+ * Efficiently extract the base mime-type from a content-type value
839+ * @param value A content-type value (e.g. {@code text/plain; charset=utf8}).
840+ * @return The base mime-type value (e.g. {@code text/plain}).
841+ */
754842 public static String getContentTypeWithoutCharset (String value )
755843 {
756844 int end = value .length ();
@@ -876,4 +964,29 @@ else if (' ' != b)
876964 return value ;
877965 return builder .toString ();
878966 }
967+
968+ /**
969+ * A {@link PreEncodedHttpField} for `Content-Type` that can hold a {@link MimeTypes.Type} field
970+ * for later recovery.
971+ */
972+ static class ContentTypeField extends PreEncodedHttpField
973+ {
974+ private final Type _type ;
975+
976+ public ContentTypeField (MimeTypes .Type type )
977+ {
978+ this (type , type .toString ());
979+ }
980+
981+ public ContentTypeField (MimeTypes .Type type , String value )
982+ {
983+ super (HttpHeader .CONTENT_TYPE , value );
984+ _type = type ;
985+ }
986+
987+ public Type getMimeType ()
988+ {
989+ return _type ;
990+ }
991+ }
879992}
0 commit comments