airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [38/40] airavata git commit: Merge branch 'AIRAVATA-2500' into develop
Date Tue, 26 Sep 2017 19:10:07 GMT
http://git-wip-us.apache.org/repos/asf/airavata/blob/ebdf8977/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/UserResourceProfile/Types.php
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/airavata/blob/ebdf8977/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/accountprovisioning/SSHAccountProvisioner.java
----------------------------------------------------------------------
diff --cc airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/accountprovisioning/SSHAccountProvisioner.java
index 0000000,0dcadc4..0a4d046
mode 000000,100644..100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/accountprovisioning/SSHAccountProvisioner.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/accountprovisioning/SSHAccountProvisioner.java
@@@ -1,0 -1,755 +1,722 @@@
+ /**
+  * 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.
+  */
+ 
+ /**
 - * Autogenerated by Thrift Compiler (0.9.3)
++ * Autogenerated by Thrift Compiler (0.10.0)
+  *
+  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+  *  @generated
+  */
+ package org.apache.airavata.model.appcatalog.accountprovisioning;
+ 
 -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 org.apache.thrift.async.AsyncMethodCallback;
 -import org.apache.thrift.server.AbstractNonblockingServer.*;
 -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 javax.annotation.Generated;
 -import org.slf4j.Logger;
 -import org.slf4j.LoggerFactory;
 -
 -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
 -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
++@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
++@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+ public class SSHAccountProvisioner implements org.apache.thrift.TBase<SSHAccountProvisioner, SSHAccountProvisioner._Fields>, java.io.Serializable, Cloneable, Comparable<SSHAccountProvisioner> {
+   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SSHAccountProvisioner");
+ 
+   private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
+   private static final org.apache.thrift.protocol.TField CAN_CREATE_ACCOUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("canCreateAccount", org.apache.thrift.protocol.TType.BOOL, (short)2);
+   private static final org.apache.thrift.protocol.TField CAN_INSTALL_SSHKEY_FIELD_DESC = new org.apache.thrift.protocol.TField("canInstallSSHKey", org.apache.thrift.protocol.TType.BOOL, (short)3);
+   private static final org.apache.thrift.protocol.TField CONFIG_PARAMS_FIELD_DESC = new org.apache.thrift.protocol.TField("configParams", org.apache.thrift.protocol.TType.LIST, (short)4);
+ 
 -  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
 -  static {
 -    schemes.put(StandardScheme.class, new SSHAccountProvisionerStandardSchemeFactory());
 -    schemes.put(TupleScheme.class, new SSHAccountProvisionerTupleSchemeFactory());
 -  }
++  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SSHAccountProvisionerStandardSchemeFactory();
++  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SSHAccountProvisionerTupleSchemeFactory();
+ 
 -  private String name; // required
++  private java.lang.String name; // required
+   private boolean canCreateAccount; // required
+   private boolean canInstallSSHKey; // required
 -  private List<SSHAccountProvisionerConfigParam> configParams; // required
++  private java.util.List<SSHAccountProvisionerConfigParam> configParams; // 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 {
+     NAME((short)1, "name"),
+     CAN_CREATE_ACCOUNT((short)2, "canCreateAccount"),
+     CAN_INSTALL_SSHKEY((short)3, "canInstallSSHKey"),
+     CONFIG_PARAMS((short)4, "configParams");
+ 
 -    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
++    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+ 
+     static {
 -      for (_Fields field : EnumSet.allOf(_Fields.class)) {
++      for (_Fields field : java.util.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: // NAME
+           return NAME;
+         case 2: // CAN_CREATE_ACCOUNT
+           return CAN_CREATE_ACCOUNT;
+         case 3: // CAN_INSTALL_SSHKEY
+           return CAN_INSTALL_SSHKEY;
+         case 4: // CONFIG_PARAMS
+           return CONFIG_PARAMS;
+         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!");
++      if (fields == null) throw new java.lang.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) {
++    public static _Fields findByName(java.lang.String name) {
+       return byName.get(name);
+     }
+ 
+     private final short _thriftId;
 -    private final String _fieldName;
++    private final java.lang.String _fieldName;
+ 
 -    _Fields(short thriftId, String fieldName) {
++    _Fields(short thriftId, java.lang.String fieldName) {
+       _thriftId = thriftId;
+       _fieldName = fieldName;
+     }
+ 
+     public short getThriftFieldId() {
+       return _thriftId;
+     }
+ 
 -    public String getFieldName() {
++    public java.lang.String getFieldName() {
+       return _fieldName;
+     }
+   }
+ 
+   // isset id assignments
+   private static final int __CANCREATEACCOUNT_ISSET_ID = 0;
+   private static final int __CANINSTALLSSHKEY_ISSET_ID = 1;
+   private byte __isset_bitfield = 0;
 -  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
++  public static final java.util.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);
++    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+     tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+     tmpMap.put(_Fields.CAN_CREATE_ACCOUNT, new org.apache.thrift.meta_data.FieldMetaData("canCreateAccount", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+     tmpMap.put(_Fields.CAN_INSTALL_SSHKEY, new org.apache.thrift.meta_data.FieldMetaData("canInstallSSHKey", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+     tmpMap.put(_Fields.CONFIG_PARAMS, new org.apache.thrift.meta_data.FieldMetaData("configParams", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+         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, SSHAccountProvisionerConfigParam.class))));
 -    metaDataMap = Collections.unmodifiableMap(tmpMap);
++    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SSHAccountProvisioner.class, metaDataMap);
+   }
+ 
+   public SSHAccountProvisioner() {
+   }
+ 
+   public SSHAccountProvisioner(
 -    String name,
++    java.lang.String name,
+     boolean canCreateAccount,
+     boolean canInstallSSHKey,
 -    List<SSHAccountProvisionerConfigParam> configParams)
++    java.util.List<SSHAccountProvisionerConfigParam> configParams)
+   {
+     this();
+     this.name = name;
+     this.canCreateAccount = canCreateAccount;
+     setCanCreateAccountIsSet(true);
+     this.canInstallSSHKey = canInstallSSHKey;
+     setCanInstallSSHKeyIsSet(true);
+     this.configParams = configParams;
+   }
+ 
+   /**
+    * Performs a deep copy on <i>other</i>.
+    */
+   public SSHAccountProvisioner(SSHAccountProvisioner other) {
+     __isset_bitfield = other.__isset_bitfield;
+     if (other.isSetName()) {
+       this.name = other.name;
+     }
+     this.canCreateAccount = other.canCreateAccount;
+     this.canInstallSSHKey = other.canInstallSSHKey;
+     if (other.isSetConfigParams()) {
 -      List<SSHAccountProvisionerConfigParam> __this__configParams = new ArrayList<SSHAccountProvisionerConfigParam>(other.configParams.size());
++      java.util.List<SSHAccountProvisionerConfigParam> __this__configParams = new java.util.ArrayList<SSHAccountProvisionerConfigParam>(other.configParams.size());
+       for (SSHAccountProvisionerConfigParam other_element : other.configParams) {
+         __this__configParams.add(new SSHAccountProvisionerConfigParam(other_element));
+       }
+       this.configParams = __this__configParams;
+     }
+   }
+ 
+   public SSHAccountProvisioner deepCopy() {
+     return new SSHAccountProvisioner(this);
+   }
+ 
+   @Override
+   public void clear() {
+     this.name = null;
+     setCanCreateAccountIsSet(false);
+     this.canCreateAccount = false;
+     setCanInstallSSHKeyIsSet(false);
+     this.canInstallSSHKey = false;
+     this.configParams = null;
+   }
+ 
 -  public String getName() {
++  public java.lang.String getName() {
+     return this.name;
+   }
+ 
 -  public void setName(String name) {
++  public void setName(java.lang.String name) {
+     this.name = name;
+   }
+ 
+   public void unsetName() {
+     this.name = null;
+   }
+ 
+   /** Returns true if field name is set (has been assigned a value) and false otherwise */
+   public boolean isSetName() {
+     return this.name != null;
+   }
+ 
+   public void setNameIsSet(boolean value) {
+     if (!value) {
+       this.name = null;
+     }
+   }
+ 
+   public boolean isCanCreateAccount() {
+     return this.canCreateAccount;
+   }
+ 
+   public void setCanCreateAccount(boolean canCreateAccount) {
+     this.canCreateAccount = canCreateAccount;
+     setCanCreateAccountIsSet(true);
+   }
+ 
+   public void unsetCanCreateAccount() {
 -    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CANCREATEACCOUNT_ISSET_ID);
++    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CANCREATEACCOUNT_ISSET_ID);
+   }
+ 
+   /** Returns true if field canCreateAccount is set (has been assigned a value) and false otherwise */
+   public boolean isSetCanCreateAccount() {
 -    return EncodingUtils.testBit(__isset_bitfield, __CANCREATEACCOUNT_ISSET_ID);
++    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CANCREATEACCOUNT_ISSET_ID);
+   }
+ 
+   public void setCanCreateAccountIsSet(boolean value) {
 -    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CANCREATEACCOUNT_ISSET_ID, value);
++    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CANCREATEACCOUNT_ISSET_ID, value);
+   }
+ 
+   public boolean isCanInstallSSHKey() {
+     return this.canInstallSSHKey;
+   }
+ 
+   public void setCanInstallSSHKey(boolean canInstallSSHKey) {
+     this.canInstallSSHKey = canInstallSSHKey;
+     setCanInstallSSHKeyIsSet(true);
+   }
+ 
+   public void unsetCanInstallSSHKey() {
 -    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CANINSTALLSSHKEY_ISSET_ID);
++    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CANINSTALLSSHKEY_ISSET_ID);
+   }
+ 
+   /** Returns true if field canInstallSSHKey is set (has been assigned a value) and false otherwise */
+   public boolean isSetCanInstallSSHKey() {
 -    return EncodingUtils.testBit(__isset_bitfield, __CANINSTALLSSHKEY_ISSET_ID);
++    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CANINSTALLSSHKEY_ISSET_ID);
+   }
+ 
+   public void setCanInstallSSHKeyIsSet(boolean value) {
 -    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CANINSTALLSSHKEY_ISSET_ID, value);
++    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CANINSTALLSSHKEY_ISSET_ID, value);
+   }
+ 
+   public int getConfigParamsSize() {
+     return (this.configParams == null) ? 0 : this.configParams.size();
+   }
+ 
+   public java.util.Iterator<SSHAccountProvisionerConfigParam> getConfigParamsIterator() {
+     return (this.configParams == null) ? null : this.configParams.iterator();
+   }
+ 
+   public void addToConfigParams(SSHAccountProvisionerConfigParam elem) {
+     if (this.configParams == null) {
 -      this.configParams = new ArrayList<SSHAccountProvisionerConfigParam>();
++      this.configParams = new java.util.ArrayList<SSHAccountProvisionerConfigParam>();
+     }
+     this.configParams.add(elem);
+   }
+ 
 -  public List<SSHAccountProvisionerConfigParam> getConfigParams() {
++  public java.util.List<SSHAccountProvisionerConfigParam> getConfigParams() {
+     return this.configParams;
+   }
+ 
 -  public void setConfigParams(List<SSHAccountProvisionerConfigParam> configParams) {
++  public void setConfigParams(java.util.List<SSHAccountProvisionerConfigParam> configParams) {
+     this.configParams = configParams;
+   }
+ 
+   public void unsetConfigParams() {
+     this.configParams = null;
+   }
+ 
+   /** Returns true if field configParams is set (has been assigned a value) and false otherwise */
+   public boolean isSetConfigParams() {
+     return this.configParams != null;
+   }
+ 
+   public void setConfigParamsIsSet(boolean value) {
+     if (!value) {
+       this.configParams = null;
+     }
+   }
+ 
 -  public void setFieldValue(_Fields field, Object value) {
++  public void setFieldValue(_Fields field, java.lang.Object value) {
+     switch (field) {
+     case NAME:
+       if (value == null) {
+         unsetName();
+       } else {
 -        setName((String)value);
++        setName((java.lang.String)value);
+       }
+       break;
+ 
+     case CAN_CREATE_ACCOUNT:
+       if (value == null) {
+         unsetCanCreateAccount();
+       } else {
 -        setCanCreateAccount((Boolean)value);
++        setCanCreateAccount((java.lang.Boolean)value);
+       }
+       break;
+ 
+     case CAN_INSTALL_SSHKEY:
+       if (value == null) {
+         unsetCanInstallSSHKey();
+       } else {
 -        setCanInstallSSHKey((Boolean)value);
++        setCanInstallSSHKey((java.lang.Boolean)value);
+       }
+       break;
+ 
+     case CONFIG_PARAMS:
+       if (value == null) {
+         unsetConfigParams();
+       } else {
 -        setConfigParams((List<SSHAccountProvisionerConfigParam>)value);
++        setConfigParams((java.util.List<SSHAccountProvisionerConfigParam>)value);
+       }
+       break;
+ 
+     }
+   }
+ 
 -  public Object getFieldValue(_Fields field) {
++  public java.lang.Object getFieldValue(_Fields field) {
+     switch (field) {
+     case NAME:
+       return getName();
+ 
+     case CAN_CREATE_ACCOUNT:
+       return isCanCreateAccount();
+ 
+     case CAN_INSTALL_SSHKEY:
+       return isCanInstallSSHKey();
+ 
+     case CONFIG_PARAMS:
+       return getConfigParams();
+ 
+     }
 -    throw new IllegalStateException();
++    throw new java.lang.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();
++      throw new java.lang.IllegalArgumentException();
+     }
+ 
+     switch (field) {
+     case NAME:
+       return isSetName();
+     case CAN_CREATE_ACCOUNT:
+       return isSetCanCreateAccount();
+     case CAN_INSTALL_SSHKEY:
+       return isSetCanInstallSSHKey();
+     case CONFIG_PARAMS:
+       return isSetConfigParams();
+     }
 -    throw new IllegalStateException();
++    throw new java.lang.IllegalStateException();
+   }
+ 
+   @Override
 -  public boolean equals(Object that) {
++  public boolean equals(java.lang.Object that) {
+     if (that == null)
+       return false;
+     if (that instanceof SSHAccountProvisioner)
+       return this.equals((SSHAccountProvisioner)that);
+     return false;
+   }
+ 
+   public boolean equals(SSHAccountProvisioner that) {
+     if (that == null)
+       return false;
++    if (this == that)
++      return true;
+ 
+     boolean this_present_name = true && this.isSetName();
+     boolean that_present_name = true && that.isSetName();
+     if (this_present_name || that_present_name) {
+       if (!(this_present_name && that_present_name))
+         return false;
+       if (!this.name.equals(that.name))
+         return false;
+     }
+ 
+     boolean this_present_canCreateAccount = true;
+     boolean that_present_canCreateAccount = true;
+     if (this_present_canCreateAccount || that_present_canCreateAccount) {
+       if (!(this_present_canCreateAccount && that_present_canCreateAccount))
+         return false;
+       if (this.canCreateAccount != that.canCreateAccount)
+         return false;
+     }
+ 
+     boolean this_present_canInstallSSHKey = true;
+     boolean that_present_canInstallSSHKey = true;
+     if (this_present_canInstallSSHKey || that_present_canInstallSSHKey) {
+       if (!(this_present_canInstallSSHKey && that_present_canInstallSSHKey))
+         return false;
+       if (this.canInstallSSHKey != that.canInstallSSHKey)
+         return false;
+     }
+ 
+     boolean this_present_configParams = true && this.isSetConfigParams();
+     boolean that_present_configParams = true && that.isSetConfigParams();
+     if (this_present_configParams || that_present_configParams) {
+       if (!(this_present_configParams && that_present_configParams))
+         return false;
+       if (!this.configParams.equals(that.configParams))
+         return false;
+     }
+ 
+     return true;
+   }
+ 
+   @Override
+   public int hashCode() {
 -    List<Object> list = new ArrayList<Object>();
++    int hashCode = 1;
+ 
 -    boolean present_name = true && (isSetName());
 -    list.add(present_name);
 -    if (present_name)
 -      list.add(name);
++    hashCode = hashCode * 8191 + ((isSetName()) ? 131071 : 524287);
++    if (isSetName())
++      hashCode = hashCode * 8191 + name.hashCode();
+ 
 -    boolean present_canCreateAccount = true;
 -    list.add(present_canCreateAccount);
 -    if (present_canCreateAccount)
 -      list.add(canCreateAccount);
++    hashCode = hashCode * 8191 + ((canCreateAccount) ? 131071 : 524287);
+ 
 -    boolean present_canInstallSSHKey = true;
 -    list.add(present_canInstallSSHKey);
 -    if (present_canInstallSSHKey)
 -      list.add(canInstallSSHKey);
++    hashCode = hashCode * 8191 + ((canInstallSSHKey) ? 131071 : 524287);
+ 
 -    boolean present_configParams = true && (isSetConfigParams());
 -    list.add(present_configParams);
 -    if (present_configParams)
 -      list.add(configParams);
++    hashCode = hashCode * 8191 + ((isSetConfigParams()) ? 131071 : 524287);
++    if (isSetConfigParams())
++      hashCode = hashCode * 8191 + configParams.hashCode();
+ 
 -    return list.hashCode();
++    return hashCode;
+   }
+ 
+   @Override
+   public int compareTo(SSHAccountProvisioner other) {
+     if (!getClass().equals(other.getClass())) {
+       return getClass().getName().compareTo(other.getClass().getName());
+     }
+ 
+     int lastComparison = 0;
+ 
 -    lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
++    lastComparison = java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+     if (lastComparison != 0) {
+       return lastComparison;
+     }
+     if (isSetName()) {
+       lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
+       if (lastComparison != 0) {
+         return lastComparison;
+       }
+     }
 -    lastComparison = Boolean.valueOf(isSetCanCreateAccount()).compareTo(other.isSetCanCreateAccount());
++    lastComparison = java.lang.Boolean.valueOf(isSetCanCreateAccount()).compareTo(other.isSetCanCreateAccount());
+     if (lastComparison != 0) {
+       return lastComparison;
+     }
+     if (isSetCanCreateAccount()) {
+       lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.canCreateAccount, other.canCreateAccount);
+       if (lastComparison != 0) {
+         return lastComparison;
+       }
+     }
 -    lastComparison = Boolean.valueOf(isSetCanInstallSSHKey()).compareTo(other.isSetCanInstallSSHKey());
++    lastComparison = java.lang.Boolean.valueOf(isSetCanInstallSSHKey()).compareTo(other.isSetCanInstallSSHKey());
+     if (lastComparison != 0) {
+       return lastComparison;
+     }
+     if (isSetCanInstallSSHKey()) {
+       lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.canInstallSSHKey, other.canInstallSSHKey);
+       if (lastComparison != 0) {
+         return lastComparison;
+       }
+     }
 -    lastComparison = Boolean.valueOf(isSetConfigParams()).compareTo(other.isSetConfigParams());
++    lastComparison = java.lang.Boolean.valueOf(isSetConfigParams()).compareTo(other.isSetConfigParams());
+     if (lastComparison != 0) {
+       return lastComparison;
+     }
+     if (isSetConfigParams()) {
+       lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.configParams, other.configParams);
+       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);
++    scheme(iprot).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);
++    scheme(oprot).write(oprot, this);
+   }
+ 
+   @Override
 -  public String toString() {
 -    StringBuilder sb = new StringBuilder("SSHAccountProvisioner(");
++  public java.lang.String toString() {
++    java.lang.StringBuilder sb = new java.lang.StringBuilder("SSHAccountProvisioner(");
+     boolean first = true;
+ 
+     sb.append("name:");
+     if (this.name == null) {
+       sb.append("null");
+     } else {
+       sb.append(this.name);
+     }
+     first = false;
+     if (!first) sb.append(", ");
+     sb.append("canCreateAccount:");
+     sb.append(this.canCreateAccount);
+     first = false;
+     if (!first) sb.append(", ");
+     sb.append("canInstallSSHKey:");
+     sb.append(this.canInstallSSHKey);
+     first = false;
+     if (!first) sb.append(", ");
+     sb.append("configParams:");
+     if (this.configParams == null) {
+       sb.append("null");
+     } else {
+       sb.append(this.configParams);
+     }
+     first = false;
+     sb.append(")");
+     return sb.toString();
+   }
+ 
+   public void validate() throws org.apache.thrift.TException {
+     // check for required fields
+     if (!isSetName()) {
+       throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
+     }
+ 
+     if (!isSetCanCreateAccount()) {
+       throw new org.apache.thrift.protocol.TProtocolException("Required field 'canCreateAccount' is unset! Struct:" + toString());
+     }
+ 
+     if (!isSetCanInstallSSHKey()) {
+       throw new org.apache.thrift.protocol.TProtocolException("Required field 'canInstallSSHKey' is unset! Struct:" + toString());
+     }
+ 
+     if (!isSetConfigParams()) {
+       throw new org.apache.thrift.protocol.TProtocolException("Required field 'configParams' is unset! Struct:" + toString());
+     }
+ 
+     // 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 {
++  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
+     try {
+       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+       __isset_bitfield = 0;
+       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 SSHAccountProvisionerStandardSchemeFactory implements SchemeFactory {
++  private static class SSHAccountProvisionerStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+     public SSHAccountProvisionerStandardScheme getScheme() {
+       return new SSHAccountProvisionerStandardScheme();
+     }
+   }
+ 
 -  private static class SSHAccountProvisionerStandardScheme extends StandardScheme<SSHAccountProvisioner> {
++  private static class SSHAccountProvisionerStandardScheme extends org.apache.thrift.scheme.StandardScheme<SSHAccountProvisioner> {
+ 
+     public void read(org.apache.thrift.protocol.TProtocol iprot, SSHAccountProvisioner 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: // NAME
+             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+               struct.name = iprot.readString();
+               struct.setNameIsSet(true);
+             } else { 
+               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+             }
+             break;
+           case 2: // CAN_CREATE_ACCOUNT
+             if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+               struct.canCreateAccount = iprot.readBool();
+               struct.setCanCreateAccountIsSet(true);
+             } else { 
+               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+             }
+             break;
+           case 3: // CAN_INSTALL_SSHKEY
+             if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+               struct.canInstallSSHKey = iprot.readBool();
+               struct.setCanInstallSSHKeyIsSet(true);
+             } else { 
+               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+             }
+             break;
+           case 4: // CONFIG_PARAMS
+             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+               {
+                 org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
 -                struct.configParams = new ArrayList<SSHAccountProvisionerConfigParam>(_list0.size);
++                struct.configParams = new java.util.ArrayList<SSHAccountProvisionerConfigParam>(_list0.size);
+                 SSHAccountProvisionerConfigParam _elem1;
+                 for (int _i2 = 0; _i2 < _list0.size; ++_i2)
+                 {
+                   _elem1 = new SSHAccountProvisionerConfigParam();
+                   _elem1.read(iprot);
+                   struct.configParams.add(_elem1);
+                 }
+                 iprot.readListEnd();
+               }
+               struct.setConfigParamsIsSet(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();
+       struct.validate();
+     }
+ 
+     public void write(org.apache.thrift.protocol.TProtocol oprot, SSHAccountProvisioner struct) throws org.apache.thrift.TException {
+       struct.validate();
+ 
+       oprot.writeStructBegin(STRUCT_DESC);
+       if (struct.name != null) {
+         oprot.writeFieldBegin(NAME_FIELD_DESC);
+         oprot.writeString(struct.name);
+         oprot.writeFieldEnd();
+       }
+       oprot.writeFieldBegin(CAN_CREATE_ACCOUNT_FIELD_DESC);
+       oprot.writeBool(struct.canCreateAccount);
+       oprot.writeFieldEnd();
+       oprot.writeFieldBegin(CAN_INSTALL_SSHKEY_FIELD_DESC);
+       oprot.writeBool(struct.canInstallSSHKey);
+       oprot.writeFieldEnd();
+       if (struct.configParams != null) {
+         oprot.writeFieldBegin(CONFIG_PARAMS_FIELD_DESC);
+         {
+           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.configParams.size()));
+           for (SSHAccountProvisionerConfigParam _iter3 : struct.configParams)
+           {
+             _iter3.write(oprot);
+           }
+           oprot.writeListEnd();
+         }
+         oprot.writeFieldEnd();
+       }
+       oprot.writeFieldStop();
+       oprot.writeStructEnd();
+     }
+ 
+   }
+ 
 -  private static class SSHAccountProvisionerTupleSchemeFactory implements SchemeFactory {
++  private static class SSHAccountProvisionerTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+     public SSHAccountProvisionerTupleScheme getScheme() {
+       return new SSHAccountProvisionerTupleScheme();
+     }
+   }
+ 
 -  private static class SSHAccountProvisionerTupleScheme extends TupleScheme<SSHAccountProvisioner> {
++  private static class SSHAccountProvisionerTupleScheme extends org.apache.thrift.scheme.TupleScheme<SSHAccountProvisioner> {
+ 
+     @Override
+     public void write(org.apache.thrift.protocol.TProtocol prot, SSHAccountProvisioner struct) throws org.apache.thrift.TException {
 -      TTupleProtocol oprot = (TTupleProtocol) prot;
++      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+       oprot.writeString(struct.name);
+       oprot.writeBool(struct.canCreateAccount);
+       oprot.writeBool(struct.canInstallSSHKey);
+       {
+         oprot.writeI32(struct.configParams.size());
+         for (SSHAccountProvisionerConfigParam _iter4 : struct.configParams)
+         {
+           _iter4.write(oprot);
+         }
+       }
+     }
+ 
+     @Override
+     public void read(org.apache.thrift.protocol.TProtocol prot, SSHAccountProvisioner struct) throws org.apache.thrift.TException {
 -      TTupleProtocol iprot = (TTupleProtocol) prot;
++      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+       struct.name = iprot.readString();
+       struct.setNameIsSet(true);
+       struct.canCreateAccount = iprot.readBool();
+       struct.setCanCreateAccountIsSet(true);
+       struct.canInstallSSHKey = iprot.readBool();
+       struct.setCanInstallSSHKeyIsSet(true);
+       {
+         org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
 -        struct.configParams = new ArrayList<SSHAccountProvisionerConfigParam>(_list5.size);
++        struct.configParams = new java.util.ArrayList<SSHAccountProvisionerConfigParam>(_list5.size);
+         SSHAccountProvisionerConfigParam _elem6;
+         for (int _i7 = 0; _i7 < _list5.size; ++_i7)
+         {
+           _elem6 = new SSHAccountProvisionerConfigParam();
+           _elem6.read(iprot);
+           struct.configParams.add(_elem6);
+         }
+       }
+       struct.setConfigParamsIsSet(true);
+     }
+   }
+ 
++  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
++    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
++  }
+ }
+ 

http://git-wip-us.apache.org/repos/asf/airavata/blob/ebdf8977/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/accountprovisioning/SSHAccountProvisionerConfigParam.java
----------------------------------------------------------------------
diff --cc airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/accountprovisioning/SSHAccountProvisionerConfigParam.java
index 0000000,11b6613..5dd5264
mode 000000,100644..100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/accountprovisioning/SSHAccountProvisionerConfigParam.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/accountprovisioning/SSHAccountProvisionerConfigParam.java
@@@ -1,0 -1,733 +1,702 @@@
+ /**
+  * 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.
+  */
+ 
+ /**
 - * Autogenerated by Thrift Compiler (0.9.3)
++ * Autogenerated by Thrift Compiler (0.10.0)
+  *
+  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+  *  @generated
+  */
+ package org.apache.airavata.model.appcatalog.accountprovisioning;
+ 
 -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 org.apache.thrift.async.AsyncMethodCallback;
 -import org.apache.thrift.server.AbstractNonblockingServer.*;
 -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 javax.annotation.Generated;
 -import org.slf4j.Logger;
 -import org.slf4j.LoggerFactory;
 -
 -@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
 -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
++@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
++@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+ public class SSHAccountProvisionerConfigParam implements org.apache.thrift.TBase<SSHAccountProvisionerConfigParam, SSHAccountProvisionerConfigParam._Fields>, java.io.Serializable, Cloneable, Comparable<SSHAccountProvisionerConfigParam> {
+   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SSHAccountProvisionerConfigParam");
+ 
+   private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
+   private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)2);
+   private static final org.apache.thrift.protocol.TField IS_OPTIONAL_FIELD_DESC = new org.apache.thrift.protocol.TField("isOptional", org.apache.thrift.protocol.TType.BOOL, (short)3);
+   private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)4);
+ 
 -  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
 -  static {
 -    schemes.put(StandardScheme.class, new SSHAccountProvisionerConfigParamStandardSchemeFactory());
 -    schemes.put(TupleScheme.class, new SSHAccountProvisionerConfigParamTupleSchemeFactory());
 -  }
