Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5E568200B9D for ; Thu, 13 Oct 2016 20:32:59 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5D1FB160AD2; Thu, 13 Oct 2016 18:32:59 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 71C81160AE4 for ; Thu, 13 Oct 2016 20:32:57 +0200 (CEST) Received: (qmail 79457 invoked by uid 500); 13 Oct 2016 18:32:56 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 78632 invoked by uid 99); 13 Oct 2016 18:32:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Oct 2016 18:32:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 35BA6ED315; Thu, 13 Oct 2016 18:32:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Date: Thu, 13 Oct 2016 18:33:02 -0000 Message-Id: In-Reply-To: <8b25408717724aa7a23711c9fb6ae582@git.apache.org> References: <8b25408717724aa7a23711c9fb6ae582@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/30] airavata git commit: Implementing API level changes archived-at: Thu, 13 Oct 2016 18:32:59 -0000 http://git-wip-us.apache.org/repos/asf/airavata/blob/b6548366/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/credentialsummary/CredentialSummary.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/credentialsummary/CredentialSummary.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/credentialsummary/CredentialSummary.java new file mode 100644 index 0000000..5f3fc82 --- /dev/null +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/credentialsummary/CredentialSummary.java @@ -0,0 +1,826 @@ +/** + * 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) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +package org.apache.airavata.model.appcatalog.credentialsummary; + +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)") +public class CredentialSummary implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { + private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CredentialSummary"); + + private static final org.apache.thrift.protocol.TField GATEWAY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("gatewayId", org.apache.thrift.protocol.TType.STRING, (short)1); + 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 PUBLIC_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("publicKey", org.apache.thrift.protocol.TType.STRING, (short)3); + 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)4); + 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)5); + + private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); + static { + schemes.put(StandardScheme.class, new CredentialSummaryStandardSchemeFactory()); + schemes.put(TupleScheme.class, new CredentialSummaryTupleSchemeFactory()); + } + + private String gatewayId; // required + private String username; // required + private String publicKey; // optional + private long persistedTime; // optional + private 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 { + GATEWAY_ID((short)1, "gatewayId"), + USERNAME((short)2, "username"), + PUBLIC_KEY((short)3, "publicKey"), + PERSISTED_TIME((short)4, "persistedTime"), + DESCRIPTION((short)5, "description"); + + private static final Map byName = new HashMap(); + + static { + for (_Fields field : EnumSet.allOf(_Fields.class)) { + byName.put(field.getFieldName(), field); + } + } + + /** + * Find the _Fields constant that matches fieldId, or null if its not found. + */ + public static _Fields findByThriftId(int fieldId) { + switch(fieldId) { + case 1: // GATEWAY_ID + return GATEWAY_ID; + case 2: // USERNAME + return USERNAME; + case 3: // PUBLIC_KEY + return PUBLIC_KEY; + case 4: // PERSISTED_TIME + return PERSISTED_TIME; + case 5: // 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!"); + return fields; + } + + /** + * Find the _Fields constant that matches name, or null if its not found. + */ + public static _Fields findByName(String name) { + return byName.get(name); + } + + private final short _thriftId; + private final String _fieldName; + + _Fields(short thriftId, String fieldName) { + _thriftId = thriftId; + _fieldName = fieldName; + } + + public short getThriftFieldId() { + return _thriftId; + } + + public String getFieldName() { + return _fieldName; + } + } + + // isset id assignments + private static final int __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; + static { + Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); + tmpMap.put(_Fields.GATEWAY_ID, new org.apache.thrift.meta_data.FieldMetaData("gatewayId", 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.PUBLIC_KEY, new org.apache.thrift.meta_data.FieldMetaData("publicKey", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.PERSISTED_TIME, new org.apache.thrift.meta_data.FieldMetaData("persistedTime", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + 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); + org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CredentialSummary.class, metaDataMap); + } + + public CredentialSummary() { + } + + public CredentialSummary( + String gatewayId, + String username) + { + this(); + this.gatewayId = gatewayId; + this.username = username; + } + + /** + * Performs a deep copy on other. + */ + public CredentialSummary(CredentialSummary other) { + __isset_bitfield = other.__isset_bitfield; + if (other.isSetGatewayId()) { + this.gatewayId = other.gatewayId; + } + if (other.isSetUsername()) { + this.username = other.username; + } + if (other.isSetPublicKey()) { + this.publicKey = other.publicKey; + } + this.persistedTime = other.persistedTime; + if (other.isSetDescription()) { + this.description = other.description; + } + } + + public CredentialSummary deepCopy() { + return new CredentialSummary(this); + } + + @Override + public void clear() { + this.gatewayId = null; + this.username = null; + this.publicKey = null; + setPersistedTimeIsSet(false); + this.persistedTime = 0; + this.description = null; + } + + public String getGatewayId() { + return this.gatewayId; + } + + public void setGatewayId(String gatewayId) { + this.gatewayId = gatewayId; + } + + public void unsetGatewayId() { + this.gatewayId = null; + } + + /** Returns true if field gatewayId is set (has been assigned a value) and false otherwise */ + public boolean isSetGatewayId() { + return this.gatewayId != null; + } + + public void setGatewayIdIsSet(boolean value) { + if (!value) { + this.gatewayId = null; + } + } + + public String getUsername() { + return this.username; + } + + public void setUsername(String username) { + this.username = username; + } + + public void unsetUsername() { + this.username = null; + } + + /** Returns true if field username is set (has been assigned a value) and false otherwise */ + public boolean isSetUsername() { + return this.username != null; + } + + public void setUsernameIsSet(boolean value) { + if (!value) { + this.username = null; + } + } + + public String getPublicKey() { + return this.publicKey; + } + + public void setPublicKey(String publicKey) { + this.publicKey = publicKey; + } + + public void unsetPublicKey() { + this.publicKey = null; + } + + /** Returns true if field publicKey is set (has been assigned a value) and false otherwise */ + public boolean isSetPublicKey() { + return this.publicKey != null; + } + + public void setPublicKeyIsSet(boolean value) { + if (!value) { + this.publicKey = null; + } + } + + public long getPersistedTime() { + return this.persistedTime; + } + + public void setPersistedTime(long persistedTime) { + this.persistedTime = persistedTime; + setPersistedTimeIsSet(true); + } + + public void unsetPersistedTime() { + __isset_bitfield = 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); + } + + public void setPersistedTimeIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PERSISTEDTIME_ISSET_ID, value); + } + + public String getDescription() { + return this.description; + } + + public void setDescription(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) { + switch (field) { + case GATEWAY_ID: + if (value == null) { + unsetGatewayId(); + } else { + setGatewayId((String)value); + } + break; + + case USERNAME: + if (value == null) { + unsetUsername(); + } else { + setUsername((String)value); + } + break; + + case PUBLIC_KEY: + if (value == null) { + unsetPublicKey(); + } else { + setPublicKey((String)value); + } + break; + + case PERSISTED_TIME: + if (value == null) { + unsetPersistedTime(); + } else { + setPersistedTime((Long)value); + } + break; + + case DESCRIPTION: + if (value == null) { + unsetDescription(); + } else { + setDescription((String)value); + } + break; + + } + } + + public Object getFieldValue(_Fields field) { + switch (field) { + case GATEWAY_ID: + return getGatewayId(); + + case USERNAME: + return getUsername(); + + case PUBLIC_KEY: + return getPublicKey(); + + case PERSISTED_TIME: + return getPersistedTime(); + + case DESCRIPTION: + return getDescription(); + + } + throw new IllegalStateException(); + } + + /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ + public boolean isSet(_Fields field) { + if (field == null) { + throw new IllegalArgumentException(); + } + + switch (field) { + case GATEWAY_ID: + return isSetGatewayId(); + case USERNAME: + return isSetUsername(); + case PUBLIC_KEY: + return isSetPublicKey(); + case PERSISTED_TIME: + return isSetPersistedTime(); + case DESCRIPTION: + return isSetDescription(); + } + throw new IllegalStateException(); + } + + @Override + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof CredentialSummary) + return this.equals((CredentialSummary)that); + return false; + } + + public boolean equals(CredentialSummary that) { + if (that == null) + return false; + + boolean this_present_gatewayId = true && this.isSetGatewayId(); + boolean that_present_gatewayId = true && that.isSetGatewayId(); + if (this_present_gatewayId || that_present_gatewayId) { + if (!(this_present_gatewayId && that_present_gatewayId)) + return false; + if (!this.gatewayId.equals(that.gatewayId)) + return false; + } + + boolean this_present_username = true && this.isSetUsername(); + boolean that_present_username = true && that.isSetUsername(); + if (this_present_username || that_present_username) { + if (!(this_present_username && that_present_username)) + return false; + if (!this.username.equals(that.username)) + return false; + } + + boolean this_present_publicKey = true && this.isSetPublicKey(); + boolean that_present_publicKey = true && that.isSetPublicKey(); + if (this_present_publicKey || that_present_publicKey) { + if (!(this_present_publicKey && that_present_publicKey)) + return false; + if (!this.publicKey.equals(that.publicKey)) + return false; + } + + boolean this_present_persistedTime = true && this.isSetPersistedTime(); + boolean that_present_persistedTime = true && that.isSetPersistedTime(); + if (this_present_persistedTime || that_present_persistedTime) { + if (!(this_present_persistedTime && that_present_persistedTime)) + return false; + if (this.persistedTime != that.persistedTime) + 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 list = new ArrayList(); + + 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_description = true && (isSetDescription()); + list.add(present_description); + if (present_description) + list.add(description); + + return list.hashCode(); + } + + @Override + public int compareTo(CredentialSummary other) { + if (!getClass().equals(other.getClass())) { + return getClass().getName().compareTo(other.getClass().getName()); + } + + int lastComparison = 0; + + lastComparison = Boolean.valueOf(isSetGatewayId()).compareTo(other.isSetGatewayId()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetGatewayId()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.gatewayId, other.gatewayId); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetUsername()).compareTo(other.isSetUsername()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetUsername()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.username, other.username); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetPublicKey()).compareTo(other.isSetPublicKey()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetPublicKey()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.publicKey, other.publicKey); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetPersistedTime()).compareTo(other.isSetPersistedTime()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetPersistedTime()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.persistedTime, other.persistedTime); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = 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); + } + + public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { + schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder("CredentialSummary("); + boolean first = true; + + sb.append("gatewayId:"); + if (this.gatewayId == null) { + sb.append("null"); + } else { + sb.append(this.gatewayId); + } + first = false; + if (!first) sb.append(", "); + sb.append("username:"); + if (this.username == null) { + sb.append("null"); + } else { + sb.append(this.username); + } + first = false; + if (isSetPublicKey()) { + if (!first) sb.append(", "); + sb.append("publicKey:"); + if (this.publicKey == null) { + sb.append("null"); + } else { + sb.append(this.publicKey); + } + first = false; + } + if (isSetPersistedTime()) { + if (!first) sb.append(", "); + sb.append("persistedTime:"); + sb.append(this.persistedTime); + 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 (!isSetGatewayId()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'gatewayId' is unset! Struct:" + toString()); + } + + if (!isSetUsername()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'username' 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 { + 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 CredentialSummaryStandardSchemeFactory implements SchemeFactory { + public CredentialSummaryStandardScheme getScheme() { + return new CredentialSummaryStandardScheme(); + } + } + + private static class CredentialSummaryStandardScheme extends StandardScheme { + + public void read(org.apache.thrift.protocol.TProtocol iprot, CredentialSummary 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: // GATEWAY_ID + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.gatewayId = iprot.readString(); + struct.setGatewayIdIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // USERNAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.username = iprot.readString(); + struct.setUsernameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 3: // PUBLIC_KEY + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.publicKey = iprot.readString(); + struct.setPublicKeyIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // PERSISTED_TIME + if (schemeField.type == org.apache.thrift.protocol.TType.I64) { + struct.persistedTime = iprot.readI64(); + struct.setPersistedTimeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 5: // 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, CredentialSummary struct) throws org.apache.thrift.TException { + struct.validate(); + + oprot.writeStructBegin(STRUCT_DESC); + if (struct.gatewayId != null) { + oprot.writeFieldBegin(GATEWAY_ID_FIELD_DESC); + oprot.writeString(struct.gatewayId); + oprot.writeFieldEnd(); + } + if (struct.username != null) { + oprot.writeFieldBegin(USERNAME_FIELD_DESC); + oprot.writeString(struct.username); + oprot.writeFieldEnd(); + } + if (struct.publicKey != null) { + if (struct.isSetPublicKey()) { + oprot.writeFieldBegin(PUBLIC_KEY_FIELD_DESC); + oprot.writeString(struct.publicKey); + oprot.writeFieldEnd(); + } + } + if (struct.isSetPersistedTime()) { + oprot.writeFieldBegin(PERSISTED_TIME_FIELD_DESC); + oprot.writeI64(struct.persistedTime); + 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 CredentialSummaryTupleSchemeFactory implements SchemeFactory { + public CredentialSummaryTupleScheme getScheme() { + return new CredentialSummaryTupleScheme(); + } + } + + private static class CredentialSummaryTupleScheme extends TupleScheme { + + @Override + public void write(org.apache.thrift.protocol.TProtocol prot, CredentialSummary struct) throws org.apache.thrift.TException { + TTupleProtocol oprot = (TTupleProtocol) prot; + oprot.writeString(struct.gatewayId); + oprot.writeString(struct.username); + BitSet optionals = new BitSet(); + if (struct.isSetPublicKey()) { + optionals.set(0); + } + if (struct.isSetPersistedTime()) { + optionals.set(1); + } + if (struct.isSetDescription()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); + if (struct.isSetPublicKey()) { + oprot.writeString(struct.publicKey); + } + if (struct.isSetPersistedTime()) { + oprot.writeI64(struct.persistedTime); + } + if (struct.isSetDescription()) { + oprot.writeString(struct.description); + } + } + + @Override + public void read(org.apache.thrift.protocol.TProtocol prot, CredentialSummary struct) throws org.apache.thrift.TException { + TTupleProtocol iprot = (TTupleProtocol) prot; + struct.gatewayId = iprot.readString(); + struct.setGatewayIdIsSet(true); + struct.username = iprot.readString(); + struct.setUsernameIsSet(true); + BitSet incoming = iprot.readBitSet(3); + if (incoming.get(0)) { + struct.publicKey = iprot.readString(); + struct.setPublicKeyIsSet(true); + } + if (incoming.get(1)) { + struct.persistedTime = iprot.readI64(); + struct.setPersistedTimeIsSet(true); + } + if (incoming.get(2)) { + struct.description = iprot.readString(); + struct.setDescriptionIsSet(true); + } + } + } + +} + http://git-wip-us.apache.org/repos/asf/airavata/blob/b6548366/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CertificateCredential.java ---------------------------------------------------------------------- diff --git a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CertificateCredential.java b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CertificateCredential.java index 77a85d4..b41a4ad 100644 --- a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CertificateCredential.java +++ b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CertificateCredential.java @@ -50,7 +50,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-10") public class CertificateCredential implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CertificateCredential"); http://git-wip-us.apache.org/repos/asf/airavata/blob/b6548366/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CommunityUser.java ---------------------------------------------------------------------- diff --git a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CommunityUser.java b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CommunityUser.java index 457cad6..f963726 100644 --- a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CommunityUser.java +++ b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/CommunityUser.java @@ -50,7 +50,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-10") public class CommunityUser implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommunityUser"); http://git-wip-us.apache.org/repos/asf/airavata/blob/b6548366/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/PasswordCredential.java ---------------------------------------------------------------------- diff --git a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/PasswordCredential.java b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/PasswordCredential.java index c488315..6710c96 100644 --- a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/PasswordCredential.java +++ b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/PasswordCredential.java @@ -50,7 +50,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-10") public class PasswordCredential implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PasswordCredential"); http://git-wip-us.apache.org/repos/asf/airavata/blob/b6548366/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/exception/CredentialStoreException.java ---------------------------------------------------------------------- diff --git a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/exception/CredentialStoreException.java b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/exception/CredentialStoreException.java index 48ea94c..b55c84e 100644 --- a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/exception/CredentialStoreException.java +++ b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/exception/CredentialStoreException.java @@ -50,7 +50,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-08-09") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-10-10") public class CredentialStoreException extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CredentialStoreException"); http://git-wip-us.apache.org/repos/asf/airavata/blob/b6548366/thrift-interface-descriptions/airavata-apis/airavata_api.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift index 54bd588..9195209 100644 --- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift +++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift @@ -36,6 +36,7 @@ include "../data-models/app-catalog-models/application_io_models.thrift" include "../data-models/app-catalog-models/application_deployment_model.thrift" include "../data-models/app-catalog-models/application_interface_model.thrift" include "../data-models/resource-catalog-models/compute_resource_model.thrift" +include "../data-models/resource-catalog-models/credential_summary.thrift" include "../data-models/resource-catalog-models/storage_resource_model.thrift" include "../data-models/resource-catalog-models/gateway_resource_profile_model.thrift" include "../data-models/resource-catalog-models/user_resource_profile_model.thrift" @@ -345,6 +346,25 @@ service Airavata { 2: airavata_errors.AiravataClientException ace, 3: airavata_errors.AiravataSystemException ase) + /** + * + * Get all Public Keys of the Gateway + * + * @param CredStoreToken + * Credential Store Token which you want to find the Public Key for. + * + * @param gatewayId + * This is the unique identifier of your gateway where the token and public key was generated from. + * + * @return publicKey + * + **/ + list getAllGatewaySSHPubKeysSummary (1: required security_model.AuthzToken authzToken, + 2: required string gatewayId) + throws (1: airavata_errors.InvalidRequestException ire, + 2: airavata_errors.AiravataClientException ace, + 3: airavata_errors.AiravataSystemException ase) + map getAllGatewayPWDCredentials (1: required security_model.AuthzToken authzToken, 2: required string gatewayId) http://git-wip-us.apache.org/repos/asf/airavata/blob/b6548366/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift b/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift index c1b4d85..915804f 100644 --- a/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift +++ b/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift @@ -41,9 +41,6 @@ service CredentialStoreService { string addSSHCredential (1: required credential_store_data_models.SSHCredential sshCredential) throws (1:credential_store_errors.CredentialStoreException csException); - string addSSHCredentialSummary (1: required credential_store_data_models.SSHCredentialSummary sshCredentialSummary) - throws (1:credential_store_errors.CredentialStoreException csException); - string addCertificateCredential (1: required credential_store_data_models.CertificateCredential certificateCredential) throws (1:credential_store_errors.CredentialStoreException csException); @@ -66,12 +63,12 @@ service CredentialStoreService { map getAllSSHKeysForGateway (1: required string gatewayId) throws (1:credential_store_errors.CredentialStoreException csException); + list getAllGatewaySSHCredentialSummary (1: required string gatewayId) throws (1:credential_store_errors.CredentialStoreException csException); + map getAllPWDCredentialsForGateway (1: required string gatewayId) throws (1:credential_store_errors.CredentialStoreException csException); bool deleteSSHCredential(1: required string tokenId, 2: required string gatewayId) throws (1:credential_store_errors.CredentialStoreException csException); - bool deleteSSHCredentialSummary(1: required string tokenId, 2: required string gatewayId) throws (1:credential_store_errors.CredentialStoreException csException); - bool deletePWDCredential(1: required string tokenId, 2: required string gatewayId) throws (1:credential_store_errors.CredentialStoreException csException); } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/b6548366/thrift-interface-descriptions/data-models/resource-catalog-models/credential_summary.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/data-models/resource-catalog-models/credential_summary.thrift b/thrift-interface-descriptions/data-models/resource-catalog-models/credential_summary.thrift new file mode 100644 index 0000000..c7aaa89 --- /dev/null +++ b/thrift-interface-descriptions/data-models/resource-catalog-models/credential_summary.thrift @@ -0,0 +1,32 @@ +/* + * 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. + * + */ + +namespace java org.apache.airavata.model.appcatalog.credentialsummary +namespace php Airavata.Model.AppCatalog.CredetialSummary +namespace cpp apache.airavata.model.appcatalog.credentialsummary +namespace py apache.airavata.model.appcatalog.credentialsummary + +struct CredentialSummary { + 1: required string gatewayId, + 2: required string username, + 3: optional string publicKey, + 4: optional i64 persistedTime, + 5: optional string description +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/b6548366/thrift-interface-descriptions/data-models/resource-catalog-models/resource_catalog_models.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/data-models/resource-catalog-models/resource_catalog_models.thrift b/thrift-interface-descriptions/data-models/resource-catalog-models/resource_catalog_models.thrift index da4a340..3b144eb 100644 --- a/thrift-interface-descriptions/data-models/resource-catalog-models/resource_catalog_models.thrift +++ b/thrift-interface-descriptions/data-models/resource-catalog-models/resource_catalog_models.thrift @@ -21,4 +21,5 @@ include "compute_resource_model.thrift" include "storage_resource_model.thrift" include "gateway_resource_profile_model.thrift" -include "user_resource_profile_model.thrift" \ No newline at end of file +include "user_resource_profile_model.thrift" +include "credential_summary.thrift" \ No newline at end of file