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 DF6E0D9E3 for ; Wed, 12 Sep 2012 10:03:15 +0000 (UTC) Received: (qmail 53227 invoked by uid 500); 12 Sep 2012 10:03:15 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 53213 invoked by uid 500); 12 Sep 2012 10:03:15 -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 53190 invoked by uid 99); 12 Sep 2012 10:03:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Sep 2012 10:03:15 +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; Wed, 12 Sep 2012 10:03:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DCD2723888E4; Wed, 12 Sep 2012 10:02:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1383873 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/JsopUtil.java Date: Wed, 12 Sep 2012 10:02:30 -0000 To: oak-commits@jackrabbit.apache.org From: thomasm@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120912100230.DCD2723888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: thomasm Date: Wed Sep 12 10:02:30 2012 New Revision: 1383873 URL: http://svn.apache.org/viewvc?rev=1383873&view=rev Log: OAK-288 QueryTests should use the NodeStore apis - simplify JsopUtils Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/JsopUtil.java Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/JsopUtil.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/JsopUtil.java?rev=1383873&r1=1383872&r2=1383873&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/JsopUtil.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/JsopUtil.java Wed Sep 12 10:02:30 2012 @@ -52,42 +52,34 @@ public class JsopUtil { *

* * @param root - * @param commit - * - the commit string + * @param commit the commit string + * @param vf the value factory + * @throws UnsupportedOperationException if the operation is not supported */ public static void apply(Root root, String commit, CoreValueFactory vf) - throws Exception { + throws UnsupportedOperationException { int index = commit.indexOf(' '); String path = commit.substring(0, index).trim(); - commit = commit.substring(index).trim(); - - index = commit.indexOf(' '); - String op = commit.substring(0, index).trim(); - commit = commit.substring(index).trim(); - - if (!"+".equals(op) && !"-".equals(op)) { - throw new Exception("Unknown operation " + op - + ". This should be either '+' or '-'."); - } - if (commit.length() == 0) { - return; - } - boolean isAdd = "+".equals(op); Tree c = root.getTree(path); if (c == null) { // TODO create intermediary? - throw new Exception("non existing path " + path); + throw new UnsupportedOperationException("Non existing path " + path); } - if (isAdd) { - addTree(c, commit, vf); + commit = commit.substring(index); + JsopTokenizer tokenizer = new JsopTokenizer(commit); + if (tokenizer.matches('-')) { + removeTree(c, tokenizer); + } else if (tokenizer.matches('+')) { + addTree(c, tokenizer, vf); } else { - removeTree(c, commit); + throw new UnsupportedOperationException( + "Unsupported " + (char) tokenizer.read() + + ". This should be either '+' or '-'."); } } - private static void removeTree(Tree t, String pathIn) { - String path = new JsopTokenizer(pathIn).readString(); - + private static void removeTree(Tree t, JsopTokenizer tokenizer) { + String path = tokenizer.readString(); Iterator pathIterator = PathUtils.elements(path).iterator(); while (pathIterator.hasNext()) { String p = pathIterator.next(); @@ -99,39 +91,26 @@ public class JsopUtil { t.remove(); } - private static void addTree(Tree t, String pathIn, CoreValueFactory vf) - throws Exception { - addTree(t, new JsopTokenizer(pathIn), vf); - } - - private static void addTree(Tree t, JsopTokenizer tokenizer, - CoreValueFactory vf) throws Exception { - if (!tokenizer.matches('}')) { - do { - String key = tokenizer.readString(); - tokenizer.read(':'); - if (tokenizer.matches('{')) { - addTree(t.addChild(key), tokenizer, vf); - } else { - String val = tokenizer.readRawValue(); - if (val.startsWith("[")) { - val = val.substring(val.indexOf('[') + 1, - val.indexOf(']')); - List mvp = new ArrayList(); - for (String v : val.split(",")) { - mvp.add(vf.createValue(JsopTokenizer.decodeQuoted(v - .trim()))); - } - t.setProperty(key, mvp); - } else { - t.setProperty(key, vf.createValue(JsopTokenizer - .decodeQuoted(val.trim()))); - } + private static void addTree(Tree t, JsopTokenizer tokenizer, CoreValueFactory vf) { + do { + String key = tokenizer.readString(); + tokenizer.read(':'); + if (tokenizer.matches('{')) { + Tree c = t.addChild(key); + if (!tokenizer.matches('}')) { + addTree(c, tokenizer, vf); + tokenizer.read('}'); } - } while (tokenizer.matches(',')); - if (tokenizer.getPos() != tokenizer.getLastPos()) { - tokenizer.read('}'); + } else if (tokenizer.matches('[')) { + List mvp = new ArrayList(); + do { + mvp.add(vf.createValue(tokenizer.readString())); + } while (tokenizer.matches(',')); + tokenizer.read(']'); + t.setProperty(key, mvp); + } else { + t.setProperty(key, vf.createValue(tokenizer.readString())); } - } + } while (tokenizer.matches(',')); } }