++  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SSHAccountProvisionerConfigParamStandardSchemeFactory();
++  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SSHAccountProvisionerConfigParamTupleSchemeFactory();
+ 
 -  private String name; // required
++  private java.lang.String name; // required
+   private SSHAccountProvisionerConfigParamType type; // required
+   private boolean isOptional; // required
 -  private String description; // optional
++  private java.lang.String description; // optional
+ 
+   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+     NAME((short)1, "name"),
+     /**
+      * 
+      * @see SSHAccountProvisionerConfigParamType
+      */
+     TYPE((short)2, "type"),
+     IS_OPTIONAL((short)3, "isOptional"),
+     DESCRIPTION((short)4, "description");
+ 
 -    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
++    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
+ 
+     static {
 -      for (_Fields field : EnumSet.allOf(_Fields.class)) {
++      for (_Fields field : java.util.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: // NAME
+           return NAME;
+         case 2: // TYPE
+           return TYPE;
+         case 3: // IS_OPTIONAL
+           return IS_OPTIONAL;
+         case 4: // DESCRIPTION
+           return DESCRIPTION;
+         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!");
++      if (fields == null) throw new java.lang.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) {
++    public static _Fields findByName(java.lang.String name) {
+       return byName.get(name);
+     }
+ 
+     private final short _thriftId;
 -    private final String _fieldName;
++    private final java.lang.String _fieldName;
+ 
 -    _Fields(short thriftId, String fieldName) {
++    _Fields(short thriftId, java.lang.String fieldName) {
+       _thriftId = thriftId;
+       _fieldName = fieldName;
+     }
+ 
+     public short getThriftFieldId() {
+       return _thriftId;
+     }
+ 
 -    public String getFieldName() {
++    public java.lang.String getFieldName() {
+       return _fieldName;
+     }
+   }
+ 
+   // isset id assignments
+   private static final int __ISOPTIONAL_ISSET_ID = 0;
+   private byte __isset_bitfield = 0;
+   private static final _Fields optionals[] = {_Fields.DESCRIPTION};
 -  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
++  public static final java.util.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);
++    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+     tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+     tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, SSHAccountProvisionerConfigParamType.class)));
+     tmpMap.put(_Fields.IS_OPTIONAL, new org.apache.thrift.meta_data.FieldMetaData("isOptional", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+     tmpMap.put(_Fields.DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("description", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
 -    metaDataMap = Collections.unmodifiableMap(tmpMap);
++    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
+     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SSHAccountProvisionerConfigParam.class, metaDataMap);
+   }
+ 
+   public SSHAccountProvisionerConfigParam() {
+     this.type = org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParamType.STRING;
+ 
+     this.isOptional = false;
+ 
+   }
+ 
+   public SSHAccountProvisionerConfigParam(
 -    String name,
++    java.lang.String name,
+     SSHAccountProvisionerConfigParamType type,
+     boolean isOptional)
+   {
+     this();
+     this.name = name;
+     this.type = type;
+     this.isOptional = isOptional;
+     setIsOptionalIsSet(true);
+   }
+ 
+   /**
+    * Performs a deep copy on <i>other</i>.
+    */
+   public SSHAccountProvisionerConfigParam(SSHAccountProvisionerConfigParam other) {
+     __isset_bitfield = other.__isset_bitfield;
+     if (other.isSetName()) {
+       this.name = other.name;
+     }
+     if (other.isSetType()) {
+       this.type = other.type;
+     }
+     this.isOptional = other.isOptional;
+     if (other.isSetDescription()) {
+       this.description = other.description;
+     }
+   }
+ 
+   public SSHAccountProvisionerConfigParam deepCopy() {
+     return new SSHAccountProvisionerConfigParam(this);
+   }
+ 
+   @Override
+   public void clear() {
+     this.name = null;
+     this.type = org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParamType.STRING;
+ 
+     this.isOptional = false;
+ 
+     this.description = null;
+   }
+ 
 -  public String getName() {
++  public java.lang.String getName() {
+     return this.name;
+   }
+ 
 -  public void setName(String name) {
++  public void setName(java.lang.String name) {
+     this.name = name;
+   }
+ 
+   public void unsetName() {
+     this.name = null;
+   }
+ 
+   /** Returns true if field name is set (has been assigned a value) and false otherwise */
+   public boolean isSetName() {
+     return this.name != null;
+   }
+ 
+   public void setNameIsSet(boolean value) {
+     if (!value) {
+       this.name = null;
+     }
+   }
+ 
+   /**
+    * 
+    * @see SSHAccountProvisionerConfigParamType
+    */
+   public SSHAccountProvisionerConfigParamType getType() {
+     return this.type;
+   }
+ 
+   /**
+    * 
+    * @see SSHAccountProvisionerConfigParamType
+    */
+   public void setType(SSHAccountProvisionerConfigParamType type) {
+     this.type = type;
+   }
+ 
+   public void unsetType() {
+     this.type = null;
+   }
+ 
+   /** Returns true if field type is set (has been assigned a value) and false otherwise */
+   public boolean isSetType() {
+     return this.type != null;
+   }
+ 
+   public void setTypeIsSet(boolean value) {
+     if (!value) {
+       this.type = null;
+     }
+   }
+ 
+   public boolean isIsOptional() {
+     return this.isOptional;
+   }
+ 
+   public void setIsOptional(boolean isOptional) {
+     this.isOptional = isOptional;
+     setIsOptionalIsSet(true);
+   }
+ 
+   public void unsetIsOptional() {
 -    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISOPTIONAL_ISSET_ID);
++    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISOPTIONAL_ISSET_ID);
+   }
+ 
+   /** Returns true if field isOptional is set (has been assigned a value) and false otherwise */
+   public boolean isSetIsOptional() {
 -    return EncodingUtils.testBit(__isset_bitfield, __ISOPTIONAL_ISSET_ID);
++    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISOPTIONAL_ISSET_ID);
+   }
+ 
+   public void setIsOptionalIsSet(boolean value) {
 -    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISOPTIONAL_ISSET_ID, value);
++    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISOPTIONAL_ISSET_ID, value);
+   }
+ 
 -  public String getDescription() {
++  public java.lang.String getDescription() {
+     return this.description;
+   }
+ 
 -  public void setDescription(String description) {
++  public void setDescription(java.lang.String description) {
+     this.description = description;
+   }
+ 
+   public void unsetDescription() {
+     this.description = null;
+   }
+ 
+   /** Returns true if field description is set (has been assigned a value) and false otherwise */
+   public boolean isSetDescription() {
+     return this.description != null;
+   }
+ 
+   public void setDescriptionIsSet(boolean value) {
+     if (!value) {
+       this.description = null;
+     }
+   }
+ 
 -  public void setFieldValue(_Fields field, Object value) {
++  public void setFieldValue(_Fields field, java.lang.Object value) {
+     switch (field) {
+     case NAME:
+       if (value == null) {
+         unsetName();
+       } else {
 -        setName((String)value);
++        setName((java.lang.String)value);
+       }
+       break;
+ 
+     case TYPE:
+       if (value == null) {
+         unsetType();
+       } else {
+         setType((SSHAccountProvisionerConfigParamType)value);
+       }
+       break;
+ 
+     case IS_OPTIONAL:
+       if (value == null) {
+         unsetIsOptional();
+       } else {
 -        setIsOptional((Boolean)value);
++        setIsOptional((java.lang.Boolean)value);
+       }
+       break;
+ 
+     case DESCRIPTION:
+       if (value == null) {
+         unsetDescription();
+       } else {
 -        setDescription((String)value);
++        setDescription((java.lang.String)value);
+       }
+       break;
+ 
+     }
+   }
+ 
 -  public Object getFieldValue(_Fields field) {
++  public java.lang.Object getFieldValue(_Fields field) {
+     switch (field) {
+     case NAME:
+       return getName();
+ 
+     case TYPE:
+       return getType();
+ 
+     case IS_OPTIONAL:
+       return isIsOptional();
+ 
+     case DESCRIPTION:
+       return getDescription();
+ 
+     }
 -    throw new IllegalStateException();
++    throw new java.lang.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();
++      throw new java.lang.IllegalArgumentException();
+     }
+ 
+     switch (field) {
+     case NAME:
+       return isSetName();
+     case TYPE:
+       return isSetType();
+     case IS_OPTIONAL:
+       return isSetIsOptional();
+     case DESCRIPTION:
+       return isSetDescription();
+     }
 -    throw new IllegalStateException();
++    throw new java.lang.IllegalStateException();
+   }
+ 
+   @Override
 -  public boolean equals(Object that) {
++  public boolean equals(java.lang.Object that) {
+     if (that == null)
+       return false;
+     if (that instanceof SSHAccountProvisionerConfigParam)
+       return this.equals((SSHAccountProvisionerConfigParam)that);
+     return false;
+   }
+ 
+   public boolean equals(SSHAccountProvisionerConfigParam that) {
+     if (that == null)
+       return false;
++    if (this == that)
++      return true;
+ 
+     boolean this_present_name = true && this.isSetName();
+     boolean that_present_name = true && that.isSetName();
+     if (this_present_name || that_present_name) {
+       if (!(this_present_name && that_present_name))
+         return false;
+       if (!this.name.equals(that.name))
+         return false;
+     }
+ 
+     boolean this_present_type = true && this.isSetType();
+     boolean that_present_type = true && that.isSetType();
+     if (this_present_type || that_present_type) {
+       if (!(this_present_type && that_present_type))
+         return false;
+       if (!this.type.equals(that.type))
+         return false;
+     }
+ 
+     boolean this_present_isOptional = true;
+     boolean that_present_isOptional = true;
+     if (this_present_isOptional || that_present_isOptional) {
+       if (!(this_present_isOptional && that_present_isOptional))
+         return false;
+       if (this.isOptional != that.isOptional)
+         return false;
+     }
+ 
+     boolean this_present_description = true && this.isSetDescription();
+     boolean that_present_description = true && that.isSetDescription();
+     if (this_present_description || that_present_description) {
+       if (!(this_present_description && that_present_description))
+         return false;
+       if (!this.description.equals(that.description))
+         return false;
+     }
+ 
+     return true;
+   }
+ 
+   @Override
+   public int hashCode() {
 -    List<Object> list = new ArrayList<Object>();
++    int hashCode = 1;
+ 
 -    boolean present_name = true && (isSetName());
 -    list.add(present_name);
 -    if (present_name)
 -      list.add(name);
++    hashCode = hashCode * 8191 + ((isSetName()) ? 131071 : 524287);
++    if (isSetName())
++      hashCode = hashCode * 8191 + name.hashCode();
+ 
 -    boolean present_type = true && (isSetType());
 -    list.add(present_type);
 -    if (present_type)
 -      list.add(type.getValue());
++    hashCode = hashCode * 8191 + ((isSetType()) ? 131071 : 524287);
++    if (isSetType())
++      hashCode = hashCode * 8191 + type.getValue();
+ 
 -    boolean present_isOptional = true;
 -    list.add(present_isOptional);
 -    if (present_isOptional)
 -      list.add(isOptional);
++    hashCode = hashCode * 8191 + ((isOptional) ? 131071 : 524287);
+ 
 -    boolean present_description = true && (isSetDescription());
 -    list.add(present_description);
 -    if (present_description)
 -      list.add(description);
++    hashCode = hashCode * 8191 + ((isSetDescription()) ? 131071 : 524287);
++    if (isSetDescription())
++      hashCode = hashCode * 8191 + description.hashCode();
+ 
 -    return list.hashCode();
++    return hashCode;
+   }
+ 
+   @Override
+   public int compareTo(SSHAccountProvisionerConfigParam other) {
+     if (!getClass().equals(other.getClass())) {
+       return getClass().getName().compareTo(other.getClass().getName());
+     }
+ 
+     int lastComparison = 0;
+ 
 -    lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
++    lastComparison = java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+     if (lastComparison != 0) {
+       return lastComparison;
+     }
+     if (isSetName()) {
+       lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
+       if (lastComparison != 0) {
+         return lastComparison;
+       }
+     }
 -    lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType());
++    lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType());
+     if (lastComparison != 0) {
+       return lastComparison;
+     }
+     if (isSetType()) {
+       lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type);
+       if (lastComparison != 0) {
+         return lastComparison;
+       }
+     }
 -    lastComparison = Boolean.valueOf(isSetIsOptional()).compareTo(other.isSetIsOptional());
++    lastComparison = java.lang.Boolean.valueOf(isSetIsOptional()).compareTo(other.isSetIsOptional());
+     if (lastComparison != 0) {
+       return lastComparison;
+     }
+     if (isSetIsOptional()) {
+       lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isOptional, other.isOptional);
+       if (lastComparison != 0) {
+         return lastComparison;
+       }
+     }
 -    lastComparison = Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
++    lastComparison = java.lang.Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
+     if (lastComparison != 0) {
+       return lastComparison;
+     }
+     if (isSetDescription()) {
+       lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.description, other.description);
+       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);
++    scheme(iprot).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);
++    scheme(oprot).write(oprot, this);
+   }
+ 
+   @Override
 -  public String toString() {
 -    StringBuilder sb = new StringBuilder("SSHAccountProvisionerConfigParam(");
++  public java.lang.String toString() {
++    java.lang.StringBuilder sb = new java.lang.StringBuilder("SSHAccountProvisionerConfigParam(");
+     boolean first = true;
+ 
+     sb.append("name:");
+     if (this.name == null) {
+       sb.append("null");
+     } else {
+       sb.append(this.name);
+     }
+     first = false;
+     if (!first) sb.append(", ");
+     sb.append("type:");
+     if (this.type == null) {
+       sb.append("null");
+     } else {
+       sb.append(this.type);
+     }
+     first = false;
+     if (!first) sb.append(", ");
+     sb.append("isOptional:");
+     sb.append(this.isOptional);
+     first = false;
+     if (isSetDescription()) {
+       if (!first) sb.append(", ");
+       sb.append("description:");
+       if (this.description == null) {
+         sb.append("null");
+       } else {
+         sb.append(this.description);
+       }
+       first = false;
+     }
+     sb.append(")");
+     return sb.toString();
+   }
+ 
+   public void validate() throws org.apache.thrift.TException {
+     // check for required fields
+     if (!isSetName()) {
+       throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString());
+     }
+ 
+     if (!isSetType()) {
+       throw new org.apache.thrift.protocol.TProtocolException("Required field 'type' is unset! Struct:" + toString());
+     }
+ 
+     if (!isSetIsOptional()) {
+       throw new org.apache.thrift.protocol.TProtocolException("Required field 'isOptional' is unset! Struct:" + toString());
+     }
+ 
+     // 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 {
++  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
+     try {
+       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+       __isset_bitfield = 0;
+       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 SSHAccountProvisionerConfigParamStandardSchemeFactory implements SchemeFactory {
++  private static class SSHAccountProvisionerConfigParamStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+     public SSHAccountProvisionerConfigParamStandardScheme getScheme() {
+       return new SSHAccountProvisionerConfigParamStandardScheme();
+     }
+   }
+ 
 -  private static class SSHAccountProvisionerConfigParamStandardScheme extends StandardScheme<SSHAccountProvisionerConfigParam> {
++  private static class SSHAccountProvisionerConfigParamStandardScheme extends org.apache.thrift.scheme.StandardScheme<SSHAccountProvisionerConfigParam> {
+ 
+     public void read(org.apache.thrift.protocol.TProtocol iprot, SSHAccountProvisionerConfigParam 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: // NAME
+             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+               struct.name = iprot.readString();
+               struct.setNameIsSet(true);
+             } else { 
+               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+             }
+             break;
+           case 2: // TYPE
+             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+               struct.type = org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParamType.findByValue(iprot.readI32());
+               struct.setTypeIsSet(true);
+             } else { 
+               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+             }
+             break;
+           case 3: // IS_OPTIONAL
+             if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+               struct.isOptional = iprot.readBool();
+               struct.setIsOptionalIsSet(true);
+             } else { 
+               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+             }
+             break;
+           case 4: // DESCRIPTION
+             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+               struct.description = iprot.readString();
+               struct.setDescriptionIsSet(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();
+       struct.validate();
+     }
+ 
+     public void write(org.apache.thrift.protocol.TProtocol oprot, SSHAccountProvisionerConfigParam struct) throws org.apache.thrift.TException {
+       struct.validate();
+ 
+       oprot.writeStructBegin(STRUCT_DESC);
+       if (struct.name != null) {
+         oprot.writeFieldBegin(NAME_FIELD_DESC);
+         oprot.writeString(struct.name);
+         oprot.writeFieldEnd();
+       }
+       if (struct.type != null) {
+         oprot.writeFieldBegin(TYPE_FIELD_DESC);
+         oprot.writeI32(struct.type.getValue());
+         oprot.writeFieldEnd();
+       }
+       oprot.writeFieldBegin(IS_OPTIONAL_FIELD_DESC);
+       oprot.writeBool(struct.isOptional);
+       oprot.writeFieldEnd();
+       if (struct.description != null) {
+         if (struct.isSetDescription()) {
+           oprot.writeFieldBegin(DESCRIPTION_FIELD_DESC);
+           oprot.writeString(struct.description);
+           oprot.writeFieldEnd();
+         }
+       }
+       oprot.writeFieldStop();
+       oprot.writeStructEnd();
+     }
+ 
+   }
+ 
 -  private static class SSHAccountProvisionerConfigParamTupleSchemeFactory implements SchemeFactory {
++  private static class SSHAccountProvisionerConfigParamTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
+     public SSHAccountProvisionerConfigParamTupleScheme getScheme() {
+       return new SSHAccountProvisionerConfigParamTupleScheme();
+     }
+   }
+ 
 -  private static class SSHAccountProvisionerConfigParamTupleScheme extends TupleScheme<SSHAccountProvisionerConfigParam> {
++  private static class SSHAccountProvisionerConfigParamTupleScheme extends org.apache.thrift.scheme.TupleScheme<SSHAccountProvisionerConfigParam> {
+ 
+     @Override
+     public void write(org.apache.thrift.protocol.TProtocol prot, SSHAccountProvisionerConfigParam struct) throws org.apache.thrift.TException {
 -      TTupleProtocol oprot = (TTupleProtocol) prot;
++      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+       oprot.writeString(struct.name);
+       oprot.writeI32(struct.type.getValue());
+       oprot.writeBool(struct.isOptional);
 -      BitSet optionals = new BitSet();
++      java.util.BitSet optionals = new java.util.BitSet();
+       if (struct.isSetDescription()) {
+         optionals.set(0);
+       }
+       oprot.writeBitSet(optionals, 1);
+       if (struct.isSetDescription()) {
+         oprot.writeString(struct.description);
+       }
+     }
+ 
+     @Override
+     public void read(org.apache.thrift.protocol.TProtocol prot, SSHAccountProvisionerConfigParam struct) throws org.apache.thrift.TException {
 -      TTupleProtocol iprot = (TTupleProtocol) prot;
++      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+       struct.name = iprot.readString();
+       struct.setNameIsSet(true);
+       struct.type = org.apache.airavata.model.appcatalog.accountprovisioning.SSHAccountProvisionerConfigParamType.findByValue(iprot.readI32());
+       struct.setTypeIsSet(true);
+       struct.isOptional = iprot.readBool();
+       struct.setIsOptionalIsSet(true);
 -      BitSet incoming = iprot.readBitSet(1);
++      java.util.BitSet incoming = iprot.readBitSet(1);
+       if (incoming.get(0)) {
+         struct.description = iprot.readString();
+         struct.setDescriptionIsSet(true);
+       }
+     }
+   }
+ 
++  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
++    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
++  }
+ }
+ 

