Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 70AF793F5 for ; Thu, 8 Dec 2011 18:58:59 +0000 (UTC) Received: (qmail 81926 invoked by uid 500); 8 Dec 2011 18:58:59 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 81898 invoked by uid 500); 8 Dec 2011 18:58:59 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 81891 invoked by uid 99); 8 Dec 2011 18:58:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Dec 2011 18:58:59 +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, 08 Dec 2011 18:58:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 43EBE23888E7; Thu, 8 Dec 2011 18:58:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1212033 - in /jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit: json/JsonValue.java utils/ValueConverter.java Date: Thu, 08 Dec 2011 18:58:37 -0000 To: commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111208185837.43EBE23888E7@eris.apache.org> Author: mduerig Date: Thu Dec 8 18:58:36 2011 New Revision: 1212033 URL: http://svn.apache.org/viewvc?rev=1212033&view=rev Log: Microkernel based prototype of JCR implementation (WIP) - add factory methods - add remove method Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/json/JsonValue.java jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/utils/ValueConverter.java Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/json/JsonValue.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/json/JsonValue.java?rev=1212033&r1=1212032&r2=1212033&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/json/JsonValue.java (original) +++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/json/JsonValue.java Thu Dec 8 18:58:36 2011 @@ -19,7 +19,10 @@ package org.apache.jackrabbit.json; +import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -274,6 +277,25 @@ public abstract class JsonValue { this.type = type; } + public static JsonAtom string(String value) { + return new JsonAtom(value, Type.STRING); + } + + public static JsonAtom number(double value) { + if (Double.isNaN(value) || Double.isInfinite(value)) { + throw new IllegalArgumentException(Double.toString(value)); + } + return new JsonAtom(Double.toString(value), Type.NUMBER); + } + + public static JsonAtom number(long value) { + return new JsonAtom(Long.toString(value), Type.NUMBER); + } + + public static JsonAtom number(BigDecimal value) { + return new JsonAtom(value.toString(), Type.NUMBER); + } + /** * Create a new {@code JsonAtom} from {@code token}. * @param token @@ -356,6 +378,10 @@ public abstract class JsonValue { this.values = values; } + public JsonArray() { + this(new ArrayList()); + } + /** * Append {@code value} to the end of this array. * @param value @@ -436,6 +462,10 @@ public abstract class JsonValue { this.values = values; } + public JsonObject() { + this(new HashMap()); + } + /** * Put {@code value} into this object * @param key @@ -454,6 +484,16 @@ public abstract class JsonValue { return values.get(key); } + /** + * Remove {@code key} from this object + * @param key + * @return the {@code JsonValue} identified by {@code key} or {@code null} + * if no value exists for {@code key}. + */ + public JsonValue remove(String key) { + return values.remove(key); + } + public boolean isEmpty() { return values.isEmpty(); } Modified: jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/utils/ValueConverter.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/utils/ValueConverter.java?rev=1212033&r1=1212032&r2=1212033&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/utils/ValueConverter.java (original) +++ jackrabbit/sandbox/jackrabbit-microkernel/src/main/java/org/apache/jackrabbit/utils/ValueConverter.java Thu Dec 8 18:58:36 2011 @@ -22,7 +22,6 @@ package org.apache.jackrabbit.utils; import org.apache.jackrabbit.json.JsonValue; import org.apache.jackrabbit.json.JsonValue.JsonArray; import org.apache.jackrabbit.json.JsonValue.JsonAtom; -import org.apache.jackrabbit.json.JsonValue.Type; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; @@ -39,15 +38,19 @@ public final class ValueConverter { public static JsonValue toJsonValue(Value value) throws RepositoryException { switch (value.getType()) { case PropertyType.STRING: { - return new JsonAtom(value.getString(), Type.STRING); + return JsonAtom.string(value.getString()); + } + case PropertyType.DOUBLE: { + return JsonAtom.number(value.getDouble()); // todo mind NaN + } + case PropertyType.LONG: { + return JsonAtom.number(value.getLong()); } - case PropertyType.LONG: - case PropertyType.DOUBLE: case PropertyType.DECIMAL: { - return new JsonAtom(value.getString(), Type.NUMBER); // todo mind NaN + return JsonAtom.number(value.getDecimal()); } case PropertyType.BOOLEAN: { - return new JsonAtom(value.getString(), Type.BOOLEAN); + return value.getBoolean() ? JsonAtom.TRUE : JsonAtom.FALSE; } case PropertyType.BINARY: case PropertyType.DATE: