You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by st...@apache.org on 2012/04/19 18:37:14 UTC
svn commit: r1328041 -
/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
Author: stefan
Date: Thu Apr 19 16:37:14 2012
New Revision: 1328041
URL: http://svn.apache.org/viewvc?rev=1328041&view=rev
Log:
OAK-11: Document and tighten contract of Microkernel API
Modified:
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java?rev=1328041&r1=1328040&r2=1328041&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/api/MicroKernel.java Thu Apr 19 16:37:14 2012
@@ -101,11 +101,21 @@ public interface MicroKernel {
/**
* Returns a revision journal, starting with {@code fromRevisionId}
- * and ending with @code toRevisionId}.
+ * and ending with {@code toRevisionId} in ascending chronological order
+ * the revision denoted by {@code fromRevisionId} is expected to be older
+ * i.e. than the one denoted by {@code toRevisionId});
* <p/>
* Format:
* <pre>
- * [ { "id" : "<revisionId>", "ts" : "<revisionTimestamp>", "msg" : "<commitMessage>", "changes" : "<JSON diff>" }, ... ]
+ * [
+ * {
+ * "id" : "<revisionId>",
+ * "ts" : "<revisionTimestamp>",
+ * "msg" : "<commitMessage>",
+ * "changes" : "<JSON diff>"
+ * },
+ * ...
+ * ]
* </pre>
*
* @param fromRevisionId id of first revision to be returned in journal
@@ -124,16 +134,10 @@ public interface MicroKernel {
/**
* Returns the JSON diff representation of the changes between the specified
* revisions. The changes will be consolidated if the specified range
- * covers intermediary revisions. The revisions need not be in a specified
- * chronological order.
+ * covers intermediary revisions. {@code fromRevisionId} and {@code toRevisionId}
+ * don't need not be in a specific chronological order.
*
- * <p/>
- * Format:
- * <pre>
- * [ { "id" : "<revisionId>", "ts" : "<revisionTimestamp>", "msg" : "<commitMessage>", "changes" : "<JSON diff>" }, ... ]
- * </pre>
- *
- * @param fromRevisionId a revision id
+ * @param fromRevisionId a revision id, if {@code null} the current head revision is assumed
* @param toRevisionId another revision id, if {@code null} the current head revision is assumed
* @param filter (optional) filter criteria
* (e.g. path, property names, etc);