gora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lewi...@apache.org
Subject [20/37] gora git commit: Fix review comments
Date Wed, 23 Aug 2017 20:55:18 GMT
http://git-wip-us.apache.org/repos/asf/gora/blob/c5352b0e/gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/avroSerialization/CassandraRecord.java
----------------------------------------------------------------------
diff --git a/gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/avroSerialization/CassandraRecord.java b/gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/avroSerialization/CassandraRecord.java
deleted file mode 100644
index 4a92882..0000000
--- a/gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/avroSerialization/CassandraRecord.java
+++ /dev/null
@@ -1,1293 +0,0 @@
-/**
- *Licensed to the Apache Software Foundation (ASF) under one
- *or more contributor license agreements.  See the NOTICE file
- *distributed with this work for additional information
- *regarding copyright ownership.  The ASF licenses this file
- *to you under the Apache License, Version 2.0 (the"
- *License"); you may not use this file except in compliance
- *with the License.  You may obtain a copy of the License at
- *
-  * http://www.apache.org/licenses/LICENSE-2.0
- * 
- *Unless required by applicable law or agreed to in writing, software
- *distributed under the License is distributed on an "AS IS" BASIS,
- *WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *See the License for the specific language governing permissions and
- *limitations under the License.
- */
-package org.apache.gora.cassandra.example.generated.avroSerialization;  
-
-public class CassandraRecord extends org.apache.gora.persistency.impl.PersistentBase implements org.apache.avro.specific.SpecificRecord, org.apache.gora.persistency.Persistent {
-  public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"CassandraRecord\",\"namespace\":\"org.apache.gora.cassandra.example.generated.avroSerialization\",\"fields\":[{\"name\":\"dataString\",\"type\":\"string\",\"default\":\"\"},{\"name\":\"dataInt\",\"type\":\"int\",\"default\":0},{\"name\":\"dataLong\",\"type\":[\"null\",\"long\"],\"default\":null},{\"name\":\"dataDouble\",\"type\":[\"null\",\"double\"],\"default\":null},{\"name\":\"dataBytes\",\"type\":[\"null\",\"bytes\"],\"default\":null},{\"name\":\"arrayInt\",\"type\":{\"type\":\"array\",\"items\":\"int\"},\"default\":null},{\"name\":\"arrayString\",\"type\":{\"type\":\"array\",\"items\":\"string\"},\"default\":null},{\"name\":\"arrayLong\",\"type\":{\"type\":\"array\",\"items\":\"long\"},\"default\":null},{\"name\":\"arrayDouble\",\"type\":{\"type\":\"array\",\"items\":\"double\"},\"default\":null},{\"name\":\"mapInt\",\"type\":{\"type\":\"map\",\"valu
 es\":\"int\"},\"default\":{}},{\"name\":\"mapString\",\"type\":{\"type\":\"map\",\"values\":\"string\"},\"default\":{}},{\"name\":\"mapLong\",\"type\":{\"type\":\"map\",\"values\":\"long\"},\"default\":{}},{\"name\":\"mapDouble\",\"type\":{\"type\":\"map\",\"values\":\"double\"},\"default\":{}}],\"default\":null}");
