Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 63B3BDDA2 for ; Thu, 18 Oct 2012 15:14:56 +0000 (UTC) Received: (qmail 52151 invoked by uid 500); 18 Oct 2012 15:14:56 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 52130 invoked by uid 500); 18 Oct 2012 15:14:56 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 52101 invoked by uid 99); 18 Oct 2012 15:14:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Oct 2012 15:14:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Oct 2012 15:14:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B1AAC23888CD; Thu, 18 Oct 2012 15:14:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1399692 - in /jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk: core/MicroKernelImpl.java model/tree/DiffBuilder.java Date: Thu, 18 Oct 2012 15:14:07 -0000 To: oak-commits@jackrabbit.apache.org From: stefan@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121018151407.B1AAC23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stefan Date: Thu Oct 18 15:14:07 2012 New Revision: 1399692 URL: http://svn.apache.org/viewvc?rev=1399692&view=rev Log: OAK-384: get rid of add-property json diff syntax Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/tree/DiffBuilder.java Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java?rev=1399692&r1=1399691&r2=1399692&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java Thu Oct 18 15:14:07 2012 @@ -393,29 +393,14 @@ public class MicroKernelImpl implements pos = t.getLastPos(); String subPath = t.readString(); t.read(':'); - if (t.matches('{')) { - String nodePath = PathUtils.concat(path, subPath); - if (!PathUtils.isAbsolute(nodePath)) { - throw new Exception("absolute path expected: " + nodePath + ", pos: " + pos); - } - String parentPath = PathUtils.getParentPath(nodePath); - String nodeName = PathUtils.getName(nodePath); - cb.addNode(parentPath, nodeName, JsonObject.create(t)); - } else { - String value; - if (t.matches(JsopReader.NULL)) { - value = null; - } else { - value = t.readRawValue().trim(); - } - String targetPath = PathUtils.concat(path, subPath); - if (!PathUtils.isAbsolute(targetPath)) { - throw new Exception("absolute path expected: " + targetPath + ", pos: " + pos); - } - String parentPath = PathUtils.getParentPath(targetPath); - String propName = PathUtils.getName(targetPath); - cb.setProperty(parentPath, propName, value); - } + t.read('{'); + String nodePath = PathUtils.concat(path, subPath); + if (!PathUtils.isAbsolute(nodePath)) { + throw new Exception("absolute path expected: " + nodePath + ", pos: " + pos); + } + String parentPath = PathUtils.getParentPath(nodePath); + String nodeName = PathUtils.getName(nodePath); + cb.addNode(parentPath, nodeName, JsonObject.create(t)); break; } case '-': { Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/tree/DiffBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/tree/DiffBuilder.java?rev=1399692&r1=1399691&r2=1399692&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/tree/DiffBuilder.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/tree/DiffBuilder.java Thu Oct 18 15:14:07 2012 @@ -78,7 +78,7 @@ public class DiffBuilder { public void propertyAdded(PropertyState after) { String p = PathUtils.concat(getCurrentPath(), after.getName()); if (p.startsWith(pathFilter)) { - buff.tag('+'). + buff.tag('^'). key(p). encodedValue(after.getEncodedValue()). newline(); @@ -173,7 +173,7 @@ public class DiffBuilder { public void propertyAdded(PropertyState after) { String p = PathUtils.concat(getCurrentPath(), after.getName()); if (p.startsWith(pathFilter)) { - buff.tag('+'). + buff.tag('^'). key(p). encodedValue(after.getEncodedValue()). newline();