Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-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 7FEB0DD30 for ; Fri, 19 Oct 2012 02:00:25 +0000 (UTC) Received: (qmail 71348 invoked by uid 500); 19 Oct 2012 02:00:25 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 71309 invoked by uid 500); 19 Oct 2012 02:00:25 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Delivered-To: moderator for commits@cassandra.apache.org Received: (qmail 76150 invoked by uid 99); 18 Oct 2012 15:48:53 -0000 X-ASF-Spam-Status: No, hits=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of 3xSSAUCAMAJg42KK2F5J2-B534.2H2496-6PLJ2K.GJ84G56KHGL.4GE@codesite.bounces.google.com designates 209.85.212.76 as permitted sender) MIME-Version: 1.0 X-Generated-By: Google Code Message-ID: <20cf3074b5281b480704cc5751c4@google.com> Date: Thu, 18 Oct 2012 15:48:21 +0000 Subject: [cassandra-jdbc] push by wfs...@gmail.com - Merge branch 'master' into trunk on 2012-10-18 15:48 GMT From: cassandra-jdbc.apache-extras.org@codespot.com To: commits@cassandra.apache.org Content-Type: text/plain; charset=ISO-8859-1; format=flowed; delsp=yes X-Virus-Checked: Checked by ClamAV on apache.org Revision: 9981ad17d2f0 Author: Rick Shaw Date: Thu Oct 18 08:43:37 2012 Log: Merge branch 'master' into trunk http://code.google.com/a/apache-extras.org/p/cassandra-jdbc/source/detail?r=9981ad17d2f0 Modified: /src/main/java/org/apache/cassandra/cql/jdbc/TypedColumn.java ======================================= --- /src/main/java/org/apache/cassandra/cql/jdbc/TypedColumn.java Tue Sep 18 15:39:25 2012 +++ /src/main/java/org/apache/cassandra/cql/jdbc/TypedColumn.java Thu Oct 18 08:43:37 2012 @@ -27,18 +27,18 @@ import org.apache.cassandra.utils.ByteBufferUtil; -public class TypedColumn +public class TypedColumn { private final Column rawColumn; // we cache the frequently-accessed forms: java object for value, String for name. // Note that {N|V}.toString() isn't always the same as Type.getString // (a good example is byte buffers). - private final Object value; + private final T value; private final String nameString; - private final AbstractJdbcType nameType, valueType; + private final AbstractJdbcType nameType, valueType; - public TypedColumn(Column column, AbstractJdbcType comparator, AbstractJdbcType validator) + public TypedColumn(Column column, AbstractJdbcType comparator, AbstractJdbcType validator) { rawColumn = column; this.value = (column.value == null | | !column.value.hasRemaining()) ? null : validator.compose(column.value); @@ -52,7 +52,7 @@ return rawColumn; } - public Object getValue() + public T getValue() { return value; } @@ -67,12 +67,12 @@ return valueType.getString(rawColumn.value); } - public AbstractJdbcType getNameType() + public AbstractJdbcType getNameType() { return nameType; } - public AbstractJdbcType getValueType() + public AbstractJdbcType getValueType() { return valueType; }