You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/08/04 20:10:29 UTC
[12/51] [partial] airavata git commit: AIRAVATA-2505 Upgrade Airavata
to Thrift 0.10.0
http://git-wip-us.apache.org/repos/asf/airavata/blob/9d165bd8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CertificateCredential.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CertificateCredential.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CertificateCredential.java
index c1d959c..bd08eed 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CertificateCredential.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CertificateCredential.java
@@ -16,42 +16,15 @@
*/
/**
- * 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.credential.store;
-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 CertificateCredential implements org.apache.thrift.TBase<CertificateCredential, CertificateCredential._Fields>, java.io.Serializable, Cloneable, Comparable<CertificateCredential> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CertificateCredential");
@@ -64,20 +37,17 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
private static final org.apache.thrift.protocol.TField PERSISTED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("persistedTime", org.apache.thrift.protocol.TType.I64, (short)7);
private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)8);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new CertificateCredentialStandardSchemeFactory());
- schemes.put(TupleScheme.class, new CertificateCredentialTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new CertificateCredentialStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new CertificateCredentialTupleSchemeFactory();
private CommunityUser communityUser; // required
- private String x509Cert; // required
- private String notAfter; // optional
- private String privateKey; // optional
+ private java.lang.String x509Cert; // required
+ private java.lang.String notAfter; // optional
+ private java.lang.String privateKey; // optional
private long lifeTime; // optional
- private String notBefore; // optional
+ private java.lang.String notBefore; // optional
private long persistedTime; // optional
- private String token; // optional
+ private java.lang.String token; // 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 {
@@ -90,10 +60,10 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
PERSISTED_TIME((short)7, "persistedTime"),
TOKEN((short)8, "token");
- 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);
}
}
@@ -130,21 +100,21 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
*/
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;
}
@@ -153,7 +123,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -163,9 +133,9 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
private static final int __PERSISTEDTIME_ISSET_ID = 1;
private byte __isset_bitfield = 0;
private static final _Fields optionals[] = {_Fields.NOT_AFTER,_Fields.PRIVATE_KEY,_Fields.LIFE_TIME,_Fields.NOT_BEFORE,_Fields.PERSISTED_TIME,_Fields.TOKEN};
- 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.COMMUNITY_USER, new org.apache.thrift.meta_data.FieldMetaData("communityUser", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, CommunityUser.class)));
tmpMap.put(_Fields.X509_CERT, new org.apache.thrift.meta_data.FieldMetaData("x509Cert", org.apache.thrift.TFieldRequirementType.REQUIRED,
@@ -182,7 +152,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", 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(CertificateCredential.class, metaDataMap);
}
@@ -191,7 +161,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
public CertificateCredential(
CommunityUser communityUser,
- String x509Cert)
+ java.lang.String x509Cert)
{
this();
this.communityUser = communityUser;
@@ -266,11 +236,11 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
}
}
- public String getX509Cert() {
+ public java.lang.String getX509Cert() {
return this.x509Cert;
}
- public void setX509Cert(String x509Cert) {
+ public void setX509Cert(java.lang.String x509Cert) {
this.x509Cert = x509Cert;
}
@@ -289,11 +259,11 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
}
}
- public String getNotAfter() {
+ public java.lang.String getNotAfter() {
return this.notAfter;
}
- public void setNotAfter(String notAfter) {
+ public void setNotAfter(java.lang.String notAfter) {
this.notAfter = notAfter;
}
@@ -312,11 +282,11 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
}
}
- public String getPrivateKey() {
+ public java.lang.String getPrivateKey() {
return this.privateKey;
}
- public void setPrivateKey(String privateKey) {
+ public void setPrivateKey(java.lang.String privateKey) {
this.privateKey = privateKey;
}
@@ -345,23 +315,23 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
}
public void unsetLifeTime() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LIFETIME_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LIFETIME_ISSET_ID);
}
/** Returns true if field lifeTime is set (has been assigned a value) and false otherwise */
public boolean isSetLifeTime() {
- return EncodingUtils.testBit(__isset_bitfield, __LIFETIME_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LIFETIME_ISSET_ID);
}
public void setLifeTimeIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LIFETIME_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LIFETIME_ISSET_ID, value);
}
- public String getNotBefore() {
+ public java.lang.String getNotBefore() {
return this.notBefore;
}
- public void setNotBefore(String notBefore) {
+ public void setNotBefore(java.lang.String notBefore) {
this.notBefore = notBefore;
}
@@ -390,23 +360,23 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
}
public void unsetPersistedTime() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PERSISTEDTIME_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PERSISTEDTIME_ISSET_ID);
}
/** Returns true if field persistedTime is set (has been assigned a value) and false otherwise */
public boolean isSetPersistedTime() {
- return EncodingUtils.testBit(__isset_bitfield, __PERSISTEDTIME_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PERSISTEDTIME_ISSET_ID);
}
public void setPersistedTimeIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PERSISTEDTIME_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PERSISTEDTIME_ISSET_ID, value);
}
- public String getToken() {
+ public java.lang.String getToken() {
return this.token;
}
- public void setToken(String token) {
+ public void setToken(java.lang.String token) {
this.token = token;
}
@@ -425,7 +395,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case COMMUNITY_USER:
if (value == null) {
@@ -439,7 +409,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
if (value == null) {
unsetX509Cert();
} else {
- setX509Cert((String)value);
+ setX509Cert((java.lang.String)value);
}
break;
@@ -447,7 +417,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
if (value == null) {
unsetNotAfter();
} else {
- setNotAfter((String)value);
+ setNotAfter((java.lang.String)value);
}
break;
@@ -455,7 +425,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
if (value == null) {
unsetPrivateKey();
} else {
- setPrivateKey((String)value);
+ setPrivateKey((java.lang.String)value);
}
break;
@@ -463,7 +433,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
if (value == null) {
unsetLifeTime();
} else {
- setLifeTime((Long)value);
+ setLifeTime((java.lang.Long)value);
}
break;
@@ -471,7 +441,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
if (value == null) {
unsetNotBefore();
} else {
- setNotBefore((String)value);
+ setNotBefore((java.lang.String)value);
}
break;
@@ -479,7 +449,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
if (value == null) {
unsetPersistedTime();
} else {
- setPersistedTime((Long)value);
+ setPersistedTime((java.lang.Long)value);
}
break;
@@ -487,14 +457,14 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
if (value == null) {
unsetToken();
} else {
- setToken((String)value);
+ setToken((java.lang.String)value);
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case COMMUNITY_USER:
return getCommunityUser();
@@ -521,13 +491,13 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
return getToken();
}
- 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) {
@@ -548,11 +518,11 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
case TOKEN:
return isSetToken();
}
- 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 CertificateCredential)
@@ -563,6 +533,8 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
public boolean equals(CertificateCredential that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_communityUser = true && this.isSetCommunityUser();
boolean that_present_communityUser = true && that.isSetCommunityUser();
@@ -641,49 +613,41 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_communityUser = true && (isSetCommunityUser());
- list.add(present_communityUser);
- if (present_communityUser)
- list.add(communityUser);
+ hashCode = hashCode * 8191 + ((isSetCommunityUser()) ? 131071 : 524287);
+ if (isSetCommunityUser())
+ hashCode = hashCode * 8191 + communityUser.hashCode();
- boolean present_x509Cert = true && (isSetX509Cert());
- list.add(present_x509Cert);
- if (present_x509Cert)
- list.add(x509Cert);
+ hashCode = hashCode * 8191 + ((isSetX509Cert()) ? 131071 : 524287);
+ if (isSetX509Cert())
+ hashCode = hashCode * 8191 + x509Cert.hashCode();
- boolean present_notAfter = true && (isSetNotAfter());
- list.add(present_notAfter);
- if (present_notAfter)
- list.add(notAfter);
+ hashCode = hashCode * 8191 + ((isSetNotAfter()) ? 131071 : 524287);
+ if (isSetNotAfter())
+ hashCode = hashCode * 8191 + notAfter.hashCode();
- boolean present_privateKey = true && (isSetPrivateKey());
- list.add(present_privateKey);
- if (present_privateKey)
- list.add(privateKey);
+ hashCode = hashCode * 8191 + ((isSetPrivateKey()) ? 131071 : 524287);
+ if (isSetPrivateKey())
+ hashCode = hashCode * 8191 + privateKey.hashCode();
- boolean present_lifeTime = true && (isSetLifeTime());
- list.add(present_lifeTime);
- if (present_lifeTime)
- list.add(lifeTime);
+ hashCode = hashCode * 8191 + ((isSetLifeTime()) ? 131071 : 524287);
+ if (isSetLifeTime())
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(lifeTime);
- boolean present_notBefore = true && (isSetNotBefore());
- list.add(present_notBefore);
- if (present_notBefore)
- list.add(notBefore);
+ hashCode = hashCode * 8191 + ((isSetNotBefore()) ? 131071 : 524287);
+ if (isSetNotBefore())
+ hashCode = hashCode * 8191 + notBefore.hashCode();
- boolean present_persistedTime = true && (isSetPersistedTime());
- list.add(present_persistedTime);
- if (present_persistedTime)
- list.add(persistedTime);
+ hashCode = hashCode * 8191 + ((isSetPersistedTime()) ? 131071 : 524287);
+ if (isSetPersistedTime())
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(persistedTime);
- boolean present_token = true && (isSetToken());
- list.add(present_token);
- if (present_token)
- list.add(token);
+ hashCode = hashCode * 8191 + ((isSetToken()) ? 131071 : 524287);
+ if (isSetToken())
+ hashCode = hashCode * 8191 + token.hashCode();
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -694,7 +658,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetCommunityUser()).compareTo(other.isSetCommunityUser());
+ lastComparison = java.lang.Boolean.valueOf(isSetCommunityUser()).compareTo(other.isSetCommunityUser());
if (lastComparison != 0) {
return lastComparison;
}
@@ -704,7 +668,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetX509Cert()).compareTo(other.isSetX509Cert());
+ lastComparison = java.lang.Boolean.valueOf(isSetX509Cert()).compareTo(other.isSetX509Cert());
if (lastComparison != 0) {
return lastComparison;
}
@@ -714,7 +678,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetNotAfter()).compareTo(other.isSetNotAfter());
+ lastComparison = java.lang.Boolean.valueOf(isSetNotAfter()).compareTo(other.isSetNotAfter());
if (lastComparison != 0) {
return lastComparison;
}
@@ -724,7 +688,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetPrivateKey()).compareTo(other.isSetPrivateKey());
+ lastComparison = java.lang.Boolean.valueOf(isSetPrivateKey()).compareTo(other.isSetPrivateKey());
if (lastComparison != 0) {
return lastComparison;
}
@@ -734,7 +698,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetLifeTime()).compareTo(other.isSetLifeTime());
+ lastComparison = java.lang.Boolean.valueOf(isSetLifeTime()).compareTo(other.isSetLifeTime());
if (lastComparison != 0) {
return lastComparison;
}
@@ -744,7 +708,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetNotBefore()).compareTo(other.isSetNotBefore());
+ lastComparison = java.lang.Boolean.valueOf(isSetNotBefore()).compareTo(other.isSetNotBefore());
if (lastComparison != 0) {
return lastComparison;
}
@@ -754,7 +718,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetPersistedTime()).compareTo(other.isSetPersistedTime());
+ lastComparison = java.lang.Boolean.valueOf(isSetPersistedTime()).compareTo(other.isSetPersistedTime());
if (lastComparison != 0) {
return lastComparison;
}
@@ -764,7 +728,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken());
+ lastComparison = java.lang.Boolean.valueOf(isSetToken()).compareTo(other.isSetToken());
if (lastComparison != 0) {
return lastComparison;
}
@@ -782,16 +746,16 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
}
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("CertificateCredential(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("CertificateCredential(");
boolean first = true;
sb.append("communityUser:");
@@ -889,7 +853,7 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
}
}
- 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;
@@ -899,13 +863,13 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
}
}
- private static class CertificateCredentialStandardSchemeFactory implements SchemeFactory {
+ private static class CertificateCredentialStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public CertificateCredentialStandardScheme getScheme() {
return new CertificateCredentialStandardScheme();
}
}
- private static class CertificateCredentialStandardScheme extends StandardScheme<CertificateCredential> {
+ private static class CertificateCredentialStandardScheme extends org.apache.thrift.scheme.StandardScheme<CertificateCredential> {
public void read(org.apache.thrift.protocol.TProtocol iprot, CertificateCredential struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -1049,20 +1013,20 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
}
- private static class CertificateCredentialTupleSchemeFactory implements SchemeFactory {
+ private static class CertificateCredentialTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public CertificateCredentialTupleScheme getScheme() {
return new CertificateCredentialTupleScheme();
}
}
- private static class CertificateCredentialTupleScheme extends TupleScheme<CertificateCredential> {
+ private static class CertificateCredentialTupleScheme extends org.apache.thrift.scheme.TupleScheme<CertificateCredential> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, CertificateCredential struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
struct.communityUser.write(oprot);
oprot.writeString(struct.x509Cert);
- BitSet optionals = new BitSet();
+ java.util.BitSet optionals = new java.util.BitSet();
if (struct.isSetNotAfter()) {
optionals.set(0);
}
@@ -1104,13 +1068,13 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, CertificateCredential struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
struct.communityUser = new CommunityUser();
struct.communityUser.read(iprot);
struct.setCommunityUserIsSet(true);
struct.x509Cert = iprot.readString();
struct.setX509CertIsSet(true);
- BitSet incoming = iprot.readBitSet(6);
+ java.util.BitSet incoming = iprot.readBitSet(6);
if (incoming.get(0)) {
struct.notAfter = iprot.readString();
struct.setNotAfterIsSet(true);
@@ -1138,5 +1102,8 @@ public class CertificateCredential implements org.apache.thrift.TBase<Certificat
}
}
+ 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/9d165bd8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CommunityUser.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CommunityUser.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CommunityUser.java
index 199fee6..333cd11 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CommunityUser.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CommunityUser.java
@@ -16,42 +16,15 @@
*/
/**
- * 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.credential.store;
-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 CommunityUser implements org.apache.thrift.TBase<CommunityUser, CommunityUser._Fields>, java.io.Serializable, Cloneable, Comparable<CommunityUser> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommunityUser");
@@ -59,15 +32,12 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
private static final org.apache.thrift.protocol.TField USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("username", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField USER_EMAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("userEmail", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new CommunityUserStandardSchemeFactory());
- schemes.put(TupleScheme.class, new CommunityUserTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new CommunityUserStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new CommunityUserTupleSchemeFactory();
- private String gatewayName; // required
- private String username; // required
- private String userEmail; // required
+ private java.lang.String gatewayName; // required
+ private java.lang.String username; // required
+ private java.lang.String userEmail; // 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 {
@@ -75,10 +45,10 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
USERNAME((short)2, "username"),
USER_EMAIL((short)3, "userEmail");
- 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);
}
}
@@ -105,21 +75,21 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
*/
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;
}
@@ -128,22 +98,22 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
// isset id assignments
- 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.GATEWAY_NAME, new org.apache.thrift.meta_data.FieldMetaData("gatewayName", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.USERNAME, new org.apache.thrift.meta_data.FieldMetaData("username", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.USER_EMAIL, new org.apache.thrift.meta_data.FieldMetaData("userEmail", org.apache.thrift.TFieldRequirementType.REQUIRED,
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(CommunityUser.class, metaDataMap);
}
@@ -151,9 +121,9 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
}
public CommunityUser(
- String gatewayName,
- String username,
- String userEmail)
+ java.lang.String gatewayName,
+ java.lang.String username,
+ java.lang.String userEmail)
{
this();
this.gatewayName = gatewayName;
@@ -187,11 +157,11 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
this.userEmail = null;
}
- public String getGatewayName() {
+ public java.lang.String getGatewayName() {
return this.gatewayName;
}
- public void setGatewayName(String gatewayName) {
+ public void setGatewayName(java.lang.String gatewayName) {
this.gatewayName = gatewayName;
}
@@ -210,11 +180,11 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
}
}
- public String getUsername() {
+ public java.lang.String getUsername() {
return this.username;
}
- public void setUsername(String username) {
+ public void setUsername(java.lang.String username) {
this.username = username;
}
@@ -233,11 +203,11 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
}
}
- public String getUserEmail() {
+ public java.lang.String getUserEmail() {
return this.userEmail;
}
- public void setUserEmail(String userEmail) {
+ public void setUserEmail(java.lang.String userEmail) {
this.userEmail = userEmail;
}
@@ -256,13 +226,13 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case GATEWAY_NAME:
if (value == null) {
unsetGatewayName();
} else {
- setGatewayName((String)value);
+ setGatewayName((java.lang.String)value);
}
break;
@@ -270,7 +240,7 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
if (value == null) {
unsetUsername();
} else {
- setUsername((String)value);
+ setUsername((java.lang.String)value);
}
break;
@@ -278,14 +248,14 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
if (value == null) {
unsetUserEmail();
} else {
- setUserEmail((String)value);
+ setUserEmail((java.lang.String)value);
}
break;
}
}
- public Object getFieldValue(_Fields field) {
+ public java.lang.Object getFieldValue(_Fields field) {
switch (field) {
case GATEWAY_NAME:
return getGatewayName();
@@ -297,13 +267,13 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
return getUserEmail();
}
- 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) {
@@ -314,11 +284,11 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
case USER_EMAIL:
return isSetUserEmail();
}
- 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 CommunityUser)
@@ -329,6 +299,8 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
public boolean equals(CommunityUser that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_gatewayName = true && this.isSetGatewayName();
boolean that_present_gatewayName = true && that.isSetGatewayName();
@@ -362,24 +334,21 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
+ int hashCode = 1;
- boolean present_gatewayName = true && (isSetGatewayName());
- list.add(present_gatewayName);
- if (present_gatewayName)
- list.add(gatewayName);
+ hashCode = hashCode * 8191 + ((isSetGatewayName()) ? 131071 : 524287);
+ if (isSetGatewayName())
+ hashCode = hashCode * 8191 + gatewayName.hashCode();
- boolean present_username = true && (isSetUsername());
- list.add(present_username);
- if (present_username)
- list.add(username);
+ hashCode = hashCode * 8191 + ((isSetUsername()) ? 131071 : 524287);
+ if (isSetUsername())
+ hashCode = hashCode * 8191 + username.hashCode();
- boolean present_userEmail = true && (isSetUserEmail());
- list.add(present_userEmail);
- if (present_userEmail)
- list.add(userEmail);
+ hashCode = hashCode * 8191 + ((isSetUserEmail()) ? 131071 : 524287);
+ if (isSetUserEmail())
+ hashCode = hashCode * 8191 + userEmail.hashCode();
- return list.hashCode();
+ return hashCode;
}
@Override
@@ -390,7 +359,7 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetGatewayName()).compareTo(other.isSetGatewayName());
+ lastComparison = java.lang.Boolean.valueOf(isSetGatewayName()).compareTo(other.isSetGatewayName());
if (lastComparison != 0) {
return lastComparison;
}
@@ -400,7 +369,7 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetUsername()).compareTo(other.isSetUsername());
+ lastComparison = java.lang.Boolean.valueOf(isSetUsername()).compareTo(other.isSetUsername());
if (lastComparison != 0) {
return lastComparison;
}
@@ -410,7 +379,7 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetUserEmail()).compareTo(other.isSetUserEmail());
+ lastComparison = java.lang.Boolean.valueOf(isSetUserEmail()).compareTo(other.isSetUserEmail());
if (lastComparison != 0) {
return lastComparison;
}
@@ -428,16 +397,16 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
}
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("CommunityUser(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("CommunityUser(");
boolean first = true;
sb.append("gatewayName:");
@@ -492,7 +461,7 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
}
}
- 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 {
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
@@ -500,13 +469,13 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
}
}
- private static class CommunityUserStandardSchemeFactory implements SchemeFactory {
+ private static class CommunityUserStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public CommunityUserStandardScheme getScheme() {
return new CommunityUserStandardScheme();
}
}
- private static class CommunityUserStandardScheme extends StandardScheme<CommunityUser> {
+ private static class CommunityUserStandardScheme extends org.apache.thrift.scheme.StandardScheme<CommunityUser> {
public void read(org.apache.thrift.protocol.TProtocol iprot, CommunityUser struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -576,17 +545,17 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
}
- private static class CommunityUserTupleSchemeFactory implements SchemeFactory {
+ private static class CommunityUserTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public CommunityUserTupleScheme getScheme() {
return new CommunityUserTupleScheme();
}
}
- private static class CommunityUserTupleScheme extends TupleScheme<CommunityUser> {
+ private static class CommunityUserTupleScheme extends org.apache.thrift.scheme.TupleScheme<CommunityUser> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, CommunityUser 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.gatewayName);
oprot.writeString(struct.username);
oprot.writeString(struct.userEmail);
@@ -594,7 +563,7 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, CommunityUser struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
struct.gatewayName = iprot.readString();
struct.setGatewayNameIsSet(true);
struct.username = iprot.readString();
@@ -604,5 +573,8 @@ public class CommunityUser implements org.apache.thrift.TBase<CommunityUser, Com
}
}
+ 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/9d165bd8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CredentialOwnerType.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CredentialOwnerType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CredentialOwnerType.java
index 01b3c90..70f846e 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CredentialOwnerType.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CredentialOwnerType.java
@@ -16,7 +16,7 @@
*/
/**
- * 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
http://git-wip-us.apache.org/repos/asf/airavata/blob/9d165bd8/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CredentialSummary.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CredentialSummary.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CredentialSummary.java
index c31a1b1..9c65c15 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CredentialSummary.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/credential/store/CredentialSummary.java
@@ -16,42 +16,15 @@
*/
/**
- * 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.credential.store;
-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 CredentialSummary implements org.apache.thrift.TBase<CredentialSummary, CredentialSummary._Fields>, java.io.Serializable, Cloneable, Comparable<CredentialSummary> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CredentialSummary");
@@ -63,19 +36,16 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)6);
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)7);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new CredentialSummaryStandardSchemeFactory());
- schemes.put(TupleScheme.class, new CredentialSummaryTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new CredentialSummaryStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new CredentialSummaryTupleSchemeFactory();
private SummaryType type; // required
- private String gatewayId; // required
- private String username; // required
- private String publicKey; // optional
+ private java.lang.String gatewayId; // required
+ private java.lang.String username; // required
+ private java.lang.String publicKey; // optional
private long persistedTime; // optional
- private String token; // required
- private String description; // optional
+ private java.lang.String token; // required
+ 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 {
@@ -91,10 +61,10 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
TOKEN((short)6, "token"),
DESCRIPTION((short)7, "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);
}
}
@@ -129,21 +99,21 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
*/
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;
}
@@ -152,7 +122,7 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
return _thriftId;
}
- public String getFieldName() {
+ public java.lang.String getFieldName() {
return _fieldName;
}
}
@@ -161,9 +131,9 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
private static final int __PERSISTEDTIME_ISSET_ID = 0;
private byte __isset_bitfield = 0;
private static final _Fields optionals[] = {_Fields.PUBLIC_KEY,_Fields.PERSISTED_TIME,_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.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, SummaryType.class)));
tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", org.apache.thrift.TFieldRequirementType.REQUIRED,
@@ -178,7 +148,7 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
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(CredentialSummary.class, metaDataMap);
}
@@ -187,9 +157,9 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
public CredentialSummary(
SummaryType type,
- String gatewayId,
- String username,
- String token)
+ java.lang.String gatewayId,
+ java.lang.String username,
+ java.lang.String token)
{
this();
this.type = type;
@@ -271,11 +241,11 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
}
}
- public String getGatewayId() {
+ public java.lang.String getGatewayId() {
return this.gatewayId;
}
- public void setGatewayId(String gatewayId) {
+ public void setGatewayId(java.lang.String gatewayId) {
this.gatewayId = gatewayId;
}
@@ -294,11 +264,11 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
}
}
- public String getUsername() {
+ public java.lang.String getUsername() {
return this.username;
}
- public void setUsername(String username) {
+ public void setUsername(java.lang.String username) {
this.username = username;
}
@@ -317,11 +287,11 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
}
}
- public String getPublicKey() {
+ public java.lang.String getPublicKey() {
return this.publicKey;
}
- public void setPublicKey(String publicKey) {
+ public void setPublicKey(java.lang.String publicKey) {
this.publicKey = publicKey;
}
@@ -350,23 +320,23 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
}
public void unsetPersistedTime() {
- __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PERSISTEDTIME_ISSET_ID);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PERSISTEDTIME_ISSET_ID);
}
/** Returns true if field persistedTime is set (has been assigned a value) and false otherwise */
public boolean isSetPersistedTime() {
- return EncodingUtils.testBit(__isset_bitfield, __PERSISTEDTIME_ISSET_ID);
+ return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PERSISTEDTIME_ISSET_ID);
}
public void setPersistedTimeIsSet(boolean value) {
- __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PERSISTEDTIME_ISSET_ID, value);
+ __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PERSISTEDTIME_ISSET_ID, value);
}
- public String getToken() {
+ public java.lang.String getToken() {
return this.token;
}
- public void setToken(String token) {
+ public void setToken(java.lang.String token) {
this.token = token;
}
@@ -385,11 +355,11 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
}
}
- 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;
}
@@ -408,7 +378,7 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
}
}
- public void setFieldValue(_Fields field, Object value) {
+ public void setFieldValue(_Fields field, java.lang.Object value) {
switch (field) {
case TYPE:
if (value == null) {
@@ -422,7 +392,7 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
if (value == null) {
unsetGatewayId();
} else {
- setGatewayId((String)value);
+ setGatewayId((java.lang.String)value);
}
break;
@@ -430,7 +400,7 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
if (value == null) {
unsetUsername();
} else {
- setUsername((String)value);
+ setUsername((java.lang.String)value);
}
break;
@@ -438,7 +408,7 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
if (value == null) {
unsetPublicKey();
} else {
- setPublicKey((String)value);
+ setPublicKey((java.lang.String)value);
}
break;
@@ -446,7 +416,7 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
if (value == null) {
unsetPersistedTime();
} else {
- setPersistedTime((Long)value);
+ setPersistedTime((java.lang.Long)value);
}
break;
@@ -454,7 +424,7 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
if (value == null) {
unsetToken();
} else {
- setToken((String)value);
+ setToken((java.lang.String)value);
}
break;
@@ -462,14 +432,14 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
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 TYPE:
return getType();
@@ -493,13 +463,13 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
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) {
@@ -518,11 +488,11 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
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 CredentialSummary)
@@ -533,6 +503,8 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
public boolean equals(CredentialSummary that) {
if (that == null)
return false;
+ if (this == that)
+ return true;
boolean this_present_type = true && this.isSetType();
boolean that_present_type = true && that.isSetType();
@@ -602,44 +574,37 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
@Override
public int hashCode() {
- List<Object> list = new ArrayList<Object>();
-
- boolean present_type = true && (isSetType());
- list.add(present_type);
- if (present_type)
- list.add(type.getValue());
-
- boolean present_gatewayId = true && (isSetGatewayId());
- list.add(present_gatewayId);
- if (present_gatewayId)
- list.add(gatewayId);
-
- boolean present_username = true && (isSetUsername());
- list.add(present_username);
- if (present_username)
- list.add(username);
-
- boolean present_publicKey = true && (isSetPublicKey());
- list.add(present_publicKey);
- if (present_publicKey)
- list.add(publicKey);
-
- boolean present_persistedTime = true && (isSetPersistedTime());
- list.add(present_persistedTime);
- if (present_persistedTime)
- list.add(persistedTime);
-
- boolean present_token = true && (isSetToken());
- list.add(present_token);
- if (present_token)
- list.add(token);
-
- boolean present_description = true && (isSetDescription());
- list.add(present_description);
- if (present_description)
- list.add(description);
-
- return list.hashCode();
+ int hashCode = 1;
+
+ hashCode = hashCode * 8191 + ((isSetType()) ? 131071 : 524287);
+ if (isSetType())
+ hashCode = hashCode * 8191 + type.getValue();
+
+ hashCode = hashCode * 8191 + ((isSetGatewayId()) ? 131071 : 524287);
+ if (isSetGatewayId())
+ hashCode = hashCode * 8191 + gatewayId.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetUsername()) ? 131071 : 524287);
+ if (isSetUsername())
+ hashCode = hashCode * 8191 + username.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetPublicKey()) ? 131071 : 524287);
+ if (isSetPublicKey())
+ hashCode = hashCode * 8191 + publicKey.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetPersistedTime()) ? 131071 : 524287);
+ if (isSetPersistedTime())
+ hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(persistedTime);
+
+ hashCode = hashCode * 8191 + ((isSetToken()) ? 131071 : 524287);
+ if (isSetToken())
+ hashCode = hashCode * 8191 + token.hashCode();
+
+ hashCode = hashCode * 8191 + ((isSetDescription()) ? 131071 : 524287);
+ if (isSetDescription())
+ hashCode = hashCode * 8191 + description.hashCode();
+
+ return hashCode;
}
@Override
@@ -650,7 +615,7 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
int lastComparison = 0;
- lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType());
+ lastComparison = java.lang.Boolean.valueOf(isSetType()).compareTo(other.isSetType());
if (lastComparison != 0) {
return lastComparison;
}
@@ -660,7 +625,7 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
+ lastComparison = java.lang.Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId());
if (lastComparison != 0) {
return lastComparison;
}
@@ -670,7 +635,7 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetUsername()).compareTo(other.isSetUsername());
+ lastComparison = java.lang.Boolean.valueOf(isSetUsername()).compareTo(other.isSetUsername());
if (lastComparison != 0) {
return lastComparison;
}
@@ -680,7 +645,7 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetPublicKey()).compareTo(other.isSetPublicKey());
+ lastComparison = java.lang.Boolean.valueOf(isSetPublicKey()).compareTo(other.isSetPublicKey());
if (lastComparison != 0) {
return lastComparison;
}
@@ -690,7 +655,7 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetPersistedTime()).compareTo(other.isSetPersistedTime());
+ lastComparison = java.lang.Boolean.valueOf(isSetPersistedTime()).compareTo(other.isSetPersistedTime());
if (lastComparison != 0) {
return lastComparison;
}
@@ -700,7 +665,7 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken());
+ lastComparison = java.lang.Boolean.valueOf(isSetToken()).compareTo(other.isSetToken());
if (lastComparison != 0) {
return lastComparison;
}
@@ -710,7 +675,7 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
return lastComparison;
}
}
- lastComparison = Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
+ lastComparison = java.lang.Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
if (lastComparison != 0) {
return lastComparison;
}
@@ -728,16 +693,16 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
}
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("CredentialSummary(");
+ public java.lang.String toString() {
+ java.lang.StringBuilder sb = new java.lang.StringBuilder("CredentialSummary(");
boolean first = true;
sb.append("type:");
@@ -830,7 +795,7 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
}
}
- 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;
@@ -840,13 +805,13 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
}
}
- private static class CredentialSummaryStandardSchemeFactory implements SchemeFactory {
+ private static class CredentialSummaryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public CredentialSummaryStandardScheme getScheme() {
return new CredentialSummaryStandardScheme();
}
}
- private static class CredentialSummaryStandardScheme extends StandardScheme<CredentialSummary> {
+ private static class CredentialSummaryStandardScheme extends org.apache.thrift.scheme.StandardScheme<CredentialSummary> {
public void read(org.apache.thrift.protocol.TProtocol iprot, CredentialSummary struct) throws org.apache.thrift.TException {
org.apache.thrift.protocol.TField schemeField;
@@ -972,22 +937,22 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
}
- private static class CredentialSummaryTupleSchemeFactory implements SchemeFactory {
+ private static class CredentialSummaryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
public CredentialSummaryTupleScheme getScheme() {
return new CredentialSummaryTupleScheme();
}
}
- private static class CredentialSummaryTupleScheme extends TupleScheme<CredentialSummary> {
+ private static class CredentialSummaryTupleScheme extends org.apache.thrift.scheme.TupleScheme<CredentialSummary> {
@Override
public void write(org.apache.thrift.protocol.TProtocol prot, CredentialSummary struct) throws org.apache.thrift.TException {
- TTupleProtocol oprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
oprot.writeI32(struct.type.getValue());
oprot.writeString(struct.gatewayId);
oprot.writeString(struct.username);
oprot.writeString(struct.token);
- BitSet optionals = new BitSet();
+ java.util.BitSet optionals = new java.util.BitSet();
if (struct.isSetPublicKey()) {
optionals.set(0);
}
@@ -1011,7 +976,7 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, CredentialSummary struct) throws org.apache.thrift.TException {
- TTupleProtocol iprot = (TTupleProtocol) prot;
+ org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
struct.type = org.apache.airavata.model.credential.store.SummaryType.findByValue(iprot.readI32());
struct.setTypeIsSet(true);
struct.gatewayId = iprot.readString();
@@ -1020,7 +985,7 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
struct.setUsernameIsSet(true);
struct.token = iprot.readString();
struct.setTokenIsSet(true);
- BitSet incoming = iprot.readBitSet(3);
+ java.util.BitSet incoming = iprot.readBitSet(3);
if (incoming.get(0)) {
struct.publicKey = iprot.readString();
struct.setPublicKeyIsSet(true);
@@ -1036,5 +1001,8 @@ public class CredentialSummary implements org.apache.thrift.TBase<CredentialSumm
}
}
+ 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();
+ }
}