-  private static final long serialVersionUID = 5865822911454498901L;
-  /** Enum containing all data bean's fields. */
-  public static enum Field {
-    DATA_STRING(0, "dataString"),
-    DATA_INT(1, "dataInt"),
-    DATA_LONG(2, "dataLong"),
-    DATA_DOUBLE(3, "dataDouble"),
-    DATA_BYTES(4, "dataBytes"),
-    ARRAY_INT(5, "arrayInt"),
-    ARRAY_STRING(6, "arrayString"),
-    ARRAY_LONG(7, "arrayLong"),
-    ARRAY_DOUBLE(8, "arrayDouble"),
-    MAP_INT(9, "mapInt"),
-    MAP_STRING(10, "mapString"),
-    MAP_LONG(11, "mapLong"),
-    MAP_DOUBLE(12, "mapDouble"),
-    ;
-    /**
-     * Field's index.
-     */
-    private int index;
-
-    /**
-     * Field's name.
-     */
-    private String name;
-
-    /**
-     * Field's constructor
-     * @param index field's index.
-     * @param name field's name.
-     */
-    Field(int index, String name) {this.index=index;this.name=name;}
-
-    /**
-     * Gets field's index.
-     * @return int field's index.
-     */
-    public int getIndex() {return index;}
-
-    /**
-     * Gets field's name.
-     * @return String field's name.
-     */
-    public String getName() {return name;}
-
-    /**
-     * Gets field's attributes to string.
-     * @return String field's attributes to string.
-     */
-    public String toString() {return name;}
-  };
-
-  public static final String[] _ALL_FIELDS = {
-  "dataString",
-  "dataInt",
-  "dataLong",
-  "dataDouble",
-  "dataBytes",
-  "arrayInt",
-  "arrayString",
-  "arrayLong",
-  "arrayDouble",
-  "mapInt",
-  "mapString",
-  "mapLong",
-  "mapDouble",
-  };
-
-  /**
-   * Gets the total field count.
-   * @return int field count
-   */
-  public int getFieldsCount() {
-    return CassandraRecord._ALL_FIELDS.length;
-  }
-
-  private java.lang.CharSequence dataString;
-  private int dataInt;
-  private java.lang.Long dataLong;
-  private java.lang.Double dataDouble;
-  private java.nio.ByteBuffer dataBytes;
-  private java.util.List<java.lang.Integer> arrayInt;
-  private java.util.List<java.lang.CharSequence> arrayString;
-  private java.util.List<java.lang.Long> arrayLong;
-  private java.util.List<java.lang.Double> arrayDouble;
-  private java.util.Map<java.lang.CharSequence,java.lang.Integer> mapInt;
-  private java.util.Map<java.lang.CharSequence,java.lang.CharSequence> mapString;
-  private java.util.Map<java.lang.CharSequence,java.lang.Long> mapLong;
-  private java.util.Map<java.lang.CharSequence,java.lang.Double> mapDouble;
-  public org.apache.avro.Schema getSchema() { return SCHEMA$; }
-  // Used by DatumWriter.  Applications should not call. 
-  public java.lang.Object get(int field$) {
-    switch (field$) {
-    case 0: return dataString;
-    case 1: return dataInt;
-    case 2: return dataLong;
-    case 3: return dataDouble;
-    case 4: return dataBytes;
-    case 5: return arrayInt;
-    case 6: return arrayString;
-    case 7: return arrayLong;
-    case 8: return arrayDouble;
-    case 9: return mapInt;
-    case 10: return mapString;
-    case 11: return mapLong;
-    case 12: return mapDouble;
-    default: throw new org.apache.avro.AvroRuntimeException("Bad index");
-    }
-  }
-  
-  // Used by DatumReader.  Applications should not call. 
-  @SuppressWarnings(value="unchecked")
-  public void put(int field$, java.lang.Object value) {
-    switch (field$) {
-    case 0: dataString = (java.lang.CharSequence)(value); break;
-    case 1: dataInt = (java.lang.Integer)(value); break;
-    case 2: dataLong = (java.lang.Long)(value); break;
-    case 3: dataDouble = (java.lang.Double)(value); break;
-    case 4: dataBytes = (java.nio.ByteBuffer)(value); break;
-    case 5: arrayInt = (java.util.List<java.lang.Integer>)((value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyListWrapper((java.util.List)value)); break;
-    case 6: arrayString = (java.util.List<java.lang.CharSequence>)((value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyListWrapper((java.util.List)value)); break;
-    case 7: arrayLong = (java.util.List<java.lang.Long>)((value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyListWrapper((java.util.List)value)); break;
-    case 8: arrayDouble = (java.util.List<java.lang.Double>)((value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyListWrapper((java.util.List)value)); break;
-    case 9: mapInt = (java.util.Map<java.lang.CharSequence,java.lang.Integer>)((value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)value)); break;
-    case 10: mapString = (java.util.Map<java.lang.CharSequence,java.lang.CharSequence>)((value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)value)); break;
-    case 11: mapLong = (java.util.Map<java.lang.CharSequence,java.lang.Long>)((value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)value)); break;
-    case 12: mapDouble = (java.util.Map<java.lang.CharSequence,java.lang.Double>)((value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)value)); break;
-    default: throw new org.apache.avro.AvroRuntimeException("Bad index");
-    }
-  }
-
-  /**
-   * Gets the value of the 'dataString' field.
-   */
-  public java.lang.CharSequence getDataString() {
-    return dataString;
-  }
-
-  /**
-   * Sets the value of the 'dataString' field.
-   * @param value the value to set.
-   */
-  public void setDataString(java.lang.CharSequence value) {
-    this.dataString = value;
-    setDirty(0);
-  }
-  
-  /**
-   * Checks the dirty status of the 'dataString' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
-   */
-  public boolean isDataStringDirty() {
-    return isDirty(0);
-  }
-
-  /**
-   * Gets the value of the 'dataInt' field.
-   */
-  public java.lang.Integer getDataInt() {
-    return dataInt;
-  }
-
-  /**
-   * Sets the value of the 'dataInt' field.
-   * @param value the value to set.
-   */
-  public void setDataInt(java.lang.Integer value) {
-    this.dataInt = value;
-    setDirty(1);
-  }
-  
-  /**
-   * Checks the dirty status of the 'dataInt' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
-   */
-  public boolean isDataIntDirty() {
-    return isDirty(1);
-  }
-
-  /**
-   * Gets the value of the 'dataLong' field.
-   */
-  public java.lang.Long getDataLong() {
-    return dataLong;
-  }
-
-  /**
-   * Sets the value of the 'dataLong' field.
-   * @param value the value to set.
-   */
-  public void setDataLong(java.lang.Long value) {
-    this.dataLong = value;
-    setDirty(2);
-  }
-  
-  /**
-   * Checks the dirty status of the 'dataLong' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
-   */
-  public boolean isDataLongDirty() {
-    return isDirty(2);
-  }
-
-  /**
-   * Gets the value of the 'dataDouble' field.
-   */
-  public java.lang.Double getDataDouble() {
-    return dataDouble;
-  }
-
-  /**
-   * Sets the value of the 'dataDouble' field.
-   * @param value the value to set.
-   */
-  public void setDataDouble(java.lang.Double value) {
-    this.dataDouble = value;
-    setDirty(3);
-  }
-  
-  /**
-   * Checks the dirty status of the 'dataDouble' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
-   */
-  public boolean isDataDoubleDirty() {
-    return isDirty(3);
-  }
-
-  /**
-   * Gets the value of the 'dataBytes' field.
-   */
-  public java.nio.ByteBuffer getDataBytes() {
-    return dataBytes;
-  }
-
-  /**
-   * Sets the value of the 'dataBytes' field.
-   * @param value the value to set.
-   */
-  public void setDataBytes(java.nio.ByteBuffer value) {
-    this.dataBytes = value;
-    setDirty(4);
-  }
-  
-  /**
-   * Checks the dirty status of the 'dataBytes' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
-   */
-  public boolean isDataBytesDirty() {
-    return isDirty(4);
-  }
-
-  /**
-   * Gets the value of the 'arrayInt' field.
-   */
-  public java.util.List<java.lang.Integer> getArrayInt() {
-    return arrayInt;
-  }
-
-  /**
-   * Sets the value of the 'arrayInt' field.
-   * @param value the value to set.
-   */
-  public void setArrayInt(java.util.List<java.lang.Integer> value) {
-    this.arrayInt = (value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyListWrapper(value);
-    setDirty(5);
-  }
-  
-  /**
-   * Checks the dirty status of the 'arrayInt' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
-   */
-  public boolean isArrayIntDirty() {
-    return isDirty(5);
-  }
-
-  /**
-   * Gets the value of the 'arrayString' field.
-   */
-  public java.util.List<java.lang.CharSequence> getArrayString() {
-    return arrayString;
-  }
-
-  /**
-   * Sets the value of the 'arrayString' field.
-   * @param value the value to set.
-   */
-  public void setArrayString(java.util.List<java.lang.CharSequence> value) {
-    this.arrayString = (value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyListWrapper(value);
-    setDirty(6);
-  }
-  
-  /**
-   * Checks the dirty status of the 'arrayString' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
-   */
-  public boolean isArrayStringDirty() {
-    return isDirty(6);
-  }
-
-  /**
-   * Gets the value of the 'arrayLong' field.
-   */
-  public java.util.List<java.lang.Long> getArrayLong() {
-    return arrayLong;
-  }
-
-  /**
-   * Sets the value of the 'arrayLong' field.
-   * @param value the value to set.
-   */
-  public void setArrayLong(java.util.List<java.lang.Long> value) {
-    this.arrayLong = (value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyListWrapper(value);
-    setDirty(7);
-  }
-  
-  /**
-   * Checks the dirty status of the 'arrayLong' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
-   */
-  public boolean isArrayLongDirty() {
-    return isDirty(7);
-  }
-
-  /**
-   * Gets the value of the 'arrayDouble' field.
-   */
-  public java.util.List<java.lang.Double> getArrayDouble() {
-    return arrayDouble;
-  }
-
-  /**
-   * Sets the value of the 'arrayDouble' field.
-   * @param value the value to set.
-   */
-  public void setArrayDouble(java.util.List<java.lang.Double> value) {
-    this.arrayDouble = (value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyListWrapper(value);
-    setDirty(8);
-  }
-  
-  /**
-   * Checks the dirty status of the 'arrayDouble' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
-   */
-  public boolean isArrayDoubleDirty() {
-    return isDirty(8);
-  }
-
-  /**
-   * Gets the value of the 'mapInt' field.
-   */
-  public java.util.Map<java.lang.CharSequence,java.lang.Integer> getMapInt() {
-    return mapInt;
-  }
-
-  /**
-   * Sets the value of the 'mapInt' field.
-   * @param value the value to set.
-   */
-  public void setMapInt(java.util.Map<java.lang.CharSequence,java.lang.Integer> value) {
-    this.mapInt = (value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyMapWrapper(value);
-    setDirty(9);
-  }
-  
-  /**
-   * Checks the dirty status of the 'mapInt' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
-   */
-  public boolean isMapIntDirty() {
-    return isDirty(9);
-  }
-
-  /**
-   * Gets the value of the 'mapString' field.
-   */
-  public java.util.Map<java.lang.CharSequence,java.lang.CharSequence> getMapString() {
-    return mapString;
-  }
-
-  /**
-   * Sets the value of the 'mapString' field.
-   * @param value the value to set.
-   */
-  public void setMapString(java.util.Map<java.lang.CharSequence,java.lang.CharSequence> value) {
-    this.mapString = (value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyMapWrapper(value);
-    setDirty(10);
-  }
-  
-  /**
-   * Checks the dirty status of the 'mapString' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
-   */
-  public boolean isMapStringDirty() {
-    return isDirty(10);
-  }
-
-  /**
-   * Gets the value of the 'mapLong' field.
-   */
-  public java.util.Map<java.lang.CharSequence,java.lang.Long> getMapLong() {
-    return mapLong;
-  }
-
-  /**
-   * Sets the value of the 'mapLong' field.
-   * @param value the value to set.
-   */
-  public void setMapLong(java.util.Map<java.lang.CharSequence,java.lang.Long> value) {
-    this.mapLong = (value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyMapWrapper(value);
-    setDirty(11);
-  }
-  
-  /**
-   * Checks the dirty status of the 'mapLong' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
-   */
-  public boolean isMapLongDirty() {
-    return isDirty(11);
-  }
-
-  /**
-   * Gets the value of the 'mapDouble' field.
-   */
-  public java.util.Map<java.lang.CharSequence,java.lang.Double> getMapDouble() {
-    return mapDouble;
-  }
-
-  /**
-   * Sets the value of the 'mapDouble' field.
-   * @param value the value to set.
-   */
-  public void setMapDouble(java.util.Map<java.lang.CharSequence,java.lang.Double> value) {
-    this.mapDouble = (value instanceof org.apache.gora.persistency.Dirtyable) ? value : new org.apache.gora.persistency.impl.DirtyMapWrapper(value);
-    setDirty(12);
-  }
-  
-  /**
-   * Checks the dirty status of the 'mapDouble' field. A field is dirty if it represents a change that has not yet been written to the database.
-   * @param value the value to set.
-   */
-  public boolean isMapDoubleDirty() {
-    return isDirty(12);
-  }
-
-  /** Creates a new CassandraRecord RecordBuilder */
-  public static org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder newBuilder() {
-    return new org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder();
-  }
-  
-  /** Creates a new CassandraRecord RecordBuilder by copying an existing Builder */
-  public static org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder newBuilder(org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder other) {
-    return new org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder(other);
-  }
-  
-  /** Creates a new CassandraRecord RecordBuilder by copying an existing CassandraRecord instance */
-  public static org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder newBuilder(org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord other) {
-    return new org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder(other);
-  }
-  
-  private static java.nio.ByteBuffer deepCopyToReadOnlyBuffer(
-      java.nio.ByteBuffer input) {
-    java.nio.ByteBuffer copy = java.nio.ByteBuffer.allocate(input.capacity());
-    int position = input.position();
-    input.reset();
-    int mark = input.position();
-    int limit = input.limit();
-    input.rewind();
-    input.limit(input.capacity());
-    copy.put(input);
-    input.rewind();
-    copy.rewind();
-    input.position(mark);
-    input.mark();
-    copy.position(mark);
-    copy.mark();
-    input.position(position);
-    copy.position(position);
-    input.limit(limit);
-    copy.limit(limit);
-    return copy.asReadOnlyBuffer();
-  }
-  
-  /**
-   * RecordBuilder for CassandraRecord instances.
-   */
-  public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase<CassandraRecord>
-    implements org.apache.avro.data.RecordBuilder<CassandraRecord> {
-
-    private java.lang.CharSequence dataString;
-    private int dataInt;
-    private java.lang.Long dataLong;
-    private java.lang.Double dataDouble;
-    private java.nio.ByteBuffer dataBytes;
-    private java.util.List<java.lang.Integer> arrayInt;
-    private java.util.List<java.lang.CharSequence> arrayString;
-    private java.util.List<java.lang.Long> arrayLong;
-    private java.util.List<java.lang.Double> arrayDouble;
-    private java.util.Map<java.lang.CharSequence,java.lang.Integer> mapInt;
-    private java.util.Map<java.lang.CharSequence,java.lang.CharSequence> mapString;
-    private java.util.Map<java.lang.CharSequence,java.lang.Long> mapLong;
-    private java.util.Map<java.lang.CharSequence,java.lang.Double> mapDouble;
-
-    /** Creates a new Builder */
-    private Builder() {
-      super(org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.SCHEMA$);
-    }
-    
-    /** Creates a Builder by copying an existing Builder */
-    private Builder(org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder other) {
-      super(other);
-    }
-    
-    /** Creates a Builder by copying an existing CassandraRecord instance */
-    private Builder(org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord other) {
-            super(org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.SCHEMA$);
-      if (isValidValue(fields()[0], other.dataString)) {
-        this.dataString = (java.lang.CharSequence) data().deepCopy(fields()[0].schema(), other.dataString);
-        fieldSetFlags()[0] = true;
-      }
-      if (isValidValue(fields()[1], other.dataInt)) {
-        this.dataInt = (java.lang.Integer) data().deepCopy(fields()[1].schema(), other.dataInt);
-        fieldSetFlags()[1] = true;
-      }
-      if (isValidValue(fields()[2], other.dataLong)) {
-        this.dataLong = (java.lang.Long) data().deepCopy(fields()[2].schema(), other.dataLong);
-        fieldSetFlags()[2] = true;
-      }
-      if (isValidValue(fields()[3], other.dataDouble)) {
-        this.dataDouble = (java.lang.Double) data().deepCopy(fields()[3].schema(), other.dataDouble);
-        fieldSetFlags()[3] = true;
-      }
-      if (isValidValue(fields()[4], other.dataBytes)) {
-        this.dataBytes = (java.nio.ByteBuffer) data().deepCopy(fields()[4].schema(), other.dataBytes);
-        fieldSetFlags()[4] = true;
-      }
-      if (isValidValue(fields()[5], other.arrayInt)) {
-        this.arrayInt = (java.util.List<java.lang.Integer>) data().deepCopy(fields()[5].schema(), other.arrayInt);
-        fieldSetFlags()[5] = true;
-      }
-      if (isValidValue(fields()[6], other.arrayString)) {
-        this.arrayString = (java.util.List<java.lang.CharSequence>) data().deepCopy(fields()[6].schema(), other.arrayString);
-        fieldSetFlags()[6] = true;
-      }
-      if (isValidValue(fields()[7], other.arrayLong)) {
-        this.arrayLong = (java.util.List<java.lang.Long>) data().deepCopy(fields()[7].schema(), other.arrayLong);
-        fieldSetFlags()[7] = true;
-      }
-      if (isValidValue(fields()[8], other.arrayDouble)) {
-        this.arrayDouble = (java.util.List<java.lang.Double>) data().deepCopy(fields()[8].schema(), other.arrayDouble);
-        fieldSetFlags()[8] = true;
-      }
-      if (isValidValue(fields()[9], other.mapInt)) {
-        this.mapInt = (java.util.Map<java.lang.CharSequence,java.lang.Integer>) data().deepCopy(fields()[9].schema(), other.mapInt);
-        fieldSetFlags()[9] = true;
-      }
-      if (isValidValue(fields()[10], other.mapString)) {
-        this.mapString = (java.util.Map<java.lang.CharSequence,java.lang.CharSequence>) data().deepCopy(fields()[10].schema(), other.mapString);
-        fieldSetFlags()[10] = true;
-      }
-      if (isValidValue(fields()[11], other.mapLong)) {
-        this.mapLong = (java.util.Map<java.lang.CharSequence,java.lang.Long>) data().deepCopy(fields()[11].schema(), other.mapLong);
-        fieldSetFlags()[11] = true;
-      }
-      if (isValidValue(fields()[12], other.mapDouble)) {
-        this.mapDouble = (java.util.Map<java.lang.CharSequence,java.lang.Double>) data().deepCopy(fields()[12].schema(), other.mapDouble);
-        fieldSetFlags()[12] = true;
-      }
-    }
-
-    /** Gets the value of the 'dataString' field */
-    public java.lang.CharSequence getDataString() {
-      return dataString;
-    }
-    
-    /** Sets the value of the 'dataString' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder setDataString(java.lang.CharSequence value) {
-      validate(fields()[0], value);
-      this.dataString = value;
-      fieldSetFlags()[0] = true;
-      return this; 
-    }
-    
-    /** Checks whether the 'dataString' field has been set */
-    public boolean hasDataString() {
-      return fieldSetFlags()[0];
-    }
-    
-    /** Clears the value of the 'dataString' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder clearDataString() {
-      dataString = null;
-      fieldSetFlags()[0] = false;
-      return this;
-    }
-    
-    /** Gets the value of the 'dataInt' field */
-    public java.lang.Integer getDataInt() {
-      return dataInt;
-    }
-    
-    /** Sets the value of the 'dataInt' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder setDataInt(int value) {
-      validate(fields()[1], value);
-      this.dataInt = value;
-      fieldSetFlags()[1] = true;
-      return this; 
-    }
-    
-    /** Checks whether the 'dataInt' field has been set */
-    public boolean hasDataInt() {
-      return fieldSetFlags()[1];
-    }
-    
-    /** Clears the value of the 'dataInt' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder clearDataInt() {
-      fieldSetFlags()[1] = false;
-      return this;
-    }
-    
-    /** Gets the value of the 'dataLong' field */
-    public java.lang.Long getDataLong() {
-      return dataLong;
-    }
-    
-    /** Sets the value of the 'dataLong' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder setDataLong(java.lang.Long value) {
-      validate(fields()[2], value);
-      this.dataLong = value;
-      fieldSetFlags()[2] = true;
-      return this; 
-    }
-    
-    /** Checks whether the 'dataLong' field has been set */
-    public boolean hasDataLong() {
-      return fieldSetFlags()[2];
-    }
-    
-    /** Clears the value of the 'dataLong' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder clearDataLong() {
-      dataLong = null;
-      fieldSetFlags()[2] = false;
-      return this;
-    }
-    
-    /** Gets the value of the 'dataDouble' field */
-    public java.lang.Double getDataDouble() {
-      return dataDouble;
-    }
-    
-    /** Sets the value of the 'dataDouble' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder setDataDouble(java.lang.Double value) {
-      validate(fields()[3], value);
-      this.dataDouble = value;
-      fieldSetFlags()[3] = true;
-      return this; 
-    }
-    
-    /** Checks whether the 'dataDouble' field has been set */
-    public boolean hasDataDouble() {
-      return fieldSetFlags()[3];
-    }
-    
-    /** Clears the value of the 'dataDouble' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder clearDataDouble() {
-      dataDouble = null;
-      fieldSetFlags()[3] = false;
-      return this;
-    }
-    
-    /** Gets the value of the 'dataBytes' field */
-    public java.nio.ByteBuffer getDataBytes() {
-      return dataBytes;
-    }
-    
-    /** Sets the value of the 'dataBytes' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder setDataBytes(java.nio.ByteBuffer value) {
-      validate(fields()[4], value);
-      this.dataBytes = value;
-      fieldSetFlags()[4] = true;
-      return this; 
-    }
-    
-    /** Checks whether the 'dataBytes' field has been set */
-    public boolean hasDataBytes() {
-      return fieldSetFlags()[4];
-    }
-    
-    /** Clears the value of the 'dataBytes' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder clearDataBytes() {
-      dataBytes = null;
-      fieldSetFlags()[4] = false;
-      return this;
-    }
-    
-    /** Gets the value of the 'arrayInt' field */
-    public java.util.List<java.lang.Integer> getArrayInt() {
-      return arrayInt;
-    }
-    
-    /** Sets the value of the 'arrayInt' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder setArrayInt(java.util.List<java.lang.Integer> value) {
-      validate(fields()[5], value);
-      this.arrayInt = value;
-      fieldSetFlags()[5] = true;
-      return this; 
-    }
-    
-    /** Checks whether the 'arrayInt' field has been set */
-    public boolean hasArrayInt() {
-      return fieldSetFlags()[5];
-    }
-    
-    /** Clears the value of the 'arrayInt' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder clearArrayInt() {
-      arrayInt = null;
-      fieldSetFlags()[5] = false;
-      return this;
-    }
-    
-    /** Gets the value of the 'arrayString' field */
-    public java.util.List<java.lang.CharSequence> getArrayString() {
-      return arrayString;
-    }
-    
-    /** Sets the value of the 'arrayString' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder setArrayString(java.util.List<java.lang.CharSequence> value) {
-      validate(fields()[6], value);
-      this.arrayString = value;
-      fieldSetFlags()[6] = true;
-      return this; 
-    }
-    
-    /** Checks whether the 'arrayString' field has been set */
-    public boolean hasArrayString() {
-      return fieldSetFlags()[6];
-    }
-    
-    /** Clears the value of the 'arrayString' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder clearArrayString() {
-      arrayString = null;
-      fieldSetFlags()[6] = false;
-      return this;
-    }
-    
-    /** Gets the value of the 'arrayLong' field */
-    public java.util.List<java.lang.Long> getArrayLong() {
-      return arrayLong;
-    }
-    
-    /** Sets the value of the 'arrayLong' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder setArrayLong(java.util.List<java.lang.Long> value) {
-      validate(fields()[7], value);
-      this.arrayLong = value;
-      fieldSetFlags()[7] = true;
-      return this; 
-    }
-    
-    /** Checks whether the 'arrayLong' field has been set */
-    public boolean hasArrayLong() {
-      return fieldSetFlags()[7];
-    }
-    
-    /** Clears the value of the 'arrayLong' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder clearArrayLong() {
-      arrayLong = null;
-      fieldSetFlags()[7] = false;
-      return this;
-    }
-    
-    /** Gets the value of the 'arrayDouble' field */
-    public java.util.List<java.lang.Double> getArrayDouble() {
-      return arrayDouble;
-    }
-    
-    /** Sets the value of the 'arrayDouble' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder setArrayDouble(java.util.List<java.lang.Double> value) {
-      validate(fields()[8], value);
-      this.arrayDouble = value;
-      fieldSetFlags()[8] = true;
-      return this; 
-    }
-    
-    /** Checks whether the 'arrayDouble' field has been set */
-    public boolean hasArrayDouble() {
-      return fieldSetFlags()[8];
-    }
-    
-    /** Clears the value of the 'arrayDouble' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder clearArrayDouble() {
-      arrayDouble = null;
-      fieldSetFlags()[8] = false;
-      return this;
-    }
-    
-    /** Gets the value of the 'mapInt' field */
-    public java.util.Map<java.lang.CharSequence,java.lang.Integer> getMapInt() {
-      return mapInt;
-    }
-    
-    /** Sets the value of the 'mapInt' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder setMapInt(java.util.Map<java.lang.CharSequence,java.lang.Integer> value) {
-      validate(fields()[9], value);
-      this.mapInt = value;
-      fieldSetFlags()[9] = true;
-      return this; 
-    }
-    
-    /** Checks whether the 'mapInt' field has been set */
-    public boolean hasMapInt() {
-      return fieldSetFlags()[9];
-    }
-    
-    /** Clears the value of the 'mapInt' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder clearMapInt() {
-      mapInt = null;
-      fieldSetFlags()[9] = false;
-      return this;
-    }
-    
-    /** Gets the value of the 'mapString' field */
-    public java.util.Map<java.lang.CharSequence,java.lang.CharSequence> getMapString() {
-      return mapString;
-    }
-    
-    /** Sets the value of the 'mapString' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder setMapString(java.util.Map<java.lang.CharSequence,java.lang.CharSequence> value) {
-      validate(fields()[10], value);
-      this.mapString = value;
-      fieldSetFlags()[10] = true;
-      return this; 
-    }
-    
-    /** Checks whether the 'mapString' field has been set */
-    public boolean hasMapString() {
-      return fieldSetFlags()[10];
-    }
-    
-    /** Clears the value of the 'mapString' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder clearMapString() {
-      mapString = null;
-      fieldSetFlags()[10] = false;
-      return this;
-    }
-    
-    /** Gets the value of the 'mapLong' field */
-    public java.util.Map<java.lang.CharSequence,java.lang.Long> getMapLong() {
-      return mapLong;
-    }
-    
-    /** Sets the value of the 'mapLong' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder setMapLong(java.util.Map<java.lang.CharSequence,java.lang.Long> value) {
-      validate(fields()[11], value);
-      this.mapLong = value;
-      fieldSetFlags()[11] = true;
-      return this; 
-    }
-    
-    /** Checks whether the 'mapLong' field has been set */
-    public boolean hasMapLong() {
-      return fieldSetFlags()[11];
-    }
-    
-    /** Clears the value of the 'mapLong' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder clearMapLong() {
-      mapLong = null;
-      fieldSetFlags()[11] = false;
-      return this;
-    }
-    
-    /** Gets the value of the 'mapDouble' field */
-    public java.util.Map<java.lang.CharSequence,java.lang.Double> getMapDouble() {
-      return mapDouble;
-    }
-    
-    /** Sets the value of the 'mapDouble' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder setMapDouble(java.util.Map<java.lang.CharSequence,java.lang.Double> value) {
-      validate(fields()[12], value);
-      this.mapDouble = value;
-      fieldSetFlags()[12] = true;
-      return this; 
-    }
-    
-    /** Checks whether the 'mapDouble' field has been set */
-    public boolean hasMapDouble() {
-      return fieldSetFlags()[12];
-    }
-    
-    /** Clears the value of the 'mapDouble' field */
-    public org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord.Builder clearMapDouble() {
-      mapDouble = null;
-      fieldSetFlags()[12] = false;
-      return this;
-    }
-    
-    @Override
-    public CassandraRecord build() {
-      try {
-        CassandraRecord record = new CassandraRecord();
-        record.dataString = fieldSetFlags()[0] ? this.dataString : (java.lang.CharSequence) defaultValue(fields()[0]);
-        record.dataInt = fieldSetFlags()[1] ? this.dataInt : (java.lang.Integer) defaultValue(fields()[1]);
-        record.dataLong = fieldSetFlags()[2] ? this.dataLong : (java.lang.Long) defaultValue(fields()[2]);
-        record.dataDouble = fieldSetFlags()[3] ? this.dataDouble : (java.lang.Double) defaultValue(fields()[3]);
-        record.dataBytes = fieldSetFlags()[4] ? this.dataBytes : (java.nio.ByteBuffer) defaultValue(fields()[4]);
-        record.arrayInt = fieldSetFlags()[5] ? this.arrayInt : (java.util.List<java.lang.Integer>) new org.apache.gora.persistency.impl.DirtyListWrapper((java.util.List)defaultValue(fields()[5]));
-        record.arrayString = fieldSetFlags()[6] ? this.arrayString : (java.util.List<java.lang.CharSequence>) new org.apache.gora.persistency.impl.DirtyListWrapper((java.util.List)defaultValue(fields()[6]));
-        record.arrayLong = fieldSetFlags()[7] ? this.arrayLong : (java.util.List<java.lang.Long>) new org.apache.gora.persistency.impl.DirtyListWrapper((java.util.List)defaultValue(fields()[7]));
-        record.arrayDouble = fieldSetFlags()[8] ? this.arrayDouble : (java.util.List<java.lang.Double>) new org.apache.gora.persistency.impl.DirtyListWrapper((java.util.List)defaultValue(fields()[8]));
-        record.mapInt = fieldSetFlags()[9] ? this.mapInt : (java.util.Map<java.lang.CharSequence,java.lang.Integer>) new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)defaultValue(fields()[9]));
-        record.mapString = fieldSetFlags()[10] ? this.mapString : (java.util.Map<java.lang.CharSequence,java.lang.CharSequence>) new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)defaultValue(fields()[10]));
-        record.mapLong = fieldSetFlags()[11] ? this.mapLong : (java.util.Map<java.lang.CharSequence,java.lang.Long>) new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)defaultValue(fields()[11]));
-        record.mapDouble = fieldSetFlags()[12] ? this.mapDouble : (java.util.Map<java.lang.CharSequence,java.lang.Double>) new org.apache.gora.persistency.impl.DirtyMapWrapper((java.util.Map)defaultValue(fields()[12]));
-        return record;
-      } catch (Exception e) {
-        throw new org.apache.avro.AvroRuntimeException(e);
-      }
-    }
-  }
-  
-  public CassandraRecord.Tombstone getTombstone(){
-  	return TOMBSTONE;
-  }
-
-  public CassandraRecord newInstance(){
-    return newBuilder().build();
-  }
-
-  private static final Tombstone TOMBSTONE = new Tombstone();
-  
-  public static final class Tombstone extends CassandraRecord implements org.apache.gora.persistency.Tombstone {
-  
-      private Tombstone() { }
-  
-	  		  /**
-	   * Gets the value of the 'dataString' field.
-		   */
-	  public java.lang.CharSequence getDataString() {
-	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
-	  }
-	
-	  /**
-	   * Sets the value of the 'dataString' field.
-		   * @param value the value to set.
-	   */
-	  public void setDataString(java.lang.CharSequence value) {
-	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
-	  }
-	  
-	  /**
-	   * Checks the dirty status of the 'dataString' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
-	   */
-	  public boolean isDataStringDirty() {
-	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
-	  }
-	
-				  /**
-	   * Gets the value of the 'dataInt' field.
-		   */
-	  public java.lang.Integer getDataInt() {
-	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
-	  }
-	
-	  /**
-	   * Sets the value of the 'dataInt' field.
-		   * @param value the value to set.
-	   */
-	  public void setDataInt(java.lang.Integer value) {
-	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
-	  }
-	  
-	  /**
-	   * Checks the dirty status of the 'dataInt' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
-	   */
-	  public boolean isDataIntDirty() {
-	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
-	  }
-	
-				  /**
-	   * Gets the value of the 'dataLong' field.
-		   */
-	  public java.lang.Long getDataLong() {
-	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
-	  }
-	
-	  /**
-	   * Sets the value of the 'dataLong' field.
-		   * @param value the value to set.
-	   */
-	  public void setDataLong(java.lang.Long value) {
-	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
-	  }
-	  
-	  /**
-	   * Checks the dirty status of the 'dataLong' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
-	   */
-	  public boolean isDataLongDirty() {
-	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
-	  }
-	
-				  /**
-	   * Gets the value of the 'dataDouble' field.
-		   */
-	  public java.lang.Double getDataDouble() {
-	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
-	  }
-	
-	  /**
-	   * Sets the value of the 'dataDouble' field.
-		   * @param value the value to set.
-	   */
-	  public void setDataDouble(java.lang.Double value) {
-	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
-	  }
-	  
-	  /**
-	   * Checks the dirty status of the 'dataDouble' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
-	   */
-	  public boolean isDataDoubleDirty() {
-	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
-	  }
-	
-				  /**
-	   * Gets the value of the 'dataBytes' field.
-		   */
-	  public java.nio.ByteBuffer getDataBytes() {
-	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
-	  }
-	
-	  /**
-	   * Sets the value of the 'dataBytes' field.
-		   * @param value the value to set.
-	   */
-	  public void setDataBytes(java.nio.ByteBuffer value) {
-	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
-	  }
-	  
-	  /**
-	   * Checks the dirty status of the 'dataBytes' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
-	   */
-	  public boolean isDataBytesDirty() {
-	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
-	  }
-	
-				  /**
-	   * Gets the value of the 'arrayInt' field.
-		   */
-	  public java.util.List<java.lang.Integer> getArrayInt() {
-	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
-	  }
-	
-	  /**
-	   * Sets the value of the 'arrayInt' field.
-		   * @param value the value to set.
-	   */
-	  public void setArrayInt(java.util.List<java.lang.Integer> value) {
-	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
-	  }
-	  
-	  /**
-	   * Checks the dirty status of the 'arrayInt' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
-	   */
-	  public boolean isArrayIntDirty() {
-	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
-	  }
-	
-				  /**
-	   * Gets the value of the 'arrayString' field.
-		   */
-	  public java.util.List<java.lang.CharSequence> getArrayString() {
-	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
-	  }
-	
-	  /**
-	   * Sets the value of the 'arrayString' field.
-		   * @param value the value to set.
-	   */
-	  public void setArrayString(java.util.List<java.lang.CharSequence> value) {
-	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
-	  }
-	  
-	  /**
-	   * Checks the dirty status of the 'arrayString' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
-	   */
-	  public boolean isArrayStringDirty() {
-	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
-	  }
-	
-				  /**
-	   * Gets the value of the 'arrayLong' field.
-		   */
-	  public java.util.List<java.lang.Long> getArrayLong() {
-	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
-	  }
-	
-	  /**
-	   * Sets the value of the 'arrayLong' field.
-		   * @param value the value to set.
-	   */
-	  public void setArrayLong(java.util.List<java.lang.Long> value) {
-	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
-	  }
-	  
-	  /**
-	   * Checks the dirty status of the 'arrayLong' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
-	   */
-	  public boolean isArrayLongDirty() {
-	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
-	  }
-	
-				  /**
-	   * Gets the value of the 'arrayDouble' field.
-		   */
-	  public java.util.List<java.lang.Double> getArrayDouble() {
-	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
-	  }
-	
-	  /**
-	   * Sets the value of the 'arrayDouble' field.
-		   * @param value the value to set.
-	   */
-	  public void setArrayDouble(java.util.List<java.lang.Double> value) {
-	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
-	  }
-	  
-	  /**
-	   * Checks the dirty status of the 'arrayDouble' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
-	   */
-	  public boolean isArrayDoubleDirty() {
-	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
-	  }
-	
-				  /**
-	   * Gets the value of the 'mapInt' field.
-		   */
-	  public java.util.Map<java.lang.CharSequence,java.lang.Integer> getMapInt() {
-	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
-	  }
-	
-	  /**
-	   * Sets the value of the 'mapInt' field.
-		   * @param value the value to set.
-	   */
-	  public void setMapInt(java.util.Map<java.lang.CharSequence,java.lang.Integer> value) {
-	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
-	  }
-	  
-	  /**
-	   * Checks the dirty status of the 'mapInt' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
-	   */
-	  public boolean isMapIntDirty() {
-	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
-	  }
-	
-				  /**
-	   * Gets the value of the 'mapString' field.
-		   */
-	  public java.util.Map<java.lang.CharSequence,java.lang.CharSequence> getMapString() {
-	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
-	  }
-	
-	  /**
-	   * Sets the value of the 'mapString' field.
-		   * @param value the value to set.
-	   */
-	  public void setMapString(java.util.Map<java.lang.CharSequence,java.lang.CharSequence> value) {
-	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
-	  }
-	  
-	  /**
-	   * Checks the dirty status of the 'mapString' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
-	   */
-	  public boolean isMapStringDirty() {
-	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
-	  }
-	
-				  /**
-	   * Gets the value of the 'mapLong' field.
-		   */
-	  public java.util.Map<java.lang.CharSequence,java.lang.Long> getMapLong() {
-	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
-	  }
-	
-	  /**
-	   * Sets the value of the 'mapLong' field.
-		   * @param value the value to set.
-	   */
-	  public void setMapLong(java.util.Map<java.lang.CharSequence,java.lang.Long> value) {
-	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
-	  }
-	  
-	  /**
-	   * Checks the dirty status of the 'mapLong' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
-	   */
-	  public boolean isMapLongDirty() {
-	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
-	  }
-	
-				  /**
-	   * Gets the value of the 'mapDouble' field.
-		   */
-	  public java.util.Map<java.lang.CharSequence,java.lang.Double> getMapDouble() {
-	    throw new java.lang.UnsupportedOperationException("Get is not supported on tombstones");
-	  }
-	
-	  /**
-	   * Sets the value of the 'mapDouble' field.
-		   * @param value the value to set.
-	   */
-	  public void setMapDouble(java.util.Map<java.lang.CharSequence,java.lang.Double> value) {
-	    throw new java.lang.UnsupportedOperationException("Set is not supported on tombstones");
-	  }
-	  
-	  /**
-	   * Checks the dirty status of the 'mapDouble' field. A field is dirty if it represents a change that has not yet been written to the database.
-		   * @param value the value to set.
-	   */
-	  public boolean isMapDoubleDirty() {
-	    throw new java.lang.UnsupportedOperationException("IsDirty is not supported on tombstones");
-	  }
-	
-		  
-  }
-
-  private static final org.apache.avro.io.DatumWriter
-            DATUM_WRITER$ = new org.apache.avro.specific.SpecificDatumWriter(SCHEMA$);
-  private static final org.apache.avro.io.DatumReader
-            DATUM_READER$ = new org.apache.avro.specific.SpecificDatumReader(SCHEMA$);
-
-  /**
-   * Writes AVRO data bean to output stream in the form of AVRO Binary encoding format. This will transform
-   * AVRO data bean from its Java object form to it s serializable form.
-   *
-   * @param out java.io.ObjectOutput output stream to write data bean in serializable form
-   */
-  @Override
-  public void writeExternal(java.io.ObjectOutput out)
-          throws java.io.IOException {
-    out.write(super.getDirtyBytes().array());
-    DATUM_WRITER$.write(this, org.apache.avro.io.EncoderFactory.get()
-            .directBinaryEncoder((java.io.OutputStream) out,
-                    null));
-  }
-
-  /**
-   * Reads AVRO data bean from input stream in it s AVRO Binary encoding format to Java object format.
-   * This will transform AVRO data bean from it s serializable form to deserialized Java object form.
-   *
-   * @param in java.io.ObjectOutput input stream to read data bean in serializable form
-   */
-  @Override
-  public void readExternal(java.io.ObjectInput in)
-          throws java.io.IOException {
-    byte[] __g__dirty = new byte[getFieldsCount()];
-    in.read(__g__dirty);
-    super.setDirtyBytes(java.nio.ByteBuffer.wrap(__g__dirty));
-    DATUM_READER$.read(this, org.apache.avro.io.DecoderFactory.get()
-            .directBinaryDecoder((java.io.InputStream) in,
-                    null));
-  }
-  
-}
-

