Skip to content

Commit

Permalink
Add the application/jose and application/jose+json media types.
Browse files Browse the repository at this point in the history
  • Loading branch information
camrdale authored and ronshapiro committed Dec 14, 2018
1 parent e41e8d1 commit d416e04
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 0 deletions.
16 changes: 16 additions & 0 deletions android/guava/src/com/google/common/net/MediaType.java
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,22 @@ private static MediaType addKnownType(MediaType mediaType) {
public static final MediaType JAVASCRIPT_UTF_8 =
createConstantUtf8(APPLICATION_TYPE, "javascript");

/**
* For <a href="https://tools.ietf.org/html/rfc7515">JWS or JWE objects using the Compact
* Serialization</a>.
*
* @since NEXT
*/
public static final MediaType JOSE = createConstant(APPLICATION_TYPE, "jose");

/**
* For <a href="https://tools.ietf.org/html/rfc7515">JWS or JWE objects using the JSON
* Serialization</a>.
*
* @since NEXT
*/
public static final MediaType JOSE_JSON = createConstant(APPLICATION_TYPE, "jose+json");

public static final MediaType JSON_UTF_8 = createConstantUtf8(APPLICATION_TYPE, "json");

/**
Expand Down
16 changes: 16 additions & 0 deletions guava/src/com/google/common/net/MediaType.java
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,22 @@ private static MediaType addKnownType(MediaType mediaType) {
public static final MediaType JAVASCRIPT_UTF_8 =
createConstantUtf8(APPLICATION_TYPE, "javascript");

/**
* For <a href="https://tools.ietf.org/html/rfc7515">JWS or JWE objects using the Compact
* Serialization</a>.
*
* @since NEXT
*/
public static final MediaType JOSE = createConstant(APPLICATION_TYPE, "jose");

/**
* For <a href="https://tools.ietf.org/html/rfc7515">JWS or JWE objects using the JSON
* Serialization</a>.
*
* @since NEXT
*/
public static final MediaType JOSE_JSON = createConstant(APPLICATION_TYPE, "jose+json");

public static final MediaType JSON_UTF_8 = createConstantUtf8(APPLICATION_TYPE, "json");

/**
Expand Down

0 comments on commit d416e04

Please sign in to comment.