http://git-wip-us.apache.org/repos/asf/airavata/blob/ebdf8977/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/accountprovisioning/SSHAccountProvisionerConfigParamType.java
----------------------------------------------------------------------
diff --cc airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/accountprovisioning/SSHAccountProvisionerConfigParamType.java
index 0000000,a6bde9a..f1d1e5a
mode 000000,100644..100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/accountprovisioning/SSHAccountProvisionerConfigParamType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/accountprovisioning/SSHAccountProvisionerConfigParamType.java
@@@ -1,0 -1,62 +1,62 @@@
+ /**
+  * 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.
+  */
+ 
+ /**
 - * Autogenerated by Thrift Compiler (0.9.3)
++ * Autogenerated by Thrift Compiler (0.10.0)
+  *
+  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+  *  @generated
+  */
+ package org.apache.airavata.model.appcatalog.accountprovisioning;
+ 
+ 
+ import java.util.Map;
+ import java.util.HashMap;
+ import org.apache.thrift.TEnum;
+ 
+ public enum SSHAccountProvisionerConfigParamType implements org.apache.thrift.TEnum {
+   STRING(0),
+   CRED_STORE_PASSWORD_TOKEN(1);
+ 
+   private final int value;
+ 
+   private SSHAccountProvisionerConfigParamType(int value) {
+     this.value = value;
+   }
+ 
+   /**
+    * Get the integer value of this enum value, as defined in the Thrift IDL.
+    */
+   public int getValue() {
+     return value;
+   }
+ 
+   /**
+    * Find a the enum type by its integer value, as defined in the Thrift IDL.
+    * @return null if the value is not found.
+    */
+   public static SSHAccountProvisionerConfigParamType findByValue(int value) { 
+     switch (value) {
+       case 0:
+         return STRING;
+       case 1:
+         return CRED_STORE_PASSWORD_TOKEN;
+       default:
+         return null;
+     }
+   }
+ }


Mime
View raw message