Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java?rev=896207&r1=896206&r2=896207&view=diff ============================================================================== --- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java (original) +++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/NotFoundException.java Tue Jan 5 20:33:44 2010 @@ -4,34 +4,15 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.cassandra.service; -/* - * - * 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. - * - */ - import java.util.List; import java.util.ArrayList; import java.util.Map; import java.util.HashMap; +import java.util.EnumMap; import java.util.Set; import java.util.HashSet; +import java.util.EnumSet; import java.util.Collections; import java.util.BitSet; import java.util.Arrays; @@ -45,10 +26,66 @@ /** * A specific column was requested that does not exist. */ -public class NotFoundException extends Exception implements TBase, java.io.Serializable, Cloneable, Comparable<NotFoundException> { +public class NotFoundException extends Exception implements TBase<NotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<NotFoundException> { private static final TStruct STRUCT_DESC = new TStruct("NotFoundException"); - public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{ + + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements TFieldIdEnum { +; + + private static final Map<Integer, _Fields> byId = new HashMap<Integer, _Fields>(); + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byId.put((int)field._thriftId, field); + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + return byId.get(fieldId); + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + public static final Map<_Fields, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class) {{ }}); static { @@ -73,26 +110,34 @@ return new NotFoundException(this); } + public void setFieldValue(_Fields field, Object value) { + switch (field) { + } + } + public void setFieldValue(int fieldID, Object value) { - switch (fieldID) { - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); + setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value); + } + + public Object getFieldValue(_Fields field) { + switch (field) { } + throw new IllegalStateException(); } - public Object getFieldValue(int fieldID) { - switch (fieldID) { - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); + public Object getFieldValue(int fieldId) { + return getFieldValue(_Fields.findByThriftIdOrThrow(fieldId)); + } + + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + switch (field) { } + throw new IllegalStateException(); } - // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise public boolean isSet(int fieldID) { - switch (fieldID) { - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); - } + return isSet(_Fields.findByThriftIdOrThrow(fieldID)); } @Override @@ -136,17 +181,17 @@ if (field.type == TType.STOP) { break; } - switch (field.id) - { - default: - TProtocolUtil.skip(iprot, field.type); - break; + _Fields fieldId = _Fields.findByThriftId(field.id); + if (fieldId == null) { + TProtocolUtil.skip(iprot, field.type); + } else { + switch (fieldId) { + } + iprot.readFieldEnd(); } - iprot.readFieldEnd(); } iprot.readStructEnd(); - // check for required fields of primitive type, which can't be checked in the validate method validate(); } @@ -170,7 +215,6 @@ public void validate() throws TException { // check for required fields - // check that fields of type enum have valid values } }
Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SlicePredicate.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SlicePredicate.java?rev=896207&r1=896206&r2=896207&view=diff ============================================================================== --- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SlicePredicate.java (original) +++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SlicePredicate.java Tue Jan 5 20:33:44 2010 @@ -4,34 +4,15 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.cassandra.service; -/* - * - * 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. - * - */ - import java.util.List; import java.util.ArrayList; import java.util.Map; import java.util.HashMap; +import java.util.EnumMap; import java.util.Set; import java.util.HashSet; +import java.util.EnumSet; import java.util.Collections; import java.util.BitSet; import java.util.Arrays; @@ -54,23 +35,78 @@ * and 'Jim' you can pass those column names as a list to fetch all three at once. * @param slice_range. A SliceRange describing how to range, order, and/or limit the slice. */ -public class SlicePredicate implements TBase, java.io.Serializable, Cloneable, Comparable<SlicePredicate> { +public class SlicePredicate implements TBase<SlicePredicate._Fields>, java.io.Serializable, Cloneable, Comparable<SlicePredicate> { private static final TStruct STRUCT_DESC = new TStruct("SlicePredicate"); + private static final TField COLUMN_NAMES_FIELD_DESC = new TField("column_names", TType.LIST, (short)1); private static final TField SLICE_RANGE_FIELD_DESC = new TField("slice_range", TType.STRUCT, (short)2); public List<byte[]> column_names; public SliceRange slice_range; - public static final int COLUMN_NAMES = 1; - public static final int SLICE_RANGE = 2; + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements TFieldIdEnum { + COLUMN_NAMES((short)1, "column_names"), + SLICE_RANGE((short)2, "slice_range"); + + private static final Map<Integer, _Fields> byId = new HashMap<Integer, _Fields>(); + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byId.put((int)field._thriftId, field); + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + return byId.get(fieldId); + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } // isset id assignments - public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{ - put(COLUMN_NAMES, new FieldMetaData("column_names", TFieldRequirementType.OPTIONAL, + public static final Map<_Fields, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class) {{ + put(_Fields.COLUMN_NAMES, new FieldMetaData("column_names", TFieldRequirementType.OPTIONAL, new ListMetaData(TType.LIST, new FieldValueMetaData(TType.STRING)))); - put(SLICE_RANGE, new FieldMetaData("slice_range", TFieldRequirementType.OPTIONAL, + put(_Fields.SLICE_RANGE, new FieldMetaData("slice_range", TFieldRequirementType.OPTIONAL, new StructMetaData(TType.STRUCT, SliceRange.class))); }}); @@ -81,15 +117,6 @@ public SlicePredicate() { } - public SlicePredicate( - List<byte[]> column_names, - SliceRange slice_range) - { - this(); - this.column_names = column_names; - this.slice_range = slice_range; - } - /** * Performs a deep copy on <i>other</i>. */ @@ -145,7 +172,7 @@ this.column_names = null; } - // Returns true if field column_names is set (has been asigned a value) and false otherwise + /** Returns true if field column_names is set (has been asigned a value) and false otherwise */ public boolean isSetColumn_names() { return this.column_names != null; } @@ -169,7 +196,7 @@ this.slice_range = null; } - // Returns true if field slice_range is set (has been asigned a value) and false otherwise + /** Returns true if field slice_range is set (has been asigned a value) and false otherwise */ public boolean isSetSlice_range() { return this.slice_range != null; } @@ -180,8 +207,8 @@ } } - public void setFieldValue(int fieldID, Object value) { - switch (fieldID) { + public void setFieldValue(_Fields field, Object value) { + switch (field) { case COLUMN_NAMES: if (value == null) { unsetColumn_names(); @@ -198,34 +225,42 @@ } break; - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); } } - public Object getFieldValue(int fieldID) { - switch (fieldID) { + public void setFieldValue(int fieldID, Object value) { + setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value); + } + + public Object getFieldValue(_Fields field) { + switch (field) { case COLUMN_NAMES: return getColumn_names(); case SLICE_RANGE: return getSlice_range(); - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); } + throw new IllegalStateException(); } - // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise - public boolean isSet(int fieldID) { - switch (fieldID) { + public Object getFieldValue(int fieldId) { + return getFieldValue(_Fields.findByThriftIdOrThrow(fieldId)); + } + + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + switch (field) { case COLUMN_NAMES: return isSetColumn_names(); case SLICE_RANGE: return isSetSlice_range(); - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); } + throw new IllegalStateException(); + } + + public boolean isSet(int fieldID) { + return isSet(_Fields.findByThriftIdOrThrow(fieldID)); } @Override @@ -303,42 +338,42 @@ if (field.type == TType.STOP) { break; } - switch (field.id) - { - case COLUMN_NAMES: - if (field.type == TType.LIST) { - { - TList _list4 = iprot.readListBegin(); - this.column_names = new ArrayList<byte[]>(_list4.size); - for (int _i5 = 0; _i5 < _list4.size; ++_i5) + _Fields fieldId = _Fields.findByThriftId(field.id); + if (fieldId == null) { + TProtocolUtil.skip(iprot, field.type); + } else { + switch (fieldId) { + case COLUMN_NAMES: + if (field.type == TType.LIST) { { - byte[] _elem6; - _elem6 = iprot.readBinary(); - this.column_names.add(_elem6); + TList _list4 = iprot.readListBegin(); + this.column_names = new ArrayList<byte[]>(_list4.size); + for (int _i5 = 0; _i5 < _list4.size; ++_i5) + { + byte[] _elem6; + _elem6 = iprot.readBinary(); + this.column_names.add(_elem6); + } + iprot.readListEnd(); } - iprot.readListEnd(); + } else { + TProtocolUtil.skip(iprot, field.type); } - } else { - TProtocolUtil.skip(iprot, field.type); - } - break; - case SLICE_RANGE: - if (field.type == TType.STRUCT) { - this.slice_range = new SliceRange(); - this.slice_range.read(iprot); - } else { - TProtocolUtil.skip(iprot, field.type); - } - break; - default: - TProtocolUtil.skip(iprot, field.type); - break; + break; + case SLICE_RANGE: + if (field.type == TType.STRUCT) { + this.slice_range = new SliceRange(); + this.slice_range.read(iprot); + } else { + TProtocolUtil.skip(iprot, field.type); + } + break; + } + iprot.readFieldEnd(); } - iprot.readFieldEnd(); } iprot.readStructEnd(); - // check for required fields of primitive type, which can't be checked in the validate method validate(); } @@ -402,7 +437,6 @@ public void validate() throws TException { // check for required fields - // check that fields of type enum have valid values } } Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SliceRange.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SliceRange.java?rev=896207&r1=896206&r2=896207&view=diff ============================================================================== --- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SliceRange.java (original) +++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SliceRange.java Tue Jan 5 20:33:44 2010 @@ -4,34 +4,15 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.cassandra.service; -/* - * - * 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. - * - */ - import java.util.List; import java.util.ArrayList; import java.util.Map; import java.util.HashMap; +import java.util.EnumMap; import java.util.Set; import java.util.HashSet; +import java.util.EnumSet; import java.util.Collections; import java.util.BitSet; import java.util.Arrays; @@ -58,8 +39,9 @@ * be better served by iterating through slices by passing the last value of one call in as the 'start' * of the next instead of increasing 'count' arbitrarily large. */ -public class SliceRange implements TBase, java.io.Serializable, Cloneable, Comparable<SliceRange> { +public class SliceRange implements TBase<SliceRange._Fields>, java.io.Serializable, Cloneable, Comparable<SliceRange> { private static final TStruct STRUCT_DESC = new TStruct("SliceRange"); + private static final TField START_FIELD_DESC = new TField("start", TType.STRING, (short)1); private static final TField FINISH_FIELD_DESC = new TField("finish", TType.STRING, (short)2); private static final TField REVERSED_FIELD_DESC = new TField("reversed", TType.BOOL, (short)3); @@ -69,24 +51,78 @@ public byte[] finish; public boolean reversed; public int count; - public static final int START = 1; - public static final int FINISH = 2; - public static final int REVERSED = 3; - public static final int COUNT = 4; + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements TFieldIdEnum { + START((short)1, "start"), + FINISH((short)2, "finish"), + REVERSED((short)3, "reversed"), + COUNT((short)4, "count"); + + private static final Map<Integer, _Fields> byId = new HashMap<Integer, _Fields>(); + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byId.put((int)field._thriftId, field); + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + return byId.get(fieldId); + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } // isset id assignments private static final int __REVERSED_ISSET_ID = 0; private static final int __COUNT_ISSET_ID = 1; private BitSet __isset_bit_vector = new BitSet(2); - public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{ - put(START, new FieldMetaData("start", TFieldRequirementType.REQUIRED, + public static final Map<_Fields, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class) {{ + put(_Fields.START, new FieldMetaData("start", TFieldRequirementType.REQUIRED, new FieldValueMetaData(TType.STRING))); - put(FINISH, new FieldMetaData("finish", TFieldRequirementType.REQUIRED, + put(_Fields.FINISH, new FieldMetaData("finish", TFieldRequirementType.REQUIRED, new FieldValueMetaData(TType.STRING))); - put(REVERSED, new FieldMetaData("reversed", TFieldRequirementType.REQUIRED, + put(_Fields.REVERSED, new FieldMetaData("reversed", TFieldRequirementType.REQUIRED, new FieldValueMetaData(TType.BOOL))); - put(COUNT, new FieldMetaData("count", TFieldRequirementType.REQUIRED, + put(_Fields.COUNT, new FieldMetaData("count", TFieldRequirementType.REQUIRED, new FieldValueMetaData(TType.I32))); }}); @@ -156,7 +192,7 @@ this.start = null; } - // Returns true if field start is set (has been asigned a value) and false otherwise + /** Returns true if field start is set (has been asigned a value) and false otherwise */ public boolean isSetStart() { return this.start != null; } @@ -180,7 +216,7 @@ this.finish = null; } - // Returns true if field finish is set (has been asigned a value) and false otherwise + /** Returns true if field finish is set (has been asigned a value) and false otherwise */ public boolean isSetFinish() { return this.finish != null; } @@ -205,7 +241,7 @@ __isset_bit_vector.clear(__REVERSED_ISSET_ID); } - // Returns true if field reversed is set (has been asigned a value) and false otherwise + /** Returns true if field reversed is set (has been asigned a value) and false otherwise */ public boolean isSetReversed() { return __isset_bit_vector.get(__REVERSED_ISSET_ID); } @@ -228,7 +264,7 @@ __isset_bit_vector.clear(__COUNT_ISSET_ID); } - // Returns true if field count is set (has been asigned a value) and false otherwise + /** Returns true if field count is set (has been asigned a value) and false otherwise */ public boolean isSetCount() { return __isset_bit_vector.get(__COUNT_ISSET_ID); } @@ -237,8 +273,8 @@ __isset_bit_vector.set(__COUNT_ISSET_ID, value); } - public void setFieldValue(int fieldID, Object value) { - switch (fieldID) { + public void setFieldValue(_Fields field, Object value) { + switch (field) { case START: if (value == null) { unsetStart(); @@ -271,13 +307,15 @@ } break; - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); } } - public Object getFieldValue(int fieldID) { - switch (fieldID) { + public void setFieldValue(int fieldID, Object value) { + setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value); + } + + public Object getFieldValue(_Fields field) { + switch (field) { case START: return getStart(); @@ -290,14 +328,17 @@ case COUNT: return new Integer(getCount()); - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); } + throw new IllegalStateException(); } - // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise - public boolean isSet(int fieldID) { - switch (fieldID) { + public Object getFieldValue(int fieldId) { + return getFieldValue(_Fields.findByThriftIdOrThrow(fieldId)); + } + + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + switch (field) { case START: return isSetStart(); case FINISH: @@ -306,9 +347,12 @@ return isSetReversed(); case COUNT: return isSetCount(); - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); } + throw new IllegalStateException(); + } + + public boolean isSet(int fieldID) { + return isSet(_Fields.findByThriftIdOrThrow(fieldID)); } @Override @@ -420,47 +464,47 @@ if (field.type == TType.STOP) { break; } - switch (field.id) - { - case START: - if (field.type == TType.STRING) { - this.start = iprot.readBinary(); - } else { - TProtocolUtil.skip(iprot, field.type); - } - break; - case FINISH: - if (field.type == TType.STRING) { - this.finish = iprot.readBinary(); - } else { - TProtocolUtil.skip(iprot, field.type); - } - break; - case REVERSED: - if (field.type == TType.BOOL) { - this.reversed = iprot.readBool(); - setReversedIsSet(true); - } else { - TProtocolUtil.skip(iprot, field.type); - } - break; - case COUNT: - if (field.type == TType.I32) { - this.count = iprot.readI32(); - setCountIsSet(true); - } else { - TProtocolUtil.skip(iprot, field.type); - } - break; - default: - TProtocolUtil.skip(iprot, field.type); - break; + _Fields fieldId = _Fields.findByThriftId(field.id); + if (fieldId == null) { + TProtocolUtil.skip(iprot, field.type); + } else { + switch (fieldId) { + case START: + if (field.type == TType.STRING) { + this.start = iprot.readBinary(); + } else { + TProtocolUtil.skip(iprot, field.type); + } + break; + case FINISH: + if (field.type == TType.STRING) { + this.finish = iprot.readBinary(); + } else { + TProtocolUtil.skip(iprot, field.type); + } + break; + case REVERSED: + if (field.type == TType.BOOL) { + this.reversed = iprot.readBool(); + setReversedIsSet(true); + } else { + TProtocolUtil.skip(iprot, field.type); + } + break; + case COUNT: + if (field.type == TType.I32) { + this.count = iprot.readI32(); + setCountIsSet(true); + } else { + TProtocolUtil.skip(iprot, field.type); + } + break; + } + iprot.readFieldEnd(); } - iprot.readFieldEnd(); } iprot.readStructEnd(); - // check for required fields of primitive type, which can't be checked in the validate method if (!isSetReversed()) { throw new TProtocolException("Required field 'reversed' was not found in serialized data! Struct: " + toString()); @@ -547,7 +591,6 @@ } // alas, we cannot check 'reversed' because it's a primitive and you chose the non-beans generator. // alas, we cannot check 'count' because it's a primitive and you chose the non-beans generator. - // check that fields of type enum have valid values } } Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java?rev=896207&r1=896206&r2=896207&view=diff ============================================================================== --- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java (original) +++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/SuperColumn.java Tue Jan 5 20:33:44 2010 @@ -4,34 +4,15 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.cassandra.service; -/* - * - * 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. - * - */ - import java.util.List; import java.util.ArrayList; import java.util.Map; import java.util.HashMap; +import java.util.EnumMap; import java.util.Set; import java.util.HashSet; +import java.util.EnumSet; import java.util.Collections; import java.util.BitSet; import java.util.Arrays; @@ -48,22 +29,77 @@ * @param columns. A collection of standard Columns. The columns within a super column are defined in an adhoc manner. * Columns within a super column do not have to have matching structures (similarly named child columns). */ -public class SuperColumn implements TBase, java.io.Serializable, Cloneable, Comparable<SuperColumn> { +public class SuperColumn implements TBase<SuperColumn._Fields>, java.io.Serializable, Cloneable, Comparable<SuperColumn> { private static final TStruct STRUCT_DESC = new TStruct("SuperColumn"); + private static final TField NAME_FIELD_DESC = new TField("name", TType.STRING, (short)1); private static final TField COLUMNS_FIELD_DESC = new TField("columns", TType.LIST, (short)2); public byte[] name; public List<Column> columns; - public static final int NAME = 1; - public static final int COLUMNS = 2; + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements TFieldIdEnum { + NAME((short)1, "name"), + COLUMNS((short)2, "columns"); + + private static final Map<Integer, _Fields> byId = new HashMap<Integer, _Fields>(); + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byId.put((int)field._thriftId, field); + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + return byId.get(fieldId); + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } // isset id assignments - public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{ - put(NAME, new FieldMetaData("name", TFieldRequirementType.REQUIRED, + public static final Map<_Fields, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class) {{ + put(_Fields.NAME, new FieldMetaData("name", TFieldRequirementType.REQUIRED, new FieldValueMetaData(TType.STRING))); - put(COLUMNS, new FieldMetaData("columns", TFieldRequirementType.REQUIRED, + put(_Fields.COLUMNS, new FieldMetaData("columns", TFieldRequirementType.REQUIRED, new ListMetaData(TType.LIST, new StructMetaData(TType.STRUCT, Column.class)))); }}); @@ -123,7 +159,7 @@ this.name = null; } - // Returns true if field name is set (has been asigned a value) and false otherwise + /** Returns true if field name is set (has been asigned a value) and false otherwise */ public boolean isSetName() { return this.name != null; } @@ -162,7 +198,7 @@ this.columns = null; } - // Returns true if field columns is set (has been asigned a value) and false otherwise + /** Returns true if field columns is set (has been asigned a value) and false otherwise */ public boolean isSetColumns() { return this.columns != null; } @@ -173,8 +209,8 @@ } } - public void setFieldValue(int fieldID, Object value) { - switch (fieldID) { + public void setFieldValue(_Fields field, Object value) { + switch (field) { case NAME: if (value == null) { unsetName(); @@ -191,34 +227,42 @@ } break; - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); } } - public Object getFieldValue(int fieldID) { - switch (fieldID) { + public void setFieldValue(int fieldID, Object value) { + setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value); + } + + public Object getFieldValue(_Fields field) { + switch (field) { case NAME: return getName(); case COLUMNS: return getColumns(); - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); } + throw new IllegalStateException(); } - // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise - public boolean isSet(int fieldID) { - switch (fieldID) { + public Object getFieldValue(int fieldId) { + return getFieldValue(_Fields.findByThriftIdOrThrow(fieldId)); + } + + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + switch (field) { case NAME: return isSetName(); case COLUMNS: return isSetColumns(); - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); } + throw new IllegalStateException(); + } + + public boolean isSet(int fieldID) { + return isSet(_Fields.findByThriftIdOrThrow(fieldID)); } @Override @@ -296,42 +340,42 @@ if (field.type == TType.STOP) { break; } - switch (field.id) - { - case NAME: - if (field.type == TType.STRING) { - this.name = iprot.readBinary(); - } else { - TProtocolUtil.skip(iprot, field.type); - } - break; - case COLUMNS: - if (field.type == TType.LIST) { - { - TList _list0 = iprot.readListBegin(); - this.columns = new ArrayList<Column>(_list0.size); - for (int _i1 = 0; _i1 < _list0.size; ++_i1) + _Fields fieldId = _Fields.findByThriftId(field.id); + if (fieldId == null) { + TProtocolUtil.skip(iprot, field.type); + } else { + switch (fieldId) { + case NAME: + if (field.type == TType.STRING) { + this.name = iprot.readBinary(); + } else { + TProtocolUtil.skip(iprot, field.type); + } + break; + case COLUMNS: + if (field.type == TType.LIST) { { - Column _elem2; - _elem2 = new Column(); - _elem2.read(iprot); - this.columns.add(_elem2); + TList _list0 = iprot.readListBegin(); + this.columns = new ArrayList<Column>(_list0.size); + for (int _i1 = 0; _i1 < _list0.size; ++_i1) + { + Column _elem2; + _elem2 = new Column(); + _elem2.read(iprot); + this.columns.add(_elem2); + } + iprot.readListEnd(); } - iprot.readListEnd(); + } else { + TProtocolUtil.skip(iprot, field.type); } - } else { - TProtocolUtil.skip(iprot, field.type); - } - break; - default: - TProtocolUtil.skip(iprot, field.type); - break; + break; + } + iprot.readFieldEnd(); } - iprot.readFieldEnd(); } iprot.readStructEnd(); - // check for required fields of primitive type, which can't be checked in the validate method validate(); } @@ -398,7 +442,6 @@ if (columns == null) { throw new TProtocolException("Required field 'columns' was not present! Struct: " + toString()); } - // check that fields of type enum have valid values } } Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/TimedOutException.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/TimedOutException.java?rev=896207&r1=896206&r2=896207&view=diff ============================================================================== --- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/TimedOutException.java (original) +++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/TimedOutException.java Tue Jan 5 20:33:44 2010 @@ -4,34 +4,15 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.cassandra.service; -/* - * - * 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. - * - */ - import java.util.List; import java.util.ArrayList; import java.util.Map; import java.util.HashMap; +import java.util.EnumMap; import java.util.Set; import java.util.HashSet; +import java.util.EnumSet; import java.util.Collections; import java.util.BitSet; import java.util.Arrays; @@ -45,10 +26,66 @@ /** * RPC timeout was exceeded. either a node failed mid-operation, or load was too high, or the requested op was too large. */ -public class TimedOutException extends Exception implements TBase, java.io.Serializable, Cloneable, Comparable<TimedOutException> { +public class TimedOutException extends Exception implements TBase<TimedOutException._Fields>, java.io.Serializable, Cloneable, Comparable<TimedOutException> { private static final TStruct STRUCT_DESC = new TStruct("TimedOutException"); - public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{ + + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements TFieldIdEnum { +; + + private static final Map<Integer, _Fields> byId = new HashMap<Integer, _Fields>(); + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byId.put((int)field._thriftId, field); + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + return byId.get(fieldId); + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + public static final Map<_Fields, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class) {{ }}); static { @@ -73,26 +110,34 @@ return new TimedOutException(this); } + public void setFieldValue(_Fields field, Object value) { + switch (field) { + } + } + public void setFieldValue(int fieldID, Object value) { - switch (fieldID) { - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); + setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value); + } + + public Object getFieldValue(_Fields field) { + switch (field) { } + throw new IllegalStateException(); } - public Object getFieldValue(int fieldID) { - switch (fieldID) { - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); + public Object getFieldValue(int fieldId) { + return getFieldValue(_Fields.findByThriftIdOrThrow(fieldId)); + } + + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + switch (field) { } + throw new IllegalStateException(); } - // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise public boolean isSet(int fieldID) { - switch (fieldID) { - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); - } + return isSet(_Fields.findByThriftIdOrThrow(fieldID)); } @Override @@ -136,17 +181,17 @@ if (field.type == TType.STOP) { break; } - switch (field.id) - { - default: - TProtocolUtil.skip(iprot, field.type); - break; + _Fields fieldId = _Fields.findByThriftId(field.id); + if (fieldId == null) { + TProtocolUtil.skip(iprot, field.type); + } else { + switch (fieldId) { + } + iprot.readFieldEnd(); } - iprot.readFieldEnd(); } iprot.readStructEnd(); - // check for required fields of primitive type, which can't be checked in the validate method validate(); } @@ -170,7 +215,6 @@ public void validate() throws TException { // check for required fields - // check that fields of type enum have valid values } } Modified: incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/UnavailableException.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/UnavailableException.java?rev=896207&r1=896206&r2=896207&view=diff ============================================================================== --- incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/UnavailableException.java (original) +++ incubator/cassandra/trunk/interface/gen-java/org/apache/cassandra/service/UnavailableException.java Tue Jan 5 20:33:44 2010 @@ -4,34 +4,15 @@ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ package org.apache.cassandra.service; -/* - * - * 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. - * - */ - import java.util.List; import java.util.ArrayList; import java.util.Map; import java.util.HashMap; +import java.util.EnumMap; import java.util.Set; import java.util.HashSet; +import java.util.EnumSet; import java.util.Collections; import java.util.BitSet; import java.util.Arrays; @@ -45,10 +26,66 @@ /** * Not all the replicas required could be created and/or read. */ -public class UnavailableException extends Exception implements TBase, java.io.Serializable, Cloneable, Comparable<UnavailableException> { +public class UnavailableException extends Exception implements TBase<UnavailableException._Fields>, java.io.Serializable, Cloneable, Comparable<UnavailableException> { private static final TStruct STRUCT_DESC = new TStruct("UnavailableException"); - public static final Map<Integer, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new HashMap<Integer, FieldMetaData>() {{ + + + /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ + public enum _Fields implements TFieldIdEnum { +; + + private static final Map<Integer, _Fields> byId = new HashMap<Integer, _Fields>(); + private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byId.put((int)field._thriftId, field); + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + return byId.get(fieldId); + } + + /** + * Find the _Fields constant that matches fieldId, throwing an exception + * if it is not found. + */ + public static _Fields findByThriftIdOrThrow(int fieldId) { + _Fields fields = findByThriftId(fieldId); + if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + public static final Map<_Fields, FieldMetaData> metaDataMap = Collections.unmodifiableMap(new EnumMap<_Fields, FieldMetaData>(_Fields.class) {{ }}); static { @@ -73,26 +110,34 @@ return new UnavailableException(this); } + public void setFieldValue(_Fields field, Object value) { + switch (field) { + } + } + public void setFieldValue(int fieldID, Object value) { - switch (fieldID) { - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); + setFieldValue(_Fields.findByThriftIdOrThrow(fieldID), value); + } + + public Object getFieldValue(_Fields field) { + switch (field) { } + throw new IllegalStateException(); } - public Object getFieldValue(int fieldID) { - switch (fieldID) { - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); + public Object getFieldValue(int fieldId) { + return getFieldValue(_Fields.findByThriftIdOrThrow(fieldId)); + } + + /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + switch (field) { } + throw new IllegalStateException(); } - // Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise public boolean isSet(int fieldID) { - switch (fieldID) { - default: - throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!"); - } + return isSet(_Fields.findByThriftIdOrThrow(fieldID)); } @Override @@ -136,17 +181,17 @@ if (field.type == TType.STOP) { break; } - switch (field.id) - { - default: - TProtocolUtil.skip(iprot, field.type); - break; + _Fields fieldId = _Fields.findByThriftId(field.id); + if (fieldId == null) { + TProtocolUtil.skip(iprot, field.type); + } else { + switch (fieldId) { + } + iprot.readFieldEnd(); } - iprot.readFieldEnd(); } iprot.readStructEnd(); - // check for required fields of primitive type, which can't be checked in the validate method validate(); } @@ -170,7 +215,6 @@ public void validate() throws TException { // check for required fields - // check that fields of type enum have valid values } }
