New JSON types. Originally contributed by ribandcoder. (#1246)
Signed-off-by: Santiago Pericas-Geertsen <santiago.pericasgeertsen@oracle.com>
diff --git a/jaxrs-api/src/main/java/jakarta/ws/rs/core/MediaType.java b/jaxrs-api/src/main/java/jakarta/ws/rs/core/MediaType.java
index 6dba6da..fc906fb 100644
--- a/jaxrs-api/src/main/java/jakarta/ws/rs/core/MediaType.java
+++ b/jaxrs-api/src/main/java/jakarta/ws/rs/core/MediaType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -164,6 +164,14 @@
* A {@link MediaType} constant representing {@value #APPLICATION_JSON_PATCH_JSON} media type.
*/
public static final MediaType APPLICATION_JSON_PATCH_JSON_TYPE = new MediaType("application", "json-patch+json");
+ /**
+ * {@link String} representation of {@value #APPLICATION_MERGE_PATCH_JSON} media type..
+ */
+ public static final String APPLICATION_MERGE_PATCH_JSON = "application/merge-patch+json";
+ /**
+ * A {@link MediaType} constant representing {@value #APPLICATION_MERGE_PATCH_JSON} media type.
+ */
+ public static final MediaType APPLICATION_MERGE_PATCH_JSON_TYPE = new MediaType("application", "merge-patch+json");
/**
* Creates a new instance of {@code MediaType} by parsing the supplied string.