http://git-wip-us.apache.org/repos/asf/gora/blob/c5352b0e/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/KeySpace.java
----------------------------------------------------------------------
diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/KeySpace.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/KeySpace.java
index 709b53b..6f8284d 100644
--- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/KeySpace.java
+++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/KeySpace.java
@@ -18,7 +18,6 @@
 package org.apache.gora.cassandra.bean;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -35,8 +34,6 @@ public class KeySpace {
 
   private PlacementStrategy placementStrategy;
 
-  private Map<String, String> properties;
-
   private boolean durableWritesEnabled;
 
   private int replicationFactor;
@@ -67,13 +64,9 @@ public class KeySpace {
     this.dataCenters.put(key, value);
   }
 
-  public KeySpace() {
-    this.properties = new HashMap<>();
-  }
-
   public void setPlacementStrategy(PlacementStrategy placementStrategy) {
     this.placementStrategy = placementStrategy;
-    if(placementStrategy.equals(PlacementStrategy.NetworkTopologyStrategy) && this.dataCenters == null) {
+    if (placementStrategy.equals(PlacementStrategy.NetworkTopologyStrategy) && this.dataCenters == null) {
       this.dataCenters = new HashMap<>();
     }
   }
@@ -82,16 +75,6 @@ public class KeySpace {
     this.replicationFactor = replicationFactor;
   }
 
-  private List<String> tables;
-
-  public void addProperty(String key, String value) {
-    this.properties.put(key, value);
-  }
-
-  public String getProperty(String key) {
-    return this.properties.get(key);
-  }
-
   public void setName(String name) {
     this.name = name;
   }

http://git-wip-us.apache.org/repos/asf/gora/blob/c5352b0e/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraQuery.java
----------------------------------------------------------------------
diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraQuery.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraQuery.java
index c3f2e81..d6ba99c 100644
--- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraQuery.java
+++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraQuery.java
@@ -32,9 +32,9 @@ import java.util.Map;
  */
 public class CassandraQuery<K, T extends Persistent> extends QueryWSBase<K, T> {
 
-  protected Filter<K, T> filter;
-  protected boolean localFilterEnabled = true;
-  protected Map<String, Object> updateFields = new HashMap<>();
+  private Filter<K, T> filter;
+  private boolean localFilterEnabled = true;
+  private Map<String, Object> updateFields = new HashMap<>();
 
   public CassandraQuery(DataStore<K, T> dataStore) {
     super(dataStore);

http://git-wip-us.apache.org/repos/asf/gora/blob/c5352b0e/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java
----------------------------------------------------------------------
diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java
index 1b4876e..7ab3726 100644
--- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java
+++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java
@@ -44,6 +44,20 @@ public class CassandraResultSet<K, T extends Persistent> extends ResultBase<K, T
 
   private int position = 0;
 
+  /**
+   *
+   * @param dataStore
+   * @param query
+   */
+  public CassandraResultSet(DataStore<K, T> dataStore, Query<K, T> query) {
+    super(dataStore, query);
+  }
+
+  /**
+   *{@inheritDoc}
+   * @return
+   * @throws IOException
+   */
   @Override
   protected boolean nextInner() throws IOException {
     if(offset < size) {
@@ -55,32 +69,52 @@ public class CassandraResultSet<K, T extends Persistent> extends ResultBase<K, T
     return false;
   }
 
-  public CassandraResultSet(DataStore<K, T> dataStore, Query<K, T> query) {
-    super(dataStore, query);
-  }
-
+  /**
+   *{@inheritDoc}
+   * @return
+   * @throws IOException
+   * @throws InterruptedException
+   */
   @Override
   public float getProgress() throws IOException, InterruptedException {
     return ((float)position)/size;
   }
 
+  /**
+   *{@inheritDoc}
+   * @return
+   */
   @Override
   public T get() {
     return super.get();
   }
 
+  /**
+   * {@inheritDoc}
+   * @return
+   */
   @Override
   public K getKey() {
     return super.getKey();
   }
 
+  /**
+   *
+   * @param key
+   * @param token
+   */
   public void addResultElement(K key, T token) {
     this.persistentKey.add(key);
     this.persistentObject.add(token);
     this.size++;
   }
 
-  public void setLimit(long limit) {
-    this.limit = limit;
+  @Override
+  /**
+   * Returns whether the limit for the query is reached.
+   * @return true if result limit is reached
+   */
+  protected boolean isLimitReached() {
+    return (limit > 0 && offset >= limit) || (offset >= size);
   }
 }

http://git-wip-us.apache.org/repos/asf/gora/blob/c5352b0e/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroCassandraUtils.java
----------------------------------------------------------------------
diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroCassandraUtils.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroCassandraUtils.java
index 70e0ecf..5383949 100644
--- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroCassandraUtils.java
+++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroCassandraUtils.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.gora.cassandra.serializers;
 
 import org.apache.avro.Schema;
@@ -23,7 +41,7 @@ import java.util.Map;
 /**
  * This class is Utils class for Avro serialization.
  */
-public class AvroCassandraUtils {
+class AvroCassandraUtils {
 
   /**
    * Default schema index with value "0" used when AVRO Union data types are stored.
@@ -71,7 +89,7 @@ public class AvroCassandraUtils {
    * @param fieldSchema the associated field schema
    * @param type        the field type
    * @param fieldValue  the field value.
-   * @return
+   * @return field value
    */
   static Object getFieldValueFromAvroBean(Schema fieldSchema, Schema.Type type, Object fieldValue) {
     switch (type) {
@@ -136,8 +154,8 @@ public class AvroCassandraUtils {
    * If no data type can be inferred then we return a default value
    * of position 0.
    *
-   * @param pValue
-   * @param pUnionSchema
+   * @param pValue Object
+   * @param pUnionSchema avro Schema
    * @return the unionSchemaPosition.
    */
   private static int getUnionSchema(Object pValue, Schema pUnionSchema) {

http://git-wip-us.apache.org/repos/asf/gora/blob/c5352b0e/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java
----------------------------------------------------------------------
diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java
index 21d548d..4498caf 100644
--- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java
+++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java
@@ -264,9 +264,8 @@ class AvroSerializer<K, T extends PersistentBase> extends CassandraSerializer {
     }
     Iterator<Row> iterator = results.iterator();
     ColumnDefinitions definitions = results.getColumnDefinitions();
-    T obj = null;
-    K keyObject = null;
-    long count = 0;
+    T obj;
+    K keyObject;
     while (iterator.hasNext()) {
       Row row = iterator.next();
       obj = cassandraDataStore.newPersistent();
@@ -274,9 +273,7 @@ class AvroSerializer<K, T extends PersistentBase> extends CassandraSerializer {
       populateValuesToPersistent(row, definitions, obj);
       populateValuesToPersistent(row, definitions, (PersistentBase) keyObject);
       cassandraResult.addResultElement(keyObject, obj);
-      count ++;
     }
-    cassandraResult.setLimit(count);
     return cassandraResult;
   }
 

http://git-wip-us.apache.org/repos/asf/gora/blob/c5352b0e/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraQueryFactory.java
----------------------------------------------------------------------
diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraQueryFactory.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraQueryFactory.java
index 865a8b3..bf33750 100644
--- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraQueryFactory.java
+++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraQueryFactory.java
@@ -48,7 +48,7 @@ class CassandraQueryFactory {
    * This method returns the CQL query to create key space.
    * refer : http://docs.datastax.com/en/cql/3.1/cql/cql_reference/create_keyspace_r.html
    *
-   * @param mapping Cassandra Mapping
+   * @param mapping Cassandra Mapping {@link CassandraMapping}
    * @return CQL Query
    */
   static String getCreateKeySpaceQuery(CassandraMapping mapping) {
@@ -87,7 +87,7 @@ class CassandraQueryFactory {
    * Trick : To have a consistency of the order of the columns, first we append partition keys, second cluster keys and finally other columns.
    * It's very much needed to follow the same order in other CRUD operations as well.
    *
-   * @param mapping Cassandra mapping
+   * @param mapping Cassandra mapping {@link CassandraMapping}
    * @return CQL Query
    */
   static String getCreateTableQuery(CassandraMapping mapping) {
@@ -193,7 +193,7 @@ class CassandraQueryFactory {
    * This method returns the CQL query to drop table.
    * refer : http://docs.datastax.com/en/cql/3.1/cql/cql_reference/drop_table_r.html
    *
-   * @param mapping Cassandra Mapping
+   * @param mapping Cassandra Mapping {@link CassandraMapping}
    * @return CQL query
    */
   static String getDropTableQuery(CassandraMapping mapping) {
@@ -204,7 +204,7 @@ class CassandraQueryFactory {
    * This method returns the CQL query to drop key space.
    * refer : http://docs.datastax.com/en/cql/3.1/cql/cql_reference/drop_keyspace_r.html
    *
-   * @param mapping Cassandra Mapping
+   * @param mapping Cassandra Mapping {@link CassandraMapping}
    * @return CQL query
    */
   static String getDropKeySpaceQuery(CassandraMapping mapping) {
@@ -215,7 +215,7 @@ class CassandraQueryFactory {
    * This method returns the CQL query to truncate (removes all the data) in the table.
    * refer : http://docs.datastax.com/en/cql/3.1/cql/cql_reference/truncate_r.html
    *
-   * @param mapping Cassandra Mapping
+   * @param mapping Cassandra Mapping {@link CassandraMapping}
    * @return CQL query
    */
   static String getTruncateTableQuery(CassandraMapping mapping) {
@@ -223,9 +223,12 @@ class CassandraQueryFactory {
   }
 
   /**
+   * This method return the CQL query to insert data in to the table.
    * refer : http://docs.datastax.com/en/cql/3.1/cql/cql_reference/insert_r.html
    *
-   * @return
+   * @param mapping Cassandra Mapping {@link CassandraMapping}
+   * @param fields  available fields
+   * @return CQL Query
    */
   static String getInsertDataQuery(CassandraMapping mapping, List<String> fields) {
     String[] columnNames = getColumnNames(mapping, fields);
@@ -235,10 +238,12 @@ class CassandraQueryFactory {
   }
 
   /**
+   * This method return the CQL query to delete a persistent in the table.
+   * refer : http://docs.datastax.com/en/cql/3.3/cql/cql_reference/cqlDelete.html
    *
-   * @param mapping
-   * @param fields
-   * @return
+   * @param mapping Cassandra Mapping {@link CassandraMapping}
+   * @param fields  filed list to be deleted
+   * @return CQL Query
    */
   static String getDeleteDataQuery(CassandraMapping mapping, List<String> fields) {
     String[] columnNames = getColumnNames(mapping, fields);
@@ -258,9 +263,17 @@ class CassandraQueryFactory {
     return query.getQueryString();
   }
 
+  /**
+   * This method returns the CQL Select query to retrieve data from the table.
+   * refer: http://docs.datastax.com/en/cql/3.3/cql/cql_reference/cqlSelect.html
+   *
+   * @param mapping   Cassandra Mapping {@link CassandraMapping}
+   * @param keyFields key fields
+   * @return CQL Query
+   */
   static String getSelectObjectQuery(CassandraMapping mapping, List<String> keyFields) {
     Select select = QueryBuilder.select().from(mapping.getKeySpace().getName(), mapping.getCoreName());
-    if(Boolean.parseBoolean(mapping.getProperty("allowFiltering"))) {
+    if (Boolean.parseBoolean(mapping.getProperty("allowFiltering"))) {
       select.allowFiltering();
     }
     String[] columnNames = getColumnNames(mapping, keyFields);
@@ -277,9 +290,19 @@ class CassandraQueryFactory {
     return query.getQueryString();
   }
 
+  /**
+   * This method returns CQL Select query to retrieve data from the table with given fields.
+   * This method is used for Avro Serialization
+   * refer: http://docs.datastax.com/en/cql/3.3/cql/cql_reference/cqlSelect.html
+   *
+   * @param mapping   Cassandra Mapping {@link CassandraMapping}
+   * @param fields    Given fields to retrieve
+   * @param keyFields key fields
+   * @return CQL Query
+   */
   static String getSelectObjectWithFieldsQuery(CassandraMapping mapping, String[] fields, List<String> keyFields) {
     Select select = QueryBuilder.select(getColumnNames(mapping, Arrays.asList(fields))).from(mapping.getKeySpace().getName(), mapping.getCoreName());
-    if(Boolean.parseBoolean(mapping.getProperty("allowFiltering"))) {
+    if (Boolean.parseBoolean(mapping.getProperty("allowFiltering"))) {
       select.allowFiltering();
     }
     String[] columnNames = getColumnNames(mapping, keyFields);
@@ -296,11 +319,20 @@ class CassandraQueryFactory {
     return query.getQueryString();
   }
 
+  /**
+   * This method returns CQL Select query to retrieve data from the table with given fields.
+   * This method is used for Native Serialization
+   * refer: http://docs.datastax.com/en/cql/3.3/cql/cql_reference/cqlSelect.html
+   *
+   * @param mapping Cassandra Mapping {@link CassandraMapping}
+   * @param fields  Given fields to retrieve
+   * @return CQL Query
+   */
   static String getSelectObjectWithFieldsQuery(CassandraMapping mapping, String[] fields) {
     String cqlQuery = null;
     String[] columnNames = getColumnNames(mapping, Arrays.asList(fields));
     Select select = QueryBuilder.select(columnNames).from(mapping.getKeySpace().getName(), mapping.getCoreName());
-    if(Boolean.parseBoolean(mapping.getProperty("allowFiltering"))) {
+    if (Boolean.parseBoolean(mapping.getProperty("allowFiltering"))) {
       select.allowFiltering();
     }
     CassandraKey cKey = mapping.getCassandraKey();
@@ -329,6 +361,14 @@ class CassandraQueryFactory {
   }
 
 
+  /**
+   * This method returns CQL Query for execute method. This CQL contains a Select Query to retrieve data from the table
+   *
+   * @param mapping        Cassandra Mapping {@link CassandraMapping}
+   * @param cassandraQuery Query {@link CassandraQuery}
+   * @param objects        object list
+   * @return CQL Query
+   */
   static String getExecuteQuery(CassandraMapping mapping, Query cassandraQuery, List<Object> objects) {
     String[] fields = cassandraQuery.getFields();
     fields = fields != null ? fields : mapping.getFieldNames();
@@ -341,7 +381,7 @@ class CassandraQueryFactory {
     if (limit > 0) {
       select = select.limit((int) limit);
     }
-    if(Boolean.parseBoolean(mapping.getProperty("allowFiltering"))) {
+    if (Boolean.parseBoolean(mapping.getProperty("allowFiltering"))) {
       select.allowFiltering();
     }
     Select.Where query = null;
@@ -451,6 +491,15 @@ class CassandraQueryFactory {
     return null;
   }
 
+  /**
+   * This method returns CQL Qeury for DeleteByQuery method.
+   * refer: http://docs.datastax.com/en/cql/3.3/cql/cql_reference/cqlDelete.html
+   *
+   * @param mapping        Cassandra Mapping {@link CassandraMapping}
+   * @param cassandraQuery Cassandra Query {@link CassandraQuery}
+   * @param objects        field values
+   * @return CQL Query
+   */
   static String getDeleteByQuery(CassandraMapping mapping, Query cassandraQuery, List<Object> objects) {
     String[] columns = null;
     if (!Arrays.equals(cassandraQuery.getFields(), mapping.getFieldNames())) {
@@ -546,6 +595,15 @@ class CassandraQueryFactory {
     return query.getQueryString();
   }
 
+  /**
+   * This method returns the CQL Query for UpdateByQuery method
+   * refer : http://docs.datastax.com/en/cql/3.3/cql/cql_reference/cqlUpdate.html
+   *
+   * @param mapping        Cassandra mapping {@link CassandraMapping}
+   * @param cassandraQuery Cassandra Query {@link CassandraQuery}
+   * @param objects        field Objects list
+   * @return CQL Query
+   */
   static String getUpdateByQuery(CassandraMapping mapping, Query cassandraQuery, List<Object> objects) {
     Update update = QueryBuilder.update(mapping.getKeySpace().getName(), mapping.getCoreName());
     Update.Assignments updateAssignments = null;

http://git-wip-us.apache.org/repos/asf/gora/blob/c5352b0e/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java
----------------------------------------------------------------------
diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java
index a924a31..ac4da42 100644
--- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java
+++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java
@@ -90,7 +90,7 @@ public abstract class CassandraSerializer<K, T extends Persistent> {
   }
 
   /**
-   * This method returns the Cassandra Serializer according the Casssandra serializer property.
+   * This method returns the Cassandra Serializer according the Cassandra serializer property.
    *
    * @param cc              Cassandra Client
    * @param type            Serialization type

http://git-wip-us.apache.org/repos/asf/gora/blob/c5352b0e/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java
----------------------------------------------------------------------
diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java
index 5f36ce2..4695498 100644
--- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java
+++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java
@@ -100,14 +100,11 @@ class NativeSerializer<K, T extends CassandraNativePersistent> extends Cassandra
     }
     Result<T> objects = mapper.map(results);
     Iterator iterator = objects.iterator();
-    long count = 0;
     while (iterator.hasNext()) {
       T result = (T) iterator.next();
       K key = getKey(result);
       cassandraResult.addResultElement(key, result);
-      count ++ ;
     }
-    cassandraResult.setLimit(count);
     return cassandraResult;
   }
 

http://git-wip-us.apache.org/repos/asf/gora/blob/c5352b0e/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMappingBuilder.java
----------------------------------------------------------------------
diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMappingBuilder.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMappingBuilder.java
index d828d2f..c501cc5 100644
--- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMappingBuilder.java
+++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMappingBuilder.java
@@ -21,7 +21,7 @@ import java.util.Locale;
  * This Class reads the Cassandra Mapping file and create tha Cassandra Mapping object.
  * {@link org.apache.gora.cassandra.store.CassandraMapping}
  */
-public class CassandraMappingBuilder<K, T extends Persistent> {
+class CassandraMappingBuilder<K, T extends Persistent> {
 
   private static final Logger LOG = LoggerFactory.getLogger(CassandraMappingBuilder.class);
 
@@ -33,7 +33,7 @@ public class CassandraMappingBuilder<K, T extends Persistent> {
    *
    * @param store Cassandra Store
    */
-  public CassandraMappingBuilder(final CassandraStore<K, T> store) {
+  CassandraMappingBuilder(final CassandraStore<K, T> store) {
     this.dataStore = store;
   }
 
@@ -45,10 +45,10 @@ public class CassandraMappingBuilder<K, T extends Persistent> {
    * @throws IOException
    */
   @SuppressWarnings("all")
-  public CassandraMapping readMapping(String filename) throws IOException {
+  CassandraMapping readMapping(String filename) throws IOException {
     CassandraMapping cassandraMapping = new CassandraMapping();
     Class keyClass = dataStore.getKeyClass();
-    Class persistentClass = dataStore. getPersistentClass();
+    Class persistentClass = dataStore.getPersistentClass();
     try {
       SAXBuilder builder = new SAXBuilder();
       Document doc = builder.build(getClass().getClassLoader().getResourceAsStream(filename));
@@ -95,7 +95,7 @@ public class CassandraMappingBuilder<K, T extends Persistent> {
                 + " {} in mapping file.", classes.indexOf(classElement));
       }
       if (!classMatched) {
-        LOG.error("Check that 'keyClass' and 'name' parameters in {} no mapping has been initialized for {} class mapping", filename, persistentClass);
+        throw new RuntimeException("Check that 'keyClass' and 'name' parameters in " + filename + " no mapping has been initialized for " + persistentClass + "class mapping");
       }
 
       String keyspaceName = cassandraMapping.getProperty("keyspace");
@@ -117,7 +117,7 @@ public class CassandraMappingBuilder<K, T extends Persistent> {
                   keyspace.setDurableWritesEnabled(Boolean.parseBoolean(attributeValue));
                   break;
                 default:
-                  keyspace.addProperty(attributeName, attributeValue);
+                  LOG.warn("{} attribute is Unsupported or Invalid, in {} Cassandra KeySpace. Please configure the cassandra mapping correctly.", new Object[]{attributeName, keyspaceName});
                   break;
               }
             }
@@ -125,15 +125,14 @@ public class CassandraMappingBuilder<K, T extends Persistent> {
             switch (KeySpace.PlacementStrategy.valueOf(placementStrategy.getAttributeValue("name"))) {
               case SimpleStrategy:
                 keyspace.setPlacementStrategy(KeySpace.PlacementStrategy.SimpleStrategy);
-                keyspace.setReplicationFactor(Integer.parseInt(placementStrategy.getAttributeValue("replication_factor")));
+                keyspace.setReplicationFactor(getReplicationFactor(placementStrategy));
                 break;
               case NetworkTopologyStrategy:
                 List<Element> dataCenters = placementStrategy.getChildren("datacenter");
                 keyspace.setPlacementStrategy(KeySpace.PlacementStrategy.NetworkTopologyStrategy);
                 for (Element dataCenter : dataCenters) {
                   String dataCenterName = dataCenter.getAttributeValue("name");
-                  Integer dataCenterReplicationFactor = Integer.valueOf(dataCenter.getAttributeValue("replication_factor"));
-                  keyspace.addDataCenter(dataCenterName, dataCenterReplicationFactor);
+                  keyspace.addDataCenter(dataCenterName, getReplicationFactor(dataCenter));
                 }
                 break;
             }
@@ -143,9 +142,8 @@ public class CassandraMappingBuilder<K, T extends Persistent> {
 
         }
 
-      }
-      else {
-        throw new RuntimeException("KeySpace couldn't be able to found in the  cassandra mapping. Please configure the cassandra mapping correctly.");
+      } else {
+        throw new RuntimeException("Couldn't find KeySpace in the Cassandra mapping. Please configure the cassandra mapping correctly.");
       }
 
       for (Element key : keys) {
@@ -193,7 +191,8 @@ public class CassandraMappingBuilder<K, T extends Persistent> {
                   keyField.setOrder(ClusterKeyField.Order.valueOf(attributeValue.toUpperCase(Locale.ENGLISH)));
                   break;
                 default:
-                  throw new RuntimeException("");
+                  LOG.warn("{} attribute is Unsupported or Invalid, in {} Cassandra Key. Please configure the cassandra mapping correctly.", new Object[]{attributeName, keyClass});
+                  break;
               }
             }
             cassandraKey.addClusterKeyField(keyField);
@@ -220,7 +219,7 @@ public class CassandraMappingBuilder<K, T extends Persistent> {
           fieldKey.setColumnName(attributeValue);
           break;
         case "type":
-          fieldKey.setType(attributeValue.replace("(","<").replace(")",">"));
+          fieldKey.setType(attributeValue.replace("(", "<").replace(")", ">"));
           break;
         default:
           fieldKey.addProperty(attributeName, attributeValue);
@@ -229,4 +228,13 @@ public class CassandraMappingBuilder<K, T extends Persistent> {
     }
   }
 
+  private int getReplicationFactor(Element element) {
+    String value  = element.getAttributeValue("replication_factor");
+    if(value == null) {
+      return 1;
+    } else {
+      return Integer.parseInt(value);
+    }
+  }
+
 }

http://git-wip-us.apache.org/repos/asf/gora/blob/c5352b0e/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
----------------------------------------------------------------------
diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
index 8b04442..74d3862 100644
--- a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
+++ b/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
@@ -216,6 +216,12 @@ public class CassandraStore<K, T extends Persistent> implements DataStore<K, T>
     return (Result<K, T>) cassandraSerializer.execute(this, query);
   }
 
+  /**
+   * This method is used to update multiple objects in the table.
+   *
+   * @param query Query
+   * @return isQuery applied or not
+   */
   public boolean updateByQuery(Query<K, T> query) {
     return cassandraSerializer.updateByQuery(query);
   }

http://git-wip-us.apache.org/repos/asf/gora/blob/c5352b0e/gora-cassandra-cql/src/test/conf/compositeKey/gora-cassandra-mapping.xml
----------------------------------------------------------------------
diff --git a/gora-cassandra-cql/src/test/conf/compositeKey/gora-cassandra-mapping.xml b/gora-cassandra-cql/src/test/conf/compositeKey/gora-cassandra-mapping.xml
index f3b3272..4ebdcd6 100644
--- a/gora-cassandra-cql/src/test/conf/compositeKey/gora-cassandra-mapping.xml
+++ b/gora-cassandra-cql/src/test/conf/compositeKey/gora-cassandra-mapping.xml
@@ -52,10 +52,10 @@
 
 <gora-otd>
     <keyspace name="EmployeeSpace" durableWrite="false">
-        <placementStrategy name="SimpleStrategy" replication_factor="1"/>
+        <placementStrategy name="SimpleStrategy" />
     </keyspace>
 
-    <class name="org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord" keyClass="org.apache.gora.cassandra.example.generated.avroSerialization.CassandraKey" keyspace="EmployeeSpace"
+    <class name="org.apache.gora.cassandra.example.generated.AvroSerialization.CassandraRecord" keyClass="org.apache.gora.cassandra.example.generated.AvroSerialization.CassandraKey" keyspace="EmployeeSpace"
            table="CassandraRecord" allowFiltering="true"  id="5a1c395e-b41f-11e5-9f22-ba0be0483c18">
         <field name="dataString" column="name" type="text"/>
         <field name="dataInt" column="age" type="int"/>
@@ -72,7 +72,7 @@
         <field name="mapDouble" column="mapDouble" type="map(text,double)"/>
     </class>
 
-    <cassandraKey name="org.apache.gora.cassandra.example.generated.avroSerialization.CassandraKey">
+    <cassandraKey name="org.apache.gora.cassandra.example.generated.AvroSerialization.CassandraKey">
         <partitionKey>
                 <field name="url" column="urlData" type="text"/>
                 <field name="timestamp" column="timestampData" type="bigint"/>

http://git-wip-us.apache.org/repos/asf/gora/blob/c5352b0e/gora-cassandra-cql/src/test/conf/nativeSerialization/gora-cassandra-mapping.xml
----------------------------------------------------------------------
diff --git a/gora-cassandra-cql/src/test/conf/nativeSerialization/gora-cassandra-mapping.xml b/gora-cassandra-cql/src/test/conf/nativeSerialization/gora-cassandra-mapping.xml
index 2a5434d..b301071 100644
--- a/gora-cassandra-cql/src/test/conf/nativeSerialization/gora-cassandra-mapping.xml
+++ b/gora-cassandra-cql/src/test/conf/nativeSerialization/gora-cassandra-mapping.xml
@@ -18,13 +18,7 @@
   -->
 
 <!--
-   The value of 'host' attribute of keyspace tag should match exactly what is in
-   gora.properties file. Essentially this means that if you are using port number, you should
-   use it every where regardless of whether it is the default port or not.
-   At runtime Gora will otherwise try to connect to localhost
-   https://issues.apache.org/jira/browse/GORA-269
-
-   The values of 'replication_factor' and 'placement_strategy' attribute of keyspace tag
+   The values of 'replication_factor' and 'placementStrategy' attribute of keyspace tag
    only apply if gora create the kyespace. they have no effect if this is being used against 
    an existing keyspace. the default value for 'replication_factor' is '1'
    

http://git-wip-us.apache.org/repos/asf/gora/blob/c5352b0e/gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/store/TestCassandraStoreWithCassandraKey.java
----------------------------------------------------------------------
diff --git a/gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/store/TestCassandraStoreWithCassandraKey.java b/gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/store/TestCassandraStoreWithCassandraKey.java
index 82f6f58..f2556e7 100644
--- a/gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/store/TestCassandraStoreWithCassandraKey.java
+++ b/gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/store/TestCassandraStoreWithCassandraKey.java
@@ -19,8 +19,8 @@ package org.apache.gora.cassandra.store;
 
 import org.apache.avro.util.Utf8;
 import org.apache.gora.cassandra.GoraCassandraTestDriver;
-import org.apache.gora.cassandra.example.generated.avroSerialization.CassandraKey;
-import org.apache.gora.cassandra.example.generated.avroSerialization.CassandraRecord;
+import org.apache.gora.cassandra.example.generated.AvroSerialization.CassandraKey;
+import org.apache.gora.cassandra.example.generated.AvroSerialization.CassandraRecord;
 import org.apache.gora.query.Query;
 import org.apache.gora.query.Result;
 import org.apache.gora.store.DataStore;
@@ -84,6 +84,9 @@ public class TestCassandraStoreWithCassandraKey {
     Assert.assertTrue(cassandraRecordDataStore.schemaExists());
   }
 
+  /**
+   * In this test case, get, put and delete methods behaviour of the data store is testing.
+   */
   @Test
   public void testSimplePutGet() {
     cassandraRecordDataStore.createSchema();
@@ -107,6 +110,10 @@ public class TestCassandraStoreWithCassandraKey {
     Assert.assertNull(cassandraRecordDataStore.get(key));
   }
 
+  /**
+   * In this test case, execute and deleteByQuery methods behaviour of the data store is testing.
+   * @throws Exception
+   */
   @Test
   public void testExecuteQuery() throws Exception {
     Query query = cassandraRecordDataStore.newQuery();
@@ -151,7 +158,10 @@ public class TestCassandraStoreWithCassandraKey {
     cassandraRecordDataStore.put(key, record);
     result = query.execute();
     Assert.assertTrue(result.next());
+  }
 
+  @Test
+  public void testExecuteQueryWithRange() throws Exception {
     // test Range with Query
     cassandraRecordDataStore.truncateSchema();
     //insert data
@@ -190,7 +200,7 @@ public class TestCassandraStoreWithCassandraKey {
     Query rangeQuery = cassandraRecordDataStore.newQuery();
     rangeQuery.setStartKey(key2);
     rangeQuery.setEndKey(key2);
-    result = rangeQuery.execute();
+    Result result = rangeQuery.execute();
     int i = 0;
     while (result.next()) {
       i++;


Mime
View raw message