geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1770976 - in /geronimo/specs/trunk/geronimo-json_1.1_spec/src/main/java/javax/json: JsonMergePatch.java spi/JsonProvider.java
Date Wed, 23 Nov 2016 14:29:30 GMT
Author: struberg
Date: Wed Nov 23 14:29:29 2016
New Revision: 1770976

URL: http://svn.apache.org/viewvc?rev=1770976&view=rev
Log:
GERONIMO-6558 JavaDoc

Modified:
    geronimo/specs/trunk/geronimo-json_1.1_spec/src/main/java/javax/json/JsonMergePatch.java
    geronimo/specs/trunk/geronimo-json_1.1_spec/src/main/java/javax/json/spi/JsonProvider.java

Modified: geronimo/specs/trunk/geronimo-json_1.1_spec/src/main/java/javax/json/JsonMergePatch.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-json_1.1_spec/src/main/java/javax/json/JsonMergePatch.java?rev=1770976&r1=1770975&r2=1770976&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-json_1.1_spec/src/main/java/javax/json/JsonMergePatch.java
(original)
+++ geronimo/specs/trunk/geronimo-json_1.1_spec/src/main/java/javax/json/JsonMergePatch.java
Wed Nov 23 14:29:29 2016
@@ -17,7 +17,11 @@
 
 package javax.json;
 
-public class JsonMergePatch {
+/**
+ * A JSON MergePatch as defined in http://tools.ietf.org/html/rfc7396
+ * TODO interface or what?
+ */
+public class JsonMergePatch  {
 
     public static JsonValue mergePatch(JsonValue target, JsonValue patch) {
 

Modified: geronimo/specs/trunk/geronimo-json_1.1_spec/src/main/java/javax/json/spi/JsonProvider.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-json_1.1_spec/src/main/java/javax/json/spi/JsonProvider.java?rev=1770976&r1=1770975&r2=1770976&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-json_1.1_spec/src/main/java/javax/json/spi/JsonProvider.java
(original)
+++ geronimo/specs/trunk/geronimo-json_1.1_spec/src/main/java/javax/json/spi/JsonProvider.java
Wed Nov 23 14:29:29 2016
@@ -251,7 +251,8 @@ public abstract class JsonProvider {
 
     /**
      * Create a merged patch by comparing the source to the target.
-     * Applying this JsonPatch to the source you will give you the target.
+     * Applying this JsonPatch to the source will give you the target.
+     * A mergePatch is a JsonValue as defined in http://tools.ietf.org/html/rfc7396
      *
      * @see #createPatch(JsonStructure, JsonStructure)
      * @since 1.1
@@ -260,6 +261,8 @@ public abstract class JsonProvider {
 
     /**
      * Merge the given patch to the existing source
+     * A mergePatch is a JsonValue as defined in http://tools.ietf.org/html/rfc7396
+     *
      * @return the result of applying the patch to the source
      * @since 1.1
      */



Mime
View raw message