incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [2/27] Massive changes to the the thrift API. Getting closer to the final version, this commit also removes the controller from the architecture.
Date Sun, 18 Nov 2012 00:52:57 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/aee531c2/interface/gen-java/org/apache/blur/thrift/generated/AlternateColumnDefinition.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/AlternateColumnDefinition.java b/interface/gen-java/org/apache/blur/thrift/generated/AlternateColumnDefinition.java
deleted file mode 100644
index ae347fb..0000000
--- a/interface/gen-java/org/apache/blur/thrift/generated/AlternateColumnDefinition.java
+++ /dev/null
@@ -1,420 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.blur.thrift.generated;
-
-/**
- * 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 org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-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.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 
- */
-public class AlternateColumnDefinition implements org.apache.thrift.TBase<AlternateColumnDefinition, AlternateColumnDefinition._Fields>, java.io.Serializable, Cloneable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AlternateColumnDefinition");
-
-  private static final org.apache.thrift.protocol.TField ANALYZER_CLASS_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("analyzerClassName", org.apache.thrift.protocol.TType.STRING, (short)1);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new AlternateColumnDefinitionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new AlternateColumnDefinitionTupleSchemeFactory());
-  }
-
-  /**
-   * 
-   */
-  public String analyzerClassName; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    /**
-     * 
-     */
-    ANALYZER_CLASS_NAME((short)1, "analyzerClassName");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // ANALYZER_CLASS_NAME
-          return ANALYZER_CLASS_NAME;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * 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<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.ANALYZER_CLASS_NAME, new org.apache.thrift.meta_data.FieldMetaData("analyzerClassName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AlternateColumnDefinition.class, metaDataMap);
-  }
-
-  public AlternateColumnDefinition() {
-  }
-
-  public AlternateColumnDefinition(
-    String analyzerClassName)
-  {
-    this();
-    this.analyzerClassName = analyzerClassName;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public AlternateColumnDefinition(AlternateColumnDefinition other) {
-    if (other.isSetAnalyzerClassName()) {
-      this.analyzerClassName = other.analyzerClassName;
-    }
-  }
-
-  public AlternateColumnDefinition deepCopy() {
-    return new AlternateColumnDefinition(this);
-  }
-
-  @Override
-  public void clear() {
-    this.analyzerClassName = null;
-  }
-
-  /**
-   * 
-   */
-  public String getAnalyzerClassName() {
-    return this.analyzerClassName;
-  }
-
-  /**
-   * 
-   */
-  public AlternateColumnDefinition setAnalyzerClassName(String analyzerClassName) {
-    this.analyzerClassName = analyzerClassName;
-    return this;
-  }
-
-  public void unsetAnalyzerClassName() {
-    this.analyzerClassName = null;
-  }
-
-  /** Returns true if field analyzerClassName is set (has been assigned a value) and false otherwise */
-  public boolean isSetAnalyzerClassName() {
-    return this.analyzerClassName != null;
-  }
-
-  public void setAnalyzerClassNameIsSet(boolean value) {
-    if (!value) {
-      this.analyzerClassName = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case ANALYZER_CLASS_NAME:
-      if (value == null) {
-        unsetAnalyzerClassName();
-      } else {
-        setAnalyzerClassName((String)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case ANALYZER_CLASS_NAME:
-      return getAnalyzerClassName();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case ANALYZER_CLASS_NAME:
-      return isSetAnalyzerClassName();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof AlternateColumnDefinition)
-      return this.equals((AlternateColumnDefinition)that);
-    return false;
-  }
-
-  public boolean equals(AlternateColumnDefinition that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_analyzerClassName = true && this.isSetAnalyzerClassName();
-    boolean that_present_analyzerClassName = true && that.isSetAnalyzerClassName();
-    if (this_present_analyzerClassName || that_present_analyzerClassName) {
-      if (!(this_present_analyzerClassName && that_present_analyzerClassName))
-        return false;
-      if (!this.analyzerClassName.equals(that.analyzerClassName))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  public int compareTo(AlternateColumnDefinition other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-    AlternateColumnDefinition typedOther = (AlternateColumnDefinition)other;
-
-    lastComparison = Boolean.valueOf(isSetAnalyzerClassName()).compareTo(typedOther.isSetAnalyzerClassName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetAnalyzerClassName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.analyzerClassName, typedOther.analyzerClassName);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("AlternateColumnDefinition(");
-    boolean first = true;
-
-    sb.append("analyzerClassName:");
-    if (this.analyzerClassName == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.analyzerClassName);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class AlternateColumnDefinitionStandardSchemeFactory implements SchemeFactory {
-    public AlternateColumnDefinitionStandardScheme getScheme() {
-      return new AlternateColumnDefinitionStandardScheme();
-    }
-  }
-
-  private static class AlternateColumnDefinitionStandardScheme extends StandardScheme<AlternateColumnDefinition> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, AlternateColumnDefinition struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // ANALYZER_CLASS_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.analyzerClassName = iprot.readString();
-              struct.setAnalyzerClassNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked in the validate method
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, AlternateColumnDefinition struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.analyzerClassName != null) {
-        oprot.writeFieldBegin(ANALYZER_CLASS_NAME_FIELD_DESC);
-        oprot.writeString(struct.analyzerClassName);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class AlternateColumnDefinitionTupleSchemeFactory implements SchemeFactory {
-    public AlternateColumnDefinitionTupleScheme getScheme() {
-      return new AlternateColumnDefinitionTupleScheme();
-    }
-  }
-
-  private static class AlternateColumnDefinitionTupleScheme extends TupleScheme<AlternateColumnDefinition> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, AlternateColumnDefinition struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetAnalyzerClassName()) {
-        optionals.set(0);
-      }
-      oprot.writeBitSet(optionals, 1);
-      if (struct.isSetAnalyzerClassName()) {
-        oprot.writeString(struct.analyzerClassName);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, AlternateColumnDefinition struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.analyzerClassName = iprot.readString();
-        struct.setAnalyzerClassNameIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/aee531c2/interface/gen-java/org/apache/blur/thrift/generated/Analyzer.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/Analyzer.java b/interface/gen-java/org/apache/blur/thrift/generated/Analyzer.java
new file mode 100644
index 0000000..d6fd0e7
--- /dev/null
+++ b/interface/gen-java/org/apache/blur/thrift/generated/Analyzer.java
@@ -0,0 +1,459 @@
+/**
+ * Autogenerated by Thrift Compiler (0.9.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package org.apache.blur.thrift.generated;
+
+/**
+ * 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 org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+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.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Analyzer implements org.apache.thrift.TBase<Analyzer, Analyzer._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Analyzer");
+
+  private static final org.apache.thrift.protocol.TField ANALYZER_TYPES_FIELD_DESC = new org.apache.thrift.protocol.TField("analyzerTypes", org.apache.thrift.protocol.TType.LIST, (short)1);
+
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new AnalyzerStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new AnalyzerTupleSchemeFactory());
+  }
+
+  public List<AnalyzerType> analyzerTypes; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    ANALYZER_TYPES((short)1, "analyzerTypes");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // ANALYZER_TYPES
+          return ANALYZER_TYPES;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * 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<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.ANALYZER_TYPES, new org.apache.thrift.meta_data.FieldMetaData("analyzerTypes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, AnalyzerType.class))));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Analyzer.class, metaDataMap);
+  }
+
+  public Analyzer() {
+  }
+
+  public Analyzer(
+    List<AnalyzerType> analyzerTypes)
+  {
+    this();
+    this.analyzerTypes = analyzerTypes;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public Analyzer(Analyzer other) {
+    if (other.isSetAnalyzerTypes()) {
+      List<AnalyzerType> __this__analyzerTypes = new ArrayList<AnalyzerType>();
+      for (AnalyzerType other_element : other.analyzerTypes) {
+        __this__analyzerTypes.add(new AnalyzerType(other_element));
+      }
+      this.analyzerTypes = __this__analyzerTypes;
+    }
+  }
+
+  public Analyzer deepCopy() {
+    return new Analyzer(this);
+  }
+
+  @Override
+  public void clear() {
+    this.analyzerTypes = null;
+  }
+
+  public int getAnalyzerTypesSize() {
+    return (this.analyzerTypes == null) ? 0 : this.analyzerTypes.size();
+  }
+
+  public java.util.Iterator<AnalyzerType> getAnalyzerTypesIterator() {
+    return (this.analyzerTypes == null) ? null : this.analyzerTypes.iterator();
+  }
+
+  public void addToAnalyzerTypes(AnalyzerType elem) {
+    if (this.analyzerTypes == null) {
+      this.analyzerTypes = new ArrayList<AnalyzerType>();
+    }
+    this.analyzerTypes.add(elem);
+  }
+
+  public List<AnalyzerType> getAnalyzerTypes() {
+    return this.analyzerTypes;
+  }
+
+  public Analyzer setAnalyzerTypes(List<AnalyzerType> analyzerTypes) {
+    this.analyzerTypes = analyzerTypes;
+    return this;
+  }
+
+  public void unsetAnalyzerTypes() {
+    this.analyzerTypes = null;
+  }
+
+  /** Returns true if field analyzerTypes is set (has been assigned a value) and false otherwise */
+  public boolean isSetAnalyzerTypes() {
+    return this.analyzerTypes != null;
+  }
+
+  public void setAnalyzerTypesIsSet(boolean value) {
+    if (!value) {
+      this.analyzerTypes = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case ANALYZER_TYPES:
+      if (value == null) {
+        unsetAnalyzerTypes();
+      } else {
+        setAnalyzerTypes((List<AnalyzerType>)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case ANALYZER_TYPES:
+      return getAnalyzerTypes();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case ANALYZER_TYPES:
+      return isSetAnalyzerTypes();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof Analyzer)
+      return this.equals((Analyzer)that);
+    return false;
+  }
+
+  public boolean equals(Analyzer that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_analyzerTypes = true && this.isSetAnalyzerTypes();
+    boolean that_present_analyzerTypes = true && that.isSetAnalyzerTypes();
+    if (this_present_analyzerTypes || that_present_analyzerTypes) {
+      if (!(this_present_analyzerTypes && that_present_analyzerTypes))
+        return false;
+      if (!this.analyzerTypes.equals(that.analyzerTypes))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(Analyzer other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    Analyzer typedOther = (Analyzer)other;
+
+    lastComparison = Boolean.valueOf(isSetAnalyzerTypes()).compareTo(typedOther.isSetAnalyzerTypes());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetAnalyzerTypes()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.analyzerTypes, typedOther.analyzerTypes);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("Analyzer(");
+    boolean first = true;
+
+    sb.append("analyzerTypes:");
+    if (this.analyzerTypes == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.analyzerTypes);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+    // check for sub-struct validity
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private static class AnalyzerStandardSchemeFactory implements SchemeFactory {
+    public AnalyzerStandardScheme getScheme() {
+      return new AnalyzerStandardScheme();
+    }
+  }
+
+  private static class AnalyzerStandardScheme extends StandardScheme<Analyzer> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, Analyzer struct) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField schemeField;
+      iprot.readStructBegin();
+      while (true)
+      {
+        schemeField = iprot.readFieldBegin();
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (schemeField.id) {
+          case 1: // ANALYZER_TYPES
+            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list46 = iprot.readListBegin();
+                struct.analyzerTypes = new ArrayList<AnalyzerType>(_list46.size);
+                for (int _i47 = 0; _i47 < _list46.size; ++_i47)
+                {
+                  AnalyzerType _elem48; // required
+                  _elem48 = new AnalyzerType();
+                  _elem48.read(iprot);
+                  struct.analyzerTypes.add(_elem48);
+                }
+                iprot.readListEnd();
+              }
+              struct.setAnalyzerTypesIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, Analyzer struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.analyzerTypes != null) {
+        oprot.writeFieldBegin(ANALYZER_TYPES_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.analyzerTypes.size()));
+          for (AnalyzerType _iter49 : struct.analyzerTypes)
+          {
+            _iter49.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class AnalyzerTupleSchemeFactory implements SchemeFactory {
+    public AnalyzerTupleScheme getScheme() {
+      return new AnalyzerTupleScheme();
+    }
+  }
+
+  private static class AnalyzerTupleScheme extends TupleScheme<Analyzer> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, Analyzer struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      BitSet optionals = new BitSet();
+      if (struct.isSetAnalyzerTypes()) {
+        optionals.set(0);
+      }
+      oprot.writeBitSet(optionals, 1);
+      if (struct.isSetAnalyzerTypes()) {
+        {
+          oprot.writeI32(struct.analyzerTypes.size());
+          for (AnalyzerType _iter50 : struct.analyzerTypes)
+          {
+            _iter50.write(oprot);
+          }
+        }
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, Analyzer struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      BitSet incoming = iprot.readBitSet(1);
+      if (incoming.get(0)) {
+        {
+          org.apache.thrift.protocol.TList _list51 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.analyzerTypes = new ArrayList<AnalyzerType>(_list51.size);
+          for (int _i52 = 0; _i52 < _list51.size; ++_i52)
+          {
+            AnalyzerType _elem53; // required
+            _elem53 = new AnalyzerType();
+            _elem53.read(iprot);
+            struct.analyzerTypes.add(_elem53);
+          }
+        }
+        struct.setAnalyzerTypesIsSet(true);
+      }
+    }
+  }
+
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/aee531c2/interface/gen-java/org/apache/blur/thrift/generated/AnalyzerDefinition.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/AnalyzerDefinition.java b/interface/gen-java/org/apache/blur/thrift/generated/AnalyzerDefinition.java
deleted file mode 100644
index 6b2daae..0000000
--- a/interface/gen-java/org/apache/blur/thrift/generated/AnalyzerDefinition.java
+++ /dev/null
@@ -1,717 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.blur.thrift.generated;
-
-/**
- * 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 org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-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.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 
- */
-public class AnalyzerDefinition implements org.apache.thrift.TBase<AnalyzerDefinition, AnalyzerDefinition._Fields>, java.io.Serializable, Cloneable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AnalyzerDefinition");
-
-  private static final org.apache.thrift.protocol.TField DEFAULT_DEFINITION_FIELD_DESC = new org.apache.thrift.protocol.TField("defaultDefinition", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.thrift.protocol.TField FULL_TEXT_ANALYZER_CLASS_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("fullTextAnalyzerClassName", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField COLUMN_FAMILY_DEFINITIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("columnFamilyDefinitions", org.apache.thrift.protocol.TType.MAP, (short)3);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new AnalyzerDefinitionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new AnalyzerDefinitionTupleSchemeFactory());
-  }
-
-  /**
-   * 
-   */
-  public ColumnDefinition defaultDefinition; // required
-  /**
-   * 
-   */
-  public String fullTextAnalyzerClassName; // required
-  /**
-   * 
-   */
-  public Map<String,ColumnFamilyDefinition> columnFamilyDefinitions; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    /**
-     * 
-     */
-    DEFAULT_DEFINITION((short)1, "defaultDefinition"),
-    /**
-     * 
-     */
-    FULL_TEXT_ANALYZER_CLASS_NAME((short)2, "fullTextAnalyzerClassName"),
-    /**
-     * 
-     */
-    COLUMN_FAMILY_DEFINITIONS((short)3, "columnFamilyDefinitions");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // DEFAULT_DEFINITION
-          return DEFAULT_DEFINITION;
-        case 2: // FULL_TEXT_ANALYZER_CLASS_NAME
-          return FULL_TEXT_ANALYZER_CLASS_NAME;
-        case 3: // COLUMN_FAMILY_DEFINITIONS
-          return COLUMN_FAMILY_DEFINITIONS;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * 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<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.DEFAULT_DEFINITION, new org.apache.thrift.meta_data.FieldMetaData("defaultDefinition", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ColumnDefinition.class)));
-    tmpMap.put(_Fields.FULL_TEXT_ANALYZER_CLASS_NAME, new org.apache.thrift.meta_data.FieldMetaData("fullTextAnalyzerClassName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.COLUMN_FAMILY_DEFINITIONS, new org.apache.thrift.meta_data.FieldMetaData("columnFamilyDefinitions", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ColumnFamilyDefinition.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AnalyzerDefinition.class, metaDataMap);
-  }
-
-  public AnalyzerDefinition() {
-    this.fullTextAnalyzerClassName = "org.apache.lucene.analysis.standard.StandardAnalyzer";
-
-  }
-
-  public AnalyzerDefinition(
-    ColumnDefinition defaultDefinition,
-    String fullTextAnalyzerClassName,
-    Map<String,ColumnFamilyDefinition> columnFamilyDefinitions)
-  {
-    this();
-    this.defaultDefinition = defaultDefinition;
-    this.fullTextAnalyzerClassName = fullTextAnalyzerClassName;
-    this.columnFamilyDefinitions = columnFamilyDefinitions;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public AnalyzerDefinition(AnalyzerDefinition other) {
-    if (other.isSetDefaultDefinition()) {
-      this.defaultDefinition = new ColumnDefinition(other.defaultDefinition);
-    }
-    if (other.isSetFullTextAnalyzerClassName()) {
-      this.fullTextAnalyzerClassName = other.fullTextAnalyzerClassName;
-    }
-    if (other.isSetColumnFamilyDefinitions()) {
-      Map<String,ColumnFamilyDefinition> __this__columnFamilyDefinitions = new HashMap<String,ColumnFamilyDefinition>();
-      for (Map.Entry<String, ColumnFamilyDefinition> other_element : other.columnFamilyDefinitions.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        ColumnFamilyDefinition other_element_value = other_element.getValue();
-
-        String __this__columnFamilyDefinitions_copy_key = other_element_key;
-
-        ColumnFamilyDefinition __this__columnFamilyDefinitions_copy_value = new ColumnFamilyDefinition(other_element_value);
-
-        __this__columnFamilyDefinitions.put(__this__columnFamilyDefinitions_copy_key, __this__columnFamilyDefinitions_copy_value);
-      }
-      this.columnFamilyDefinitions = __this__columnFamilyDefinitions;
-    }
-  }
-
-  public AnalyzerDefinition deepCopy() {
-    return new AnalyzerDefinition(this);
-  }
-
-  @Override
-  public void clear() {
-    this.defaultDefinition = null;
-    this.fullTextAnalyzerClassName = "org.apache.lucene.analysis.standard.StandardAnalyzer";
-
-    this.columnFamilyDefinitions = null;
-  }
-
-  /**
-   * 
-   */
-  public ColumnDefinition getDefaultDefinition() {
-    return this.defaultDefinition;
-  }
-
-  /**
-   * 
-   */
-  public AnalyzerDefinition setDefaultDefinition(ColumnDefinition defaultDefinition) {
-    this.defaultDefinition = defaultDefinition;
-    return this;
-  }
-
-  public void unsetDefaultDefinition() {
-    this.defaultDefinition = null;
-  }
-
-  /** Returns true if field defaultDefinition is set (has been assigned a value) and false otherwise */
-  public boolean isSetDefaultDefinition() {
-    return this.defaultDefinition != null;
-  }
-
-  public void setDefaultDefinitionIsSet(boolean value) {
-    if (!value) {
-      this.defaultDefinition = null;
-    }
-  }
-
-  /**
-   * 
-   */
-  public String getFullTextAnalyzerClassName() {
-    return this.fullTextAnalyzerClassName;
-  }
-
-  /**
-   * 
-   */
-  public AnalyzerDefinition setFullTextAnalyzerClassName(String fullTextAnalyzerClassName) {
-    this.fullTextAnalyzerClassName = fullTextAnalyzerClassName;
-    return this;
-  }
-
-  public void unsetFullTextAnalyzerClassName() {
-    this.fullTextAnalyzerClassName = null;
-  }
-
-  /** Returns true if field fullTextAnalyzerClassName is set (has been assigned a value) and false otherwise */
-  public boolean isSetFullTextAnalyzerClassName() {
-    return this.fullTextAnalyzerClassName != null;
-  }
-
-  public void setFullTextAnalyzerClassNameIsSet(boolean value) {
-    if (!value) {
-      this.fullTextAnalyzerClassName = null;
-    }
-  }
-
-  public int getColumnFamilyDefinitionsSize() {
-    return (this.columnFamilyDefinitions == null) ? 0 : this.columnFamilyDefinitions.size();
-  }
-
-  public void putToColumnFamilyDefinitions(String key, ColumnFamilyDefinition val) {
-    if (this.columnFamilyDefinitions == null) {
-      this.columnFamilyDefinitions = new HashMap<String,ColumnFamilyDefinition>();
-    }
-    this.columnFamilyDefinitions.put(key, val);
-  }
-
-  /**
-   * 
-   */
-  public Map<String,ColumnFamilyDefinition> getColumnFamilyDefinitions() {
-    return this.columnFamilyDefinitions;
-  }
-
-  /**
-   * 
-   */
-  public AnalyzerDefinition setColumnFamilyDefinitions(Map<String,ColumnFamilyDefinition> columnFamilyDefinitions) {
-    this.columnFamilyDefinitions = columnFamilyDefinitions;
-    return this;
-  }
-
-  public void unsetColumnFamilyDefinitions() {
-    this.columnFamilyDefinitions = null;
-  }
-
-  /** Returns true if field columnFamilyDefinitions is set (has been assigned a value) and false otherwise */
-  public boolean isSetColumnFamilyDefinitions() {
-    return this.columnFamilyDefinitions != null;
-  }
-
-  public void setColumnFamilyDefinitionsIsSet(boolean value) {
-    if (!value) {
-      this.columnFamilyDefinitions = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case DEFAULT_DEFINITION:
-      if (value == null) {
-        unsetDefaultDefinition();
-      } else {
-        setDefaultDefinition((ColumnDefinition)value);
-      }
-      break;
-
-    case FULL_TEXT_ANALYZER_CLASS_NAME:
-      if (value == null) {
-        unsetFullTextAnalyzerClassName();
-      } else {
-        setFullTextAnalyzerClassName((String)value);
-      }
-      break;
-
-    case COLUMN_FAMILY_DEFINITIONS:
-      if (value == null) {
-        unsetColumnFamilyDefinitions();
-      } else {
-        setColumnFamilyDefinitions((Map<String,ColumnFamilyDefinition>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case DEFAULT_DEFINITION:
-      return getDefaultDefinition();
-
-    case FULL_TEXT_ANALYZER_CLASS_NAME:
-      return getFullTextAnalyzerClassName();
-
-    case COLUMN_FAMILY_DEFINITIONS:
-      return getColumnFamilyDefinitions();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case DEFAULT_DEFINITION:
-      return isSetDefaultDefinition();
-    case FULL_TEXT_ANALYZER_CLASS_NAME:
-      return isSetFullTextAnalyzerClassName();
-    case COLUMN_FAMILY_DEFINITIONS:
-      return isSetColumnFamilyDefinitions();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof AnalyzerDefinition)
-      return this.equals((AnalyzerDefinition)that);
-    return false;
-  }
-
-  public boolean equals(AnalyzerDefinition that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_defaultDefinition = true && this.isSetDefaultDefinition();
-    boolean that_present_defaultDefinition = true && that.isSetDefaultDefinition();
-    if (this_present_defaultDefinition || that_present_defaultDefinition) {
-      if (!(this_present_defaultDefinition && that_present_defaultDefinition))
-        return false;
-      if (!this.defaultDefinition.equals(that.defaultDefinition))
-        return false;
-    }
-
-    boolean this_present_fullTextAnalyzerClassName = true && this.isSetFullTextAnalyzerClassName();
-    boolean that_present_fullTextAnalyzerClassName = true && that.isSetFullTextAnalyzerClassName();
-    if (this_present_fullTextAnalyzerClassName || that_present_fullTextAnalyzerClassName) {
-      if (!(this_present_fullTextAnalyzerClassName && that_present_fullTextAnalyzerClassName))
-        return false;
-      if (!this.fullTextAnalyzerClassName.equals(that.fullTextAnalyzerClassName))
-        return false;
-    }
-
-    boolean this_present_columnFamilyDefinitions = true && this.isSetColumnFamilyDefinitions();
-    boolean that_present_columnFamilyDefinitions = true && that.isSetColumnFamilyDefinitions();
-    if (this_present_columnFamilyDefinitions || that_present_columnFamilyDefinitions) {
-      if (!(this_present_columnFamilyDefinitions && that_present_columnFamilyDefinitions))
-        return false;
-      if (!this.columnFamilyDefinitions.equals(that.columnFamilyDefinitions))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  public int compareTo(AnalyzerDefinition other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-    AnalyzerDefinition typedOther = (AnalyzerDefinition)other;
-
-    lastComparison = Boolean.valueOf(isSetDefaultDefinition()).compareTo(typedOther.isSetDefaultDefinition());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDefaultDefinition()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.defaultDefinition, typedOther.defaultDefinition);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetFullTextAnalyzerClassName()).compareTo(typedOther.isSetFullTextAnalyzerClassName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetFullTextAnalyzerClassName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fullTextAnalyzerClassName, typedOther.fullTextAnalyzerClassName);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetColumnFamilyDefinitions()).compareTo(typedOther.isSetColumnFamilyDefinitions());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetColumnFamilyDefinitions()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnFamilyDefinitions, typedOther.columnFamilyDefinitions);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("AnalyzerDefinition(");
-    boolean first = true;
-
-    sb.append("defaultDefinition:");
-    if (this.defaultDefinition == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.defaultDefinition);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("fullTextAnalyzerClassName:");
-    if (this.fullTextAnalyzerClassName == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.fullTextAnalyzerClassName);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("columnFamilyDefinitions:");
-    if (this.columnFamilyDefinitions == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.columnFamilyDefinitions);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // check for sub-struct validity
-    if (defaultDefinition != null) {
-      defaultDefinition.validate();
-    }
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class AnalyzerDefinitionStandardSchemeFactory implements SchemeFactory {
-    public AnalyzerDefinitionStandardScheme getScheme() {
-      return new AnalyzerDefinitionStandardScheme();
-    }
-  }
-
-  private static class AnalyzerDefinitionStandardScheme extends StandardScheme<AnalyzerDefinition> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, AnalyzerDefinition struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // DEFAULT_DEFINITION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.defaultDefinition = new ColumnDefinition();
-              struct.defaultDefinition.read(iprot);
-              struct.setDefaultDefinitionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // FULL_TEXT_ANALYZER_CLASS_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.fullTextAnalyzerClassName = iprot.readString();
-              struct.setFullTextAnalyzerClassNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // COLUMN_FAMILY_DEFINITIONS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map48 = iprot.readMapBegin();
-                struct.columnFamilyDefinitions = new HashMap<String,ColumnFamilyDefinition>(2*_map48.size);
-                for (int _i49 = 0; _i49 < _map48.size; ++_i49)
-                {
-                  String _key50; // required
-                  ColumnFamilyDefinition _val51; // optional
-                  _key50 = iprot.readString();
-                  _val51 = new ColumnFamilyDefinition();
-                  _val51.read(iprot);
-                  struct.columnFamilyDefinitions.put(_key50, _val51);
-                }
-                iprot.readMapEnd();
-              }
-              struct.setColumnFamilyDefinitionsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked in the validate method
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, AnalyzerDefinition struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.defaultDefinition != null) {
-        oprot.writeFieldBegin(DEFAULT_DEFINITION_FIELD_DESC);
-        struct.defaultDefinition.write(oprot);
-        oprot.writeFieldEnd();
-      }
-      if (struct.fullTextAnalyzerClassName != null) {
-        oprot.writeFieldBegin(FULL_TEXT_ANALYZER_CLASS_NAME_FIELD_DESC);
-        oprot.writeString(struct.fullTextAnalyzerClassName);
-        oprot.writeFieldEnd();
-      }
-      if (struct.columnFamilyDefinitions != null) {
-        oprot.writeFieldBegin(COLUMN_FAMILY_DEFINITIONS_FIELD_DESC);
-        {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.columnFamilyDefinitions.size()));
-          for (Map.Entry<String, ColumnFamilyDefinition> _iter52 : struct.columnFamilyDefinitions.entrySet())
-          {
-            oprot.writeString(_iter52.getKey());
-            _iter52.getValue().write(oprot);
-          }
-          oprot.writeMapEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class AnalyzerDefinitionTupleSchemeFactory implements SchemeFactory {
-    public AnalyzerDefinitionTupleScheme getScheme() {
-      return new AnalyzerDefinitionTupleScheme();
-    }
-  }
-
-  private static class AnalyzerDefinitionTupleScheme extends TupleScheme<AnalyzerDefinition> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, AnalyzerDefinition struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetDefaultDefinition()) {
-        optionals.set(0);
-      }
-      if (struct.isSetFullTextAnalyzerClassName()) {
-        optionals.set(1);
-      }
-      if (struct.isSetColumnFamilyDefinitions()) {
-        optionals.set(2);
-      }
-      oprot.writeBitSet(optionals, 3);
-      if (struct.isSetDefaultDefinition()) {
-        struct.defaultDefinition.write(oprot);
-      }
-      if (struct.isSetFullTextAnalyzerClassName()) {
-        oprot.writeString(struct.fullTextAnalyzerClassName);
-      }
-      if (struct.isSetColumnFamilyDefinitions()) {
-        {
-          oprot.writeI32(struct.columnFamilyDefinitions.size());
-          for (Map.Entry<String, ColumnFamilyDefinition> _iter53 : struct.columnFamilyDefinitions.entrySet())
-          {
-            oprot.writeString(_iter53.getKey());
-            _iter53.getValue().write(oprot);
-          }
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, AnalyzerDefinition struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.defaultDefinition = new ColumnDefinition();
-        struct.defaultDefinition.read(iprot);
-        struct.setDefaultDefinitionIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.fullTextAnalyzerClassName = iprot.readString();
-        struct.setFullTextAnalyzerClassNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          org.apache.thrift.protocol.TMap _map54 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.columnFamilyDefinitions = new HashMap<String,ColumnFamilyDefinition>(2*_map54.size);
-          for (int _i55 = 0; _i55 < _map54.size; ++_i55)
-          {
-            String _key56; // required
-            ColumnFamilyDefinition _val57; // optional
-            _key56 = iprot.readString();
-            _val57 = new ColumnFamilyDefinition();
-            _val57.read(iprot);
-            struct.columnFamilyDefinitions.put(_key56, _val57);
-          }
-        }
-        struct.setColumnFamilyDefinitionsIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/aee531c2/interface/gen-java/org/apache/blur/thrift/generated/AnalyzerSubType.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/AnalyzerSubType.java b/interface/gen-java/org/apache/blur/thrift/generated/AnalyzerSubType.java
new file mode 100644
index 0000000..36d7374
--- /dev/null
+++ b/interface/gen-java/org/apache/blur/thrift/generated/AnalyzerSubType.java
@@ -0,0 +1,510 @@
+/**
+ * Autogenerated by Thrift Compiler (0.9.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package org.apache.blur.thrift.generated;
+
+/**
+ * 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 org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+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.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class AnalyzerSubType implements org.apache.thrift.TBase<AnalyzerSubType, AnalyzerSubType._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AnalyzerSubType");
+
+  private static final org.apache.thrift.protocol.TField FIELD_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("fieldName", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField CLASS_DEFINITION_FIELD_DESC = new org.apache.thrift.protocol.TField("classDefinition", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new AnalyzerSubTypeStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new AnalyzerSubTypeTupleSchemeFactory());
+  }
+
+  public String fieldName; // required
+  public ClassDefinition classDefinition; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    FIELD_NAME((short)1, "fieldName"),
+    CLASS_DEFINITION((short)2, "classDefinition");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // FIELD_NAME
+          return FIELD_NAME;
+        case 2: // CLASS_DEFINITION
+          return CLASS_DEFINITION;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * 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<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.FIELD_NAME, new org.apache.thrift.meta_data.FieldMetaData("fieldName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.CLASS_DEFINITION, new org.apache.thrift.meta_data.FieldMetaData("classDefinition", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ClassDefinition.class)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AnalyzerSubType.class, metaDataMap);
+  }
+
+  public AnalyzerSubType() {
+  }
+
+  public AnalyzerSubType(
+    String fieldName,
+    ClassDefinition classDefinition)
+  {
+    this();
+    this.fieldName = fieldName;
+    this.classDefinition = classDefinition;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public AnalyzerSubType(AnalyzerSubType other) {
+    if (other.isSetFieldName()) {
+      this.fieldName = other.fieldName;
+    }
+    if (other.isSetClassDefinition()) {
+      this.classDefinition = new ClassDefinition(other.classDefinition);
+    }
+  }
+
+  public AnalyzerSubType deepCopy() {
+    return new AnalyzerSubType(this);
+  }
+
+  @Override
+  public void clear() {
+    this.fieldName = null;
+    this.classDefinition = null;
+  }
+
+  public String getFieldName() {
+    return this.fieldName;
+  }
+
+  public AnalyzerSubType setFieldName(String fieldName) {
+    this.fieldName = fieldName;
+    return this;
+  }
+
+  public void unsetFieldName() {
+    this.fieldName = null;
+  }
+
+  /** Returns true if field fieldName is set (has been assigned a value) and false otherwise */
+  public boolean isSetFieldName() {
+    return this.fieldName != null;
+  }
+
+  public void setFieldNameIsSet(boolean value) {
+    if (!value) {
+      this.fieldName = null;
+    }
+  }
+
+  public ClassDefinition getClassDefinition() {
+    return this.classDefinition;
+  }
+
+  public AnalyzerSubType setClassDefinition(ClassDefinition classDefinition) {
+    this.classDefinition = classDefinition;
+    return this;
+  }
+
+  public void unsetClassDefinition() {
+    this.classDefinition = null;
+  }
+
+  /** Returns true if field classDefinition is set (has been assigned a value) and false otherwise */
+  public boolean isSetClassDefinition() {
+    return this.classDefinition != null;
+  }
+
+  public void setClassDefinitionIsSet(boolean value) {
+    if (!value) {
+      this.classDefinition = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case FIELD_NAME:
+      if (value == null) {
+        unsetFieldName();
+      } else {
+        setFieldName((String)value);
+      }
+      break;
+
+    case CLASS_DEFINITION:
+      if (value == null) {
+        unsetClassDefinition();
+      } else {
+        setClassDefinition((ClassDefinition)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case FIELD_NAME:
+      return getFieldName();
+
+    case CLASS_DEFINITION:
+      return getClassDefinition();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case FIELD_NAME:
+      return isSetFieldName();
+    case CLASS_DEFINITION:
+      return isSetClassDefinition();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof AnalyzerSubType)
+      return this.equals((AnalyzerSubType)that);
+    return false;
+  }
+
+  public boolean equals(AnalyzerSubType that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_fieldName = true && this.isSetFieldName();
+    boolean that_present_fieldName = true && that.isSetFieldName();
+    if (this_present_fieldName || that_present_fieldName) {
+      if (!(this_present_fieldName && that_present_fieldName))
+        return false;
+      if (!this.fieldName.equals(that.fieldName))
+        return false;
+    }
+
+    boolean this_present_classDefinition = true && this.isSetClassDefinition();
+    boolean that_present_classDefinition = true && that.isSetClassDefinition();
+    if (this_present_classDefinition || that_present_classDefinition) {
+      if (!(this_present_classDefinition && that_present_classDefinition))
+        return false;
+      if (!this.classDefinition.equals(that.classDefinition))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(AnalyzerSubType other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    AnalyzerSubType typedOther = (AnalyzerSubType)other;
+
+    lastComparison = Boolean.valueOf(isSetFieldName()).compareTo(typedOther.isSetFieldName());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetFieldName()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fieldName, typedOther.fieldName);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetClassDefinition()).compareTo(typedOther.isSetClassDefinition());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetClassDefinition()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.classDefinition, typedOther.classDefinition);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("AnalyzerSubType(");
+    boolean first = true;
+
+    sb.append("fieldName:");
+    if (this.fieldName == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.fieldName);
+    }
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("classDefinition:");
+    if (this.classDefinition == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.classDefinition);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+    // check for sub-struct validity
+    if (classDefinition != null) {
+      classDefinition.validate();
+    }
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private static class AnalyzerSubTypeStandardSchemeFactory implements SchemeFactory {
+    public AnalyzerSubTypeStandardScheme getScheme() {
+      return new AnalyzerSubTypeStandardScheme();
+    }
+  }
+
+  private static class AnalyzerSubTypeStandardScheme extends StandardScheme<AnalyzerSubType> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, AnalyzerSubType struct) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField schemeField;
+      iprot.readStructBegin();
+      while (true)
+      {
+        schemeField = iprot.readFieldBegin();
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (schemeField.id) {
+          case 1: // FIELD_NAME
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.fieldName = iprot.readString();
+              struct.setFieldNameIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // CLASS_DEFINITION
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.classDefinition = new ClassDefinition();
+              struct.classDefinition.read(iprot);
+              struct.setClassDefinitionIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, AnalyzerSubType struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.fieldName != null) {
+        oprot.writeFieldBegin(FIELD_NAME_FIELD_DESC);
+        oprot.writeString(struct.fieldName);
+        oprot.writeFieldEnd();
+      }
+      if (struct.classDefinition != null) {
+        oprot.writeFieldBegin(CLASS_DEFINITION_FIELD_DESC);
+        struct.classDefinition.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class AnalyzerSubTypeTupleSchemeFactory implements SchemeFactory {
+    public AnalyzerSubTypeTupleScheme getScheme() {
+      return new AnalyzerSubTypeTupleScheme();
+    }
+  }
+
+  private static class AnalyzerSubTypeTupleScheme extends TupleScheme<AnalyzerSubType> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, AnalyzerSubType struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      BitSet optionals = new BitSet();
+      if (struct.isSetFieldName()) {
+        optionals.set(0);
+      }
+      if (struct.isSetClassDefinition()) {
+        optionals.set(1);
+      }
+      oprot.writeBitSet(optionals, 2);
+      if (struct.isSetFieldName()) {
+        oprot.writeString(struct.fieldName);
+      }
+      if (struct.isSetClassDefinition()) {
+        struct.classDefinition.write(oprot);
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, AnalyzerSubType struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      BitSet incoming = iprot.readBitSet(2);
+      if (incoming.get(0)) {
+        struct.fieldName = iprot.readString();
+        struct.setFieldNameIsSet(true);
+      }
+      if (incoming.get(1)) {
+        struct.classDefinition = new ClassDefinition();
+        struct.classDefinition.read(iprot);
+        struct.setClassDefinitionIsSet(true);
+      }
+    }
+  }
+
+}
+


Mime
View raw message