Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AC7CF114BC for ; Tue, 8 Jul 2014 15:48:46 +0000 (UTC) Received: (qmail 35454 invoked by uid 500); 8 Jul 2014 15:48:46 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 35334 invoked by uid 500); 8 Jul 2014 15:48:46 -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 35309 invoked by uid 99); 8 Jul 2014 15:48:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Jul 2014 15:48:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 38654946650; Tue, 8 Jul 2014 15:48:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chathuri@apache.org To: commits@airavata.apache.org Date: Tue, 08 Jul 2014 15:48:47 -0000 Message-Id: <460b43298aff4a9493eb14384565fa95@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] fixing issues in document creator http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php index ce8cf4f..47029f1 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/AppInterface/Types.php @@ -33,7 +33,6 @@ final class DataType { class InputDataObjectType { static $_TSPEC; - public $isEmpty = false; public $name = null; public $value = null; public $type = null; @@ -46,43 +45,36 @@ class InputDataObjectType { if (!isset(self::$_TSPEC)) { self::$_TSPEC = array( 1 => array( - 'var' => 'isEmpty', - 'type' => TType::BOOL, - ), - 2 => array( 'var' => 'name', 'type' => TType::STRING, ), - 3 => array( + 2 => array( 'var' => 'value', 'type' => TType::STRING, ), - 4 => array( + 3 => array( 'var' => 'type', 'type' => TType::I32, ), - 5 => array( + 4 => array( 'var' => 'applicationArgument', 'type' => TType::STRING, ), - 6 => array( + 5 => array( 'var' => 'standardInput', 'type' => TType::BOOL, ), - 7 => array( + 6 => array( 'var' => 'userFriendlyDescription', 'type' => TType::STRING, ), - 8 => array( + 7 => array( 'var' => 'metaData', 'type' => TType::STRING, ), ); } if (is_array($vals)) { - if (isset($vals['isEmpty'])) { - $this->isEmpty = $vals['isEmpty']; - } if (isset($vals['name'])) { $this->name = $vals['name']; } @@ -127,55 +119,48 @@ class InputDataObjectType { switch ($fid) { case 1: - if ($ftype == TType::BOOL) { - $xfer += $input->readBool($this->isEmpty); - } else { - $xfer += $input->skip($ftype); - } - break; - case 2: if ($ftype == TType::STRING) { $xfer += $input->readString($this->name); } else { $xfer += $input->skip($ftype); } break; - case 3: + case 2: if ($ftype == TType::STRING) { $xfer += $input->readString($this->value); } else { $xfer += $input->skip($ftype); } break; - case 4: + case 3: if ($ftype == TType::I32) { $xfer += $input->readI32($this->type); } else { $xfer += $input->skip($ftype); } break; - case 5: + case 4: if ($ftype == TType::STRING) { $xfer += $input->readString($this->applicationArgument); } else { $xfer += $input->skip($ftype); } break; - case 6: + case 5: if ($ftype == TType::BOOL) { $xfer += $input->readBool($this->standardInput); } else { $xfer += $input->skip($ftype); } break; - case 7: + case 6: if ($ftype == TType::STRING) { $xfer += $input->readString($this->userFriendlyDescription); } else { $xfer += $input->skip($ftype); } break; - case 8: + case 7: if ($ftype == TType::STRING) { $xfer += $input->readString($this->metaData); } else { @@ -195,43 +180,38 @@ class InputDataObjectType { public function write($output) { $xfer = 0; $xfer += $output->writeStructBegin('InputDataObjectType'); - if ($this->isEmpty !== null) { - $xfer += $output->writeFieldBegin('isEmpty', TType::BOOL, 1); - $xfer += $output->writeBool($this->isEmpty); - $xfer += $output->writeFieldEnd(); - } if ($this->name !== null) { - $xfer += $output->writeFieldBegin('name', TType::STRING, 2); + $xfer += $output->writeFieldBegin('name', TType::STRING, 1); $xfer += $output->writeString($this->name); $xfer += $output->writeFieldEnd(); } if ($this->value !== null) { - $xfer += $output->writeFieldBegin('value', TType::STRING, 3); + $xfer += $output->writeFieldBegin('value', TType::STRING, 2); $xfer += $output->writeString($this->value); $xfer += $output->writeFieldEnd(); } if ($this->type !== null) { - $xfer += $output->writeFieldBegin('type', TType::I32, 4); + $xfer += $output->writeFieldBegin('type', TType::I32, 3); $xfer += $output->writeI32($this->type); $xfer += $output->writeFieldEnd(); } if ($this->applicationArgument !== null) { - $xfer += $output->writeFieldBegin('applicationArgument', TType::STRING, 5); + $xfer += $output->writeFieldBegin('applicationArgument', TType::STRING, 4); $xfer += $output->writeString($this->applicationArgument); $xfer += $output->writeFieldEnd(); } if ($this->standardInput !== null) { - $xfer += $output->writeFieldBegin('standardInput', TType::BOOL, 6); + $xfer += $output->writeFieldBegin('standardInput', TType::BOOL, 5); $xfer += $output->writeBool($this->standardInput); $xfer += $output->writeFieldEnd(); } if ($this->userFriendlyDescription !== null) { - $xfer += $output->writeFieldBegin('userFriendlyDescription', TType::STRING, 7); + $xfer += $output->writeFieldBegin('userFriendlyDescription', TType::STRING, 6); $xfer += $output->writeString($this->userFriendlyDescription); $xfer += $output->writeFieldEnd(); } if ($this->metaData !== null) { - $xfer += $output->writeFieldBegin('metaData', TType::STRING, 8); + $xfer += $output->writeFieldBegin('metaData', TType::STRING, 7); $xfer += $output->writeString($this->metaData); $xfer += $output->writeFieldEnd(); } @@ -377,7 +357,6 @@ class OutputDataObjectType { class ApplicationInterfaceDescription { static $_TSPEC; - public $isEmpty = false; public $applicationInterfaceId = "DO_NOT_SET_AT_CLIENTS"; public $applicationName = null; public $applicationDesription = null; @@ -389,22 +368,18 @@ class ApplicationInterfaceDescription { if (!isset(self::$_TSPEC)) { self::$_TSPEC = array( 1 => array( - 'var' => 'isEmpty', - 'type' => TType::BOOL, - ), - 2 => array( 'var' => 'applicationInterfaceId', 'type' => TType::STRING, ), - 3 => array( + 2 => array( 'var' => 'applicationName', 'type' => TType::STRING, ), - 4 => array( + 3 => array( 'var' => 'applicationDesription', 'type' => TType::STRING, ), - 5 => array( + 4 => array( 'var' => 'applicationModules', 'type' => TType::LST, 'etype' => TType::STRING, @@ -412,7 +387,7 @@ class ApplicationInterfaceDescription { 'type' => TType::STRING, ), ), - 6 => array( + 5 => array( 'var' => 'applicationInputs', 'type' => TType::LST, 'etype' => TType::STRUCT, @@ -421,7 +396,7 @@ class ApplicationInterfaceDescription { 'class' => '\Airavata\Model\AppCatalog\AppInterface\InputDataObjectType', ), ), - 7 => array( + 6 => array( 'var' => 'applicationOutputs', 'type' => TType::LST, 'etype' => TType::STRUCT, @@ -433,9 +408,6 @@ class ApplicationInterfaceDescription { ); } if (is_array($vals)) { - if (isset($vals['isEmpty'])) { - $this->isEmpty = $vals['isEmpty']; - } if (isset($vals['applicationInterfaceId'])) { $this->applicationInterfaceId = $vals['applicationInterfaceId']; } @@ -477,34 +449,27 @@ class ApplicationInterfaceDescription { switch ($fid) { case 1: - if ($ftype == TType::BOOL) { - $xfer += $input->readBool($this->isEmpty); - } else { - $xfer += $input->skip($ftype); - } - break; - case 2: if ($ftype == TType::STRING) { $xfer += $input->readString($this->applicationInterfaceId); } else { $xfer += $input->skip($ftype); } break; - case 3: + case 2: if ($ftype == TType::STRING) { $xfer += $input->readString($this->applicationName); } else { $xfer += $input->skip($ftype); } break; - case 4: + case 3: if ($ftype == TType::STRING) { $xfer += $input->readString($this->applicationDesription); } else { $xfer += $input->skip($ftype); } break; - case 5: + case 4: if ($ftype == TType::LST) { $this->applicationModules = array(); $_size0 = 0; @@ -521,7 +486,7 @@ class ApplicationInterfaceDescription { $xfer += $input->skip($ftype); } break; - case 6: + case 5: if ($ftype == TType::LST) { $this->applicationInputs = array(); $_size6 = 0; @@ -539,7 +504,7 @@ class ApplicationInterfaceDescription { $xfer += $input->skip($ftype); } break; - case 7: + case 6: if ($ftype == TType::LST) { $this->applicationOutputs = array(); $_size12 = 0; @@ -570,23 +535,18 @@ class ApplicationInterfaceDescription { public function write($output) { $xfer = 0; $xfer += $output->writeStructBegin('ApplicationInterfaceDescription'); - if ($this->isEmpty !== null) { - $xfer += $output->writeFieldBegin('isEmpty', TType::BOOL, 1); - $xfer += $output->writeBool($this->isEmpty); - $xfer += $output->writeFieldEnd(); - } if ($this->applicationInterfaceId !== null) { - $xfer += $output->writeFieldBegin('applicationInterfaceId', TType::STRING, 2); + $xfer += $output->writeFieldBegin('applicationInterfaceId', TType::STRING, 1); $xfer += $output->writeString($this->applicationInterfaceId); $xfer += $output->writeFieldEnd(); } if ($this->applicationName !== null) { - $xfer += $output->writeFieldBegin('applicationName', TType::STRING, 3); + $xfer += $output->writeFieldBegin('applicationName', TType::STRING, 2); $xfer += $output->writeString($this->applicationName); $xfer += $output->writeFieldEnd(); } if ($this->applicationDesription !== null) { - $xfer += $output->writeFieldBegin('applicationDesription', TType::STRING, 4); + $xfer += $output->writeFieldBegin('applicationDesription', TType::STRING, 3); $xfer += $output->writeString($this->applicationDesription); $xfer += $output->writeFieldEnd(); } @@ -594,7 +554,7 @@ class ApplicationInterfaceDescription { if (!is_array($this->applicationModules)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('applicationModules', TType::LST, 5); + $xfer += $output->writeFieldBegin('applicationModules', TType::LST, 4); { $output->writeListBegin(TType::STRING, count($this->applicationModules)); { @@ -611,7 +571,7 @@ class ApplicationInterfaceDescription { if (!is_array($this->applicationInputs)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('applicationInputs', TType::LST, 6); + $xfer += $output->writeFieldBegin('applicationInputs', TType::LST, 5); { $output->writeListBegin(TType::STRUCT, count($this->applicationInputs)); { @@ -628,7 +588,7 @@ class ApplicationInterfaceDescription { if (!is_array($this->applicationOutputs)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('applicationOutputs', TType::LST, 7); + $xfer += $output->writeFieldBegin('applicationOutputs', TType::LST, 6); { $output->writeListBegin(TType::STRUCT, count($this->applicationOutputs)); { http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php index 338688c..c88aeaf 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php @@ -1426,7 +1426,6 @@ class DataMovementInterface { class ComputeResourceDescription { static $_TSPEC; - public $isEmpty = false; public $computeResourceId = "DO_NOT_SET_AT_CLIENTS"; public $hostName = null; public $hostAliases = null; @@ -1441,18 +1440,14 @@ class ComputeResourceDescription { if (!isset(self::$_TSPEC)) { self::$_TSPEC = array( 1 => array( - 'var' => 'isEmpty', - 'type' => TType::BOOL, - ), - 2 => array( 'var' => 'computeResourceId', 'type' => TType::STRING, ), - 3 => array( + 2 => array( 'var' => 'hostName', 'type' => TType::STRING, ), - 4 => array( + 3 => array( 'var' => 'hostAliases', 'type' => TType::SET, 'etype' => TType::STRING, @@ -1460,7 +1455,7 @@ class ComputeResourceDescription { 'type' => TType::STRING, ), ), - 5 => array( + 4 => array( 'var' => 'ipAddresses', 'type' => TType::SET, 'etype' => TType::STRING, @@ -1468,11 +1463,11 @@ class ComputeResourceDescription { 'type' => TType::STRING, ), ), - 6 => array( + 5 => array( 'var' => 'resourceDescription', 'type' => TType::STRING, ), - 7 => array( + 6 => array( 'var' => 'batchQueues', 'type' => TType::LST, 'etype' => TType::STRUCT, @@ -1481,7 +1476,7 @@ class ComputeResourceDescription { 'class' => '\Airavata\Model\AppCatalog\ComputeResource\BatchQueue', ), ), - 8 => array( + 7 => array( 'var' => 'fileSystems', 'type' => TType::MAP, 'ktype' => TType::I32, @@ -1493,7 +1488,7 @@ class ComputeResourceDescription { 'type' => TType::STRING, ), ), - 9 => array( + 8 => array( 'var' => 'jobSubmissionInterfaces', 'type' => TType::LST, 'etype' => TType::STRUCT, @@ -1502,7 +1497,7 @@ class ComputeResourceDescription { 'class' => '\Airavata\Model\AppCatalog\ComputeResource\JobSubmissionInterface', ), ), - 10 => array( + 9 => array( 'var' => 'dataMovementInterfaces', 'type' => TType::LST, 'etype' => TType::STRUCT, @@ -1514,9 +1509,6 @@ class ComputeResourceDescription { ); } if (is_array($vals)) { - if (isset($vals['isEmpty'])) { - $this->isEmpty = $vals['isEmpty']; - } if (isset($vals['computeResourceId'])) { $this->computeResourceId = $vals['computeResourceId']; } @@ -1567,27 +1559,20 @@ class ComputeResourceDescription { switch ($fid) { case 1: - if ($ftype == TType::BOOL) { - $xfer += $input->readBool($this->isEmpty); - } else { - $xfer += $input->skip($ftype); - } - break; - case 2: if ($ftype == TType::STRING) { $xfer += $input->readString($this->computeResourceId); } else { $xfer += $input->skip($ftype); } break; - case 3: + case 2: if ($ftype == TType::STRING) { $xfer += $input->readString($this->hostName); } else { $xfer += $input->skip($ftype); } break; - case 4: + case 3: if ($ftype == TType::SET) { $this->hostAliases = array(); $_size23 = 0; @@ -1608,7 +1593,7 @@ class ComputeResourceDescription { $xfer += $input->skip($ftype); } break; - case 5: + case 4: if ($ftype == TType::SET) { $this->ipAddresses = array(); $_size29 = 0; @@ -1629,14 +1614,14 @@ class ComputeResourceDescription { $xfer += $input->skip($ftype); } break; - case 6: + case 5: if ($ftype == TType::STRING) { $xfer += $input->readString($this->resourceDescription); } else { $xfer += $input->skip($ftype); } break; - case 7: + case 6: if ($ftype == TType::LST) { $this->batchQueues = array(); $_size35 = 0; @@ -1654,7 +1639,7 @@ class ComputeResourceDescription { $xfer += $input->skip($ftype); } break; - case 8: + case 7: if ($ftype == TType::MAP) { $this->fileSystems = array(); $_size41 = 0; @@ -1674,7 +1659,7 @@ class ComputeResourceDescription { $xfer += $input->skip($ftype); } break; - case 9: + case 8: if ($ftype == TType::LST) { $this->jobSubmissionInterfaces = array(); $_size48 = 0; @@ -1692,7 +1677,7 @@ class ComputeResourceDescription { $xfer += $input->skip($ftype); } break; - case 10: + case 9: if ($ftype == TType::LST) { $this->dataMovementInterfaces = array(); $_size54 = 0; @@ -1723,18 +1708,13 @@ class ComputeResourceDescription { public function write($output) { $xfer = 0; $xfer += $output->writeStructBegin('ComputeResourceDescription'); - if ($this->isEmpty !== null) { - $xfer += $output->writeFieldBegin('isEmpty', TType::BOOL, 1); - $xfer += $output->writeBool($this->isEmpty); - $xfer += $output->writeFieldEnd(); - } if ($this->computeResourceId !== null) { - $xfer += $output->writeFieldBegin('computeResourceId', TType::STRING, 2); + $xfer += $output->writeFieldBegin('computeResourceId', TType::STRING, 1); $xfer += $output->writeString($this->computeResourceId); $xfer += $output->writeFieldEnd(); } if ($this->hostName !== null) { - $xfer += $output->writeFieldBegin('hostName', TType::STRING, 3); + $xfer += $output->writeFieldBegin('hostName', TType::STRING, 2); $xfer += $output->writeString($this->hostName); $xfer += $output->writeFieldEnd(); } @@ -1742,7 +1722,7 @@ class ComputeResourceDescription { if (!is_array($this->hostAliases)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('hostAliases', TType::SET, 4); + $xfer += $output->writeFieldBegin('hostAliases', TType::SET, 3); { $output->writeSetBegin(TType::STRING, count($this->hostAliases)); { @@ -1763,7 +1743,7 @@ class ComputeResourceDescription { if (!is_array($this->ipAddresses)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('ipAddresses', TType::SET, 5); + $xfer += $output->writeFieldBegin('ipAddresses', TType::SET, 4); { $output->writeSetBegin(TType::STRING, count($this->ipAddresses)); { @@ -1781,7 +1761,7 @@ class ComputeResourceDescription { $xfer += $output->writeFieldEnd(); } if ($this->resourceDescription !== null) { - $xfer += $output->writeFieldBegin('resourceDescription', TType::STRING, 6); + $xfer += $output->writeFieldBegin('resourceDescription', TType::STRING, 5); $xfer += $output->writeString($this->resourceDescription); $xfer += $output->writeFieldEnd(); } @@ -1789,7 +1769,7 @@ class ComputeResourceDescription { if (!is_array($this->batchQueues)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('batchQueues', TType::LST, 7); + $xfer += $output->writeFieldBegin('batchQueues', TType::LST, 6); { $output->writeListBegin(TType::STRUCT, count($this->batchQueues)); { @@ -1806,7 +1786,7 @@ class ComputeResourceDescription { if (!is_array($this->fileSystems)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('fileSystems', TType::MAP, 8); + $xfer += $output->writeFieldBegin('fileSystems', TType::MAP, 7); { $output->writeMapBegin(TType::I32, TType::STRING, count($this->fileSystems)); { @@ -1824,7 +1804,7 @@ class ComputeResourceDescription { if (!is_array($this->jobSubmissionInterfaces)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('jobSubmissionInterfaces', TType::LST, 9); + $xfer += $output->writeFieldBegin('jobSubmissionInterfaces', TType::LST, 8); { $output->writeListBegin(TType::STRUCT, count($this->jobSubmissionInterfaces)); { @@ -1841,7 +1821,7 @@ class ComputeResourceDescription { if (!is_array($this->dataMovementInterfaces)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('dataMovementInterfaces', TType::LST, 10); + $xfer += $output->writeFieldBegin('dataMovementInterfaces', TType::LST, 9); { $output->writeListBegin(TType::STRUCT, count($this->dataMovementInterfaces)); { http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java index b6882ef..6bfc794 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appdeployment/ApplicationDeploymentDescription.java @@ -77,17 +77,16 @@ import org.slf4j.LoggerFactory; @SuppressWarnings("all") public class ApplicationDeploymentDescription 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("ApplicationDeploymentDescription"); - private static final org.apache.thrift.protocol.TField IS_EMPTY_FIELD_DESC = new org.apache.thrift.protocol.TField("isEmpty", org.apache.thrift.protocol.TType.BOOL, (short)1); - private static final org.apache.thrift.protocol.TField APP_DEPLOYMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("appDeploymentId", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField APP_MODULE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("appModuleId", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField COMPUTE_HOST_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("computeHostId", org.apache.thrift.protocol.TType.STRING, (short)4); - private static final org.apache.thrift.protocol.TField EXECUTABLE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("executablePath", org.apache.thrift.protocol.TType.STRING, (short)5); - private static final org.apache.thrift.protocol.TField PARALLELISM_FIELD_DESC = new org.apache.thrift.protocol.TField("parallelism", org.apache.thrift.protocol.TType.I32, (short)6); - private static final org.apache.thrift.protocol.TField APP_DEPLOYMENT_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("appDeploymentDescription", org.apache.thrift.protocol.TType.STRING, (short)7); - private static final org.apache.thrift.protocol.TField MODULE_LOAD_CMDS_FIELD_DESC = new org.apache.thrift.protocol.TField("moduleLoadCmds", org.apache.thrift.protocol.TType.LIST, (short)8); - private static final org.apache.thrift.protocol.TField LIB_PREPEND_PATHS_FIELD_DESC = new org.apache.thrift.protocol.TField("libPrependPaths", org.apache.thrift.protocol.TType.LIST, (short)9); - private static final org.apache.thrift.protocol.TField LIB_APPEND_PATHS_FIELD_DESC = new org.apache.thrift.protocol.TField("libAppendPaths", org.apache.thrift.protocol.TType.LIST, (short)10); - private static final org.apache.thrift.protocol.TField SET_ENVIRONMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("setEnvironment", org.apache.thrift.protocol.TType.LIST, (short)11); + private static final org.apache.thrift.protocol.TField APP_DEPLOYMENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("appDeploymentId", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField APP_MODULE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("appModuleId", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField COMPUTE_HOST_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("computeHostId", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField EXECUTABLE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("executablePath", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField PARALLELISM_FIELD_DESC = new org.apache.thrift.protocol.TField("parallelism", org.apache.thrift.protocol.TType.I32, (short)5); + private static final org.apache.thrift.protocol.TField APP_DEPLOYMENT_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("appDeploymentDescription", org.apache.thrift.protocol.TType.STRING, (short)6); + private static final org.apache.thrift.protocol.TField MODULE_LOAD_CMDS_FIELD_DESC = new org.apache.thrift.protocol.TField("moduleLoadCmds", org.apache.thrift.protocol.TType.LIST, (short)7); + private static final org.apache.thrift.protocol.TField LIB_PREPEND_PATHS_FIELD_DESC = new org.apache.thrift.protocol.TField("libPrependPaths", org.apache.thrift.protocol.TType.LIST, (short)8); + private static final org.apache.thrift.protocol.TField LIB_APPEND_PATHS_FIELD_DESC = new org.apache.thrift.protocol.TField("libAppendPaths", org.apache.thrift.protocol.TType.LIST, (short)9); + private static final org.apache.thrift.protocol.TField SET_ENVIRONMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("setEnvironment", org.apache.thrift.protocol.TType.LIST, (short)10); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -95,7 +94,6 @@ import org.slf4j.LoggerFactory; schemes.put(TupleScheme.class, new ApplicationDeploymentDescriptionTupleSchemeFactory()); } - private boolean isEmpty; // required private String appDeploymentId; // required private String appModuleId; // required private String computeHostId; // required @@ -109,21 +107,20 @@ import org.slf4j.LoggerFactory; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { - IS_EMPTY((short)1, "isEmpty"), - APP_DEPLOYMENT_ID((short)2, "appDeploymentId"), - APP_MODULE_ID((short)3, "appModuleId"), - COMPUTE_HOST_ID((short)4, "computeHostId"), - EXECUTABLE_PATH((short)5, "executablePath"), + APP_DEPLOYMENT_ID((short)1, "appDeploymentId"), + APP_MODULE_ID((short)2, "appModuleId"), + COMPUTE_HOST_ID((short)3, "computeHostId"), + EXECUTABLE_PATH((short)4, "executablePath"), /** * * @see ApplicationParallelismType */ - PARALLELISM((short)6, "parallelism"), - APP_DEPLOYMENT_DESCRIPTION((short)7, "appDeploymentDescription"), - MODULE_LOAD_CMDS((short)8, "moduleLoadCmds"), - LIB_PREPEND_PATHS((short)9, "libPrependPaths"), - LIB_APPEND_PATHS((short)10, "libAppendPaths"), - SET_ENVIRONMENT((short)11, "setEnvironment"); + PARALLELISM((short)5, "parallelism"), + APP_DEPLOYMENT_DESCRIPTION((short)6, "appDeploymentDescription"), + MODULE_LOAD_CMDS((short)7, "moduleLoadCmds"), + LIB_PREPEND_PATHS((short)8, "libPrependPaths"), + LIB_APPEND_PATHS((short)9, "libAppendPaths"), + SET_ENVIRONMENT((short)10, "setEnvironment"); private static final Map byName = new HashMap(); @@ -138,27 +135,25 @@ import org.slf4j.LoggerFactory; */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // IS_EMPTY - return IS_EMPTY; - case 2: // APP_DEPLOYMENT_ID + case 1: // APP_DEPLOYMENT_ID return APP_DEPLOYMENT_ID; - case 3: // APP_MODULE_ID + case 2: // APP_MODULE_ID return APP_MODULE_ID; - case 4: // COMPUTE_HOST_ID + case 3: // COMPUTE_HOST_ID return COMPUTE_HOST_ID; - case 5: // EXECUTABLE_PATH + case 4: // EXECUTABLE_PATH return EXECUTABLE_PATH; - case 6: // PARALLELISM + case 5: // PARALLELISM return PARALLELISM; - case 7: // APP_DEPLOYMENT_DESCRIPTION + case 6: // APP_DEPLOYMENT_DESCRIPTION return APP_DEPLOYMENT_DESCRIPTION; - case 8: // MODULE_LOAD_CMDS + case 7: // MODULE_LOAD_CMDS return MODULE_LOAD_CMDS; - case 9: // LIB_PREPEND_PATHS + case 8: // LIB_PREPEND_PATHS return LIB_PREPEND_PATHS; - case 10: // LIB_APPEND_PATHS + case 9: // LIB_APPEND_PATHS return LIB_APPEND_PATHS; - case 11: // SET_ENVIRONMENT + case 10: // SET_ENVIRONMENT return SET_ENVIRONMENT; default: return null; @@ -200,14 +195,10 @@ import org.slf4j.LoggerFactory; } // isset id assignments - private static final int __ISEMPTY_ISSET_ID = 0; - private byte __isset_bitfield = 0; private _Fields optionals[] = {_Fields.APP_DEPLOYMENT_DESCRIPTION,_Fields.MODULE_LOAD_CMDS,_Fields.LIB_PREPEND_PATHS,_Fields.LIB_APPEND_PATHS,_Fields.SET_ENVIRONMENT}; 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.IS_EMPTY, new org.apache.thrift.meta_data.FieldMetaData("isEmpty", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.APP_DEPLOYMENT_ID, new org.apache.thrift.meta_data.FieldMetaData("appDeploymentId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.APP_MODULE_ID, new org.apache.thrift.meta_data.FieldMetaData("appModuleId", org.apache.thrift.TFieldRequirementType.REQUIRED, @@ -237,8 +228,6 @@ import org.slf4j.LoggerFactory; } public ApplicationDeploymentDescription() { - this.isEmpty = false; - this.appDeploymentId = "DO_NOT_SET_AT_CLIENTS"; this.parallelism = org.apache.airavata.model.appcatalog.appdeployment.ApplicationParallelismType.SERIAL; @@ -246,7 +235,6 @@ import org.slf4j.LoggerFactory; } public ApplicationDeploymentDescription( - boolean isEmpty, String appDeploymentId, String appModuleId, String computeHostId, @@ -254,8 +242,6 @@ import org.slf4j.LoggerFactory; ApplicationParallelismType parallelism) { this(); - this.isEmpty = isEmpty; - setIsEmptyIsSet(true); this.appDeploymentId = appDeploymentId; this.appModuleId = appModuleId; this.computeHostId = computeHostId; @@ -267,8 +253,6 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on other. */ public ApplicationDeploymentDescription(ApplicationDeploymentDescription other) { - __isset_bitfield = other.__isset_bitfield; - this.isEmpty = other.isEmpty; if (other.isSetAppDeploymentId()) { this.appDeploymentId = other.appDeploymentId; } @@ -320,8 +304,6 @@ import org.slf4j.LoggerFactory; @Override public void clear() { - this.isEmpty = false; - this.appDeploymentId = "DO_NOT_SET_AT_CLIENTS"; this.appModuleId = null; @@ -336,28 +318,6 @@ import org.slf4j.LoggerFactory; this.setEnvironment = null; } - public boolean isIsEmpty() { - return this.isEmpty; - } - - public void setIsEmpty(boolean isEmpty) { - this.isEmpty = isEmpty; - setIsEmptyIsSet(true); - } - - public void unsetIsEmpty() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISEMPTY_ISSET_ID); - } - - /** Returns true if field isEmpty is set (has been assigned a value) and false otherwise */ - public boolean isSetIsEmpty() { - return EncodingUtils.testBit(__isset_bitfield, __ISEMPTY_ISSET_ID); - } - - public void setIsEmptyIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISEMPTY_ISSET_ID, value); - } - public String getAppDeploymentId() { return this.appDeploymentId; } @@ -658,14 +618,6 @@ import org.slf4j.LoggerFactory; public void setFieldValue(_Fields field, Object value) { switch (field) { - case IS_EMPTY: - if (value == null) { - unsetIsEmpty(); - } else { - setIsEmpty((Boolean)value); - } - break; - case APP_DEPLOYMENT_ID: if (value == null) { unsetAppDeploymentId(); @@ -751,9 +703,6 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { - case IS_EMPTY: - return Boolean.valueOf(isIsEmpty()); - case APP_DEPLOYMENT_ID: return getAppDeploymentId(); @@ -795,8 +744,6 @@ import org.slf4j.LoggerFactory; } switch (field) { - case IS_EMPTY: - return isSetIsEmpty(); case APP_DEPLOYMENT_ID: return isSetAppDeploymentId(); case APP_MODULE_ID: @@ -834,15 +781,6 @@ import org.slf4j.LoggerFactory; if (that == null) return false; - boolean this_present_isEmpty = true; - boolean that_present_isEmpty = true; - if (this_present_isEmpty || that_present_isEmpty) { - if (!(this_present_isEmpty && that_present_isEmpty)) - return false; - if (this.isEmpty != that.isEmpty) - return false; - } - boolean this_present_appDeploymentId = true && this.isSetAppDeploymentId(); boolean that_present_appDeploymentId = true && that.isSetAppDeploymentId(); if (this_present_appDeploymentId || that_present_appDeploymentId) { @@ -949,16 +887,6 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetIsEmpty()).compareTo(other.isSetIsEmpty()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetIsEmpty()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isEmpty, other.isEmpty); - if (lastComparison != 0) { - return lastComparison; - } - } lastComparison = Boolean.valueOf(isSetAppDeploymentId()).compareTo(other.isSetAppDeploymentId()); if (lastComparison != 0) { return lastComparison; @@ -1079,10 +1007,6 @@ import org.slf4j.LoggerFactory; StringBuilder sb = new StringBuilder("ApplicationDeploymentDescription("); boolean first = true; - sb.append("isEmpty:"); - sb.append(this.isEmpty); - first = false; - if (!first) sb.append(", "); sb.append("appDeploymentId:"); if (this.appDeploymentId == null) { sb.append("null"); @@ -1178,10 +1102,6 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields - if (!isSetIsEmpty()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'isEmpty' is unset! Struct:" + toString()); - } - if (!isSetAppDeploymentId()) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'appDeploymentId' is unset! Struct:" + toString()); } @@ -1215,8 +1135,6 @@ import org.slf4j.LoggerFactory; 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); @@ -1241,15 +1159,7 @@ import org.slf4j.LoggerFactory; break; } switch (schemeField.id) { - case 1: // IS_EMPTY - if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { - struct.isEmpty = iprot.readBool(); - struct.setIsEmptyIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 2: // APP_DEPLOYMENT_ID + case 1: // APP_DEPLOYMENT_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.appDeploymentId = iprot.readString(); struct.setAppDeploymentIdIsSet(true); @@ -1257,7 +1167,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // APP_MODULE_ID + case 2: // APP_MODULE_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.appModuleId = iprot.readString(); struct.setAppModuleIdIsSet(true); @@ -1265,7 +1175,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // COMPUTE_HOST_ID + case 3: // COMPUTE_HOST_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.computeHostId = iprot.readString(); struct.setComputeHostIdIsSet(true); @@ -1273,7 +1183,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // EXECUTABLE_PATH + case 4: // EXECUTABLE_PATH if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.executablePath = iprot.readString(); struct.setExecutablePathIsSet(true); @@ -1281,7 +1191,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // PARALLELISM + case 5: // PARALLELISM if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.parallelism = ApplicationParallelismType.findByValue(iprot.readI32()); struct.setParallelismIsSet(true); @@ -1289,7 +1199,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 7: // APP_DEPLOYMENT_DESCRIPTION + case 6: // APP_DEPLOYMENT_DESCRIPTION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.appDeploymentDescription = iprot.readString(); struct.setAppDeploymentDescriptionIsSet(true); @@ -1297,7 +1207,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 8: // MODULE_LOAD_CMDS + case 7: // MODULE_LOAD_CMDS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); @@ -1315,7 +1225,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 9: // LIB_PREPEND_PATHS + case 8: // LIB_PREPEND_PATHS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list3 = iprot.readListBegin(); @@ -1334,7 +1244,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 10: // LIB_APPEND_PATHS + case 9: // LIB_APPEND_PATHS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list6 = iprot.readListBegin(); @@ -1353,7 +1263,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 11: // SET_ENVIRONMENT + case 10: // SET_ENVIRONMENT if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list9 = iprot.readListBegin(); @@ -1385,9 +1295,6 @@ import org.slf4j.LoggerFactory; struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - oprot.writeFieldBegin(IS_EMPTY_FIELD_DESC); - oprot.writeBool(struct.isEmpty); - oprot.writeFieldEnd(); if (struct.appDeploymentId != null) { oprot.writeFieldBegin(APP_DEPLOYMENT_ID_FIELD_DESC); oprot.writeString(struct.appDeploymentId); @@ -1493,7 +1400,6 @@ import org.slf4j.LoggerFactory; @Override public void write(org.apache.thrift.protocol.TProtocol prot, ApplicationDeploymentDescription struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; - oprot.writeBool(struct.isEmpty); oprot.writeString(struct.appDeploymentId); oprot.writeString(struct.appModuleId); oprot.writeString(struct.computeHostId); @@ -1560,8 +1466,6 @@ import org.slf4j.LoggerFactory; @Override public void read(org.apache.thrift.protocol.TProtocol prot, ApplicationDeploymentDescription struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - struct.isEmpty = iprot.readBool(); - struct.setIsEmptyIsSet(true); struct.appDeploymentId = iprot.readString(); struct.setAppDeploymentIdIsSet(true); struct.appModuleId = iprot.readString(); http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java index 53ed366..379e5dc 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/ApplicationInterfaceDescription.java @@ -64,13 +64,12 @@ import org.slf4j.LoggerFactory; @SuppressWarnings("all") public class ApplicationInterfaceDescription 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("ApplicationInterfaceDescription"); - private static final org.apache.thrift.protocol.TField IS_EMPTY_FIELD_DESC = new org.apache.thrift.protocol.TField("isEmpty", org.apache.thrift.protocol.TType.BOOL, (short)1); - private static final org.apache.thrift.protocol.TField APPLICATION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField APPLICATION_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationName", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField APPLICATION_DESRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationDesription", org.apache.thrift.protocol.TType.STRING, (short)4); - private static final org.apache.thrift.protocol.TField APPLICATION_MODULES_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationModules", org.apache.thrift.protocol.TType.LIST, (short)5); - private static final org.apache.thrift.protocol.TField APPLICATION_INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInputs", org.apache.thrift.protocol.TType.LIST, (short)6); - private static final org.apache.thrift.protocol.TField APPLICATION_OUTPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationOutputs", org.apache.thrift.protocol.TType.LIST, (short)7); + private static final org.apache.thrift.protocol.TField APPLICATION_INTERFACE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInterfaceId", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField APPLICATION_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationName", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField APPLICATION_DESRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationDesription", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField APPLICATION_MODULES_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationModules", org.apache.thrift.protocol.TType.LIST, (short)4); + private static final org.apache.thrift.protocol.TField APPLICATION_INPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationInputs", org.apache.thrift.protocol.TType.LIST, (short)5); + private static final org.apache.thrift.protocol.TField APPLICATION_OUTPUTS_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationOutputs", org.apache.thrift.protocol.TType.LIST, (short)6); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -78,7 +77,6 @@ import org.slf4j.LoggerFactory; schemes.put(TupleScheme.class, new ApplicationInterfaceDescriptionTupleSchemeFactory()); } - private boolean isEmpty; // required private String applicationInterfaceId; // required private String applicationName; // required private String applicationDesription; // optional @@ -88,13 +86,12 @@ import org.slf4j.LoggerFactory; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { - IS_EMPTY((short)1, "isEmpty"), - APPLICATION_INTERFACE_ID((short)2, "applicationInterfaceId"), - APPLICATION_NAME((short)3, "applicationName"), - APPLICATION_DESRIPTION((short)4, "applicationDesription"), - APPLICATION_MODULES((short)5, "applicationModules"), - APPLICATION_INPUTS((short)6, "applicationInputs"), - APPLICATION_OUTPUTS((short)7, "applicationOutputs"); + APPLICATION_INTERFACE_ID((short)1, "applicationInterfaceId"), + APPLICATION_NAME((short)2, "applicationName"), + APPLICATION_DESRIPTION((short)3, "applicationDesription"), + APPLICATION_MODULES((short)4, "applicationModules"), + APPLICATION_INPUTS((short)5, "applicationInputs"), + APPLICATION_OUTPUTS((short)6, "applicationOutputs"); private static final Map byName = new HashMap(); @@ -109,19 +106,17 @@ import org.slf4j.LoggerFactory; */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // IS_EMPTY - return IS_EMPTY; - case 2: // APPLICATION_INTERFACE_ID + case 1: // APPLICATION_INTERFACE_ID return APPLICATION_INTERFACE_ID; - case 3: // APPLICATION_NAME + case 2: // APPLICATION_NAME return APPLICATION_NAME; - case 4: // APPLICATION_DESRIPTION + case 3: // APPLICATION_DESRIPTION return APPLICATION_DESRIPTION; - case 5: // APPLICATION_MODULES + case 4: // APPLICATION_MODULES return APPLICATION_MODULES; - case 6: // APPLICATION_INPUTS + case 5: // APPLICATION_INPUTS return APPLICATION_INPUTS; - case 7: // APPLICATION_OUTPUTS + case 6: // APPLICATION_OUTPUTS return APPLICATION_OUTPUTS; default: return null; @@ -163,14 +158,10 @@ import org.slf4j.LoggerFactory; } // isset id assignments - private static final int __ISEMPTY_ISSET_ID = 0; - private byte __isset_bitfield = 0; private _Fields optionals[] = {_Fields.APPLICATION_DESRIPTION,_Fields.APPLICATION_MODULES,_Fields.APPLICATION_INPUTS,_Fields.APPLICATION_OUTPUTS}; 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.IS_EMPTY, new org.apache.thrift.meta_data.FieldMetaData("isEmpty", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.APPLICATION_INTERFACE_ID, new org.apache.thrift.meta_data.FieldMetaData("applicationInterfaceId", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.APPLICATION_NAME, new org.apache.thrift.meta_data.FieldMetaData("applicationName", org.apache.thrift.TFieldRequirementType.REQUIRED, @@ -191,20 +182,15 @@ import org.slf4j.LoggerFactory; } public ApplicationInterfaceDescription() { - this.isEmpty = false; - this.applicationInterfaceId = "DO_NOT_SET_AT_CLIENTS"; } public ApplicationInterfaceDescription( - boolean isEmpty, String applicationInterfaceId, String applicationName) { this(); - this.isEmpty = isEmpty; - setIsEmptyIsSet(true); this.applicationInterfaceId = applicationInterfaceId; this.applicationName = applicationName; } @@ -213,8 +199,6 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on other. */ public ApplicationInterfaceDescription(ApplicationInterfaceDescription other) { - __isset_bitfield = other.__isset_bitfield; - this.isEmpty = other.isEmpty; if (other.isSetApplicationInterfaceId()) { this.applicationInterfaceId = other.applicationInterfaceId; } @@ -250,8 +234,6 @@ import org.slf4j.LoggerFactory; @Override public void clear() { - this.isEmpty = false; - this.applicationInterfaceId = "DO_NOT_SET_AT_CLIENTS"; this.applicationName = null; @@ -261,28 +243,6 @@ import org.slf4j.LoggerFactory; this.applicationOutputs = null; } - public boolean isIsEmpty() { - return this.isEmpty; - } - - public void setIsEmpty(boolean isEmpty) { - this.isEmpty = isEmpty; - setIsEmptyIsSet(true); - } - - public void unsetIsEmpty() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISEMPTY_ISSET_ID); - } - - /** Returns true if field isEmpty is set (has been assigned a value) and false otherwise */ - public boolean isSetIsEmpty() { - return EncodingUtils.testBit(__isset_bitfield, __ISEMPTY_ISSET_ID); - } - - public void setIsEmptyIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISEMPTY_ISSET_ID, value); - } - public String getApplicationInterfaceId() { return this.applicationInterfaceId; } @@ -468,14 +428,6 @@ import org.slf4j.LoggerFactory; public void setFieldValue(_Fields field, Object value) { switch (field) { - case IS_EMPTY: - if (value == null) { - unsetIsEmpty(); - } else { - setIsEmpty((Boolean)value); - } - break; - case APPLICATION_INTERFACE_ID: if (value == null) { unsetApplicationInterfaceId(); @@ -529,9 +481,6 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { - case IS_EMPTY: - return Boolean.valueOf(isIsEmpty()); - case APPLICATION_INTERFACE_ID: return getApplicationInterfaceId(); @@ -561,8 +510,6 @@ import org.slf4j.LoggerFactory; } switch (field) { - case IS_EMPTY: - return isSetIsEmpty(); case APPLICATION_INTERFACE_ID: return isSetApplicationInterfaceId(); case APPLICATION_NAME: @@ -592,15 +539,6 @@ import org.slf4j.LoggerFactory; if (that == null) return false; - boolean this_present_isEmpty = true; - boolean that_present_isEmpty = true; - if (this_present_isEmpty || that_present_isEmpty) { - if (!(this_present_isEmpty && that_present_isEmpty)) - return false; - if (this.isEmpty != that.isEmpty) - return false; - } - boolean this_present_applicationInterfaceId = true && this.isSetApplicationInterfaceId(); boolean that_present_applicationInterfaceId = true && that.isSetApplicationInterfaceId(); if (this_present_applicationInterfaceId || that_present_applicationInterfaceId) { @@ -671,16 +609,6 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetIsEmpty()).compareTo(other.isSetIsEmpty()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetIsEmpty()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isEmpty, other.isEmpty); - if (lastComparison != 0) { - return lastComparison; - } - } lastComparison = Boolean.valueOf(isSetApplicationInterfaceId()).compareTo(other.isSetApplicationInterfaceId()); if (lastComparison != 0) { return lastComparison; @@ -761,10 +689,6 @@ import org.slf4j.LoggerFactory; StringBuilder sb = new StringBuilder("ApplicationInterfaceDescription("); boolean first = true; - sb.append("isEmpty:"); - sb.append(this.isEmpty); - first = false; - if (!first) sb.append(", "); sb.append("applicationInterfaceId:"); if (this.applicationInterfaceId == null) { sb.append("null"); @@ -826,10 +750,6 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields - if (!isSetIsEmpty()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'isEmpty' is unset! Struct:" + toString()); - } - if (!isSetApplicationInterfaceId()) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'applicationInterfaceId' is unset! Struct:" + toString()); } @@ -851,8 +771,6 @@ import org.slf4j.LoggerFactory; 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); @@ -877,15 +795,7 @@ import org.slf4j.LoggerFactory; break; } switch (schemeField.id) { - case 1: // IS_EMPTY - if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { - struct.isEmpty = iprot.readBool(); - struct.setIsEmptyIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 2: // APPLICATION_INTERFACE_ID + case 1: // APPLICATION_INTERFACE_ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.applicationInterfaceId = iprot.readString(); struct.setApplicationInterfaceIdIsSet(true); @@ -893,7 +803,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // APPLICATION_NAME + case 2: // APPLICATION_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.applicationName = iprot.readString(); struct.setApplicationNameIsSet(true); @@ -901,7 +811,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // APPLICATION_DESRIPTION + case 3: // APPLICATION_DESRIPTION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.applicationDesription = iprot.readString(); struct.setApplicationDesriptionIsSet(true); @@ -909,7 +819,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // APPLICATION_MODULES + case 4: // APPLICATION_MODULES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); @@ -927,7 +837,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // APPLICATION_INPUTS + case 5: // APPLICATION_INPUTS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list3 = iprot.readListBegin(); @@ -946,7 +856,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 7: // APPLICATION_OUTPUTS + case 6: // APPLICATION_OUTPUTS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list6 = iprot.readListBegin(); @@ -978,9 +888,6 @@ import org.slf4j.LoggerFactory; struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - oprot.writeFieldBegin(IS_EMPTY_FIELD_DESC); - oprot.writeBool(struct.isEmpty); - oprot.writeFieldEnd(); if (struct.applicationInterfaceId != null) { oprot.writeFieldBegin(APPLICATION_INTERFACE_ID_FIELD_DESC); oprot.writeString(struct.applicationInterfaceId); @@ -1057,7 +964,6 @@ import org.slf4j.LoggerFactory; @Override public void write(org.apache.thrift.protocol.TProtocol prot, ApplicationInterfaceDescription struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; - oprot.writeBool(struct.isEmpty); oprot.writeString(struct.applicationInterfaceId); oprot.writeString(struct.applicationName); BitSet optionals = new BitSet(); @@ -1109,8 +1015,6 @@ import org.slf4j.LoggerFactory; @Override public void read(org.apache.thrift.protocol.TProtocol prot, ApplicationInterfaceDescription struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - struct.isEmpty = iprot.readBool(); - struct.setIsEmptyIsSet(true); struct.applicationInterfaceId = iprot.readString(); struct.setApplicationInterfaceIdIsSet(true); struct.applicationName = iprot.readString(); http://git-wip-us.apache.org/repos/asf/airavata/blob/9c5d4bf2/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java index 50f76b8..973af8a 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/appinterface/InputDataObjectType.java @@ -77,14 +77,13 @@ import org.slf4j.LoggerFactory; @SuppressWarnings("all") public class InputDataObjectType 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("InputDataObjectType"); - private static final org.apache.thrift.protocol.TField IS_EMPTY_FIELD_DESC = new org.apache.thrift.protocol.TField("isEmpty", org.apache.thrift.protocol.TType.BOOL, (short)1); - private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)2); - private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)3); - private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)4); - private static final org.apache.thrift.protocol.TField APPLICATION_ARGUMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationArgument", org.apache.thrift.protocol.TType.STRING, (short)5); - private static final org.apache.thrift.protocol.TField STANDARD_INPUT_FIELD_DESC = new org.apache.thrift.protocol.TField("standardInput", org.apache.thrift.protocol.TType.BOOL, (short)6); - private static final org.apache.thrift.protocol.TField USER_FRIENDLY_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("userFriendlyDescription", org.apache.thrift.protocol.TType.STRING, (short)7); - private static final org.apache.thrift.protocol.TField META_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("metaData", org.apache.thrift.protocol.TType.STRING, (short)8); + private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)3); + private static final org.apache.thrift.protocol.TField APPLICATION_ARGUMENT_FIELD_DESC = new org.apache.thrift.protocol.TField("applicationArgument", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField STANDARD_INPUT_FIELD_DESC = new org.apache.thrift.protocol.TField("standardInput", org.apache.thrift.protocol.TType.BOOL, (short)5); + private static final org.apache.thrift.protocol.TField USER_FRIENDLY_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("userFriendlyDescription", org.apache.thrift.protocol.TType.STRING, (short)6); + private static final org.apache.thrift.protocol.TField META_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("metaData", org.apache.thrift.protocol.TType.STRING, (short)7); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -92,7 +91,6 @@ import org.slf4j.LoggerFactory; schemes.put(TupleScheme.class, new InputDataObjectTypeTupleSchemeFactory()); } - private boolean isEmpty; // required private String name; // required private String value; // optional private DataType type; // optional @@ -103,18 +101,17 @@ import org.slf4j.LoggerFactory; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { - IS_EMPTY((short)1, "isEmpty"), - NAME((short)2, "name"), - VALUE((short)3, "value"), + NAME((short)1, "name"), + VALUE((short)2, "value"), /** * * @see DataType */ - TYPE((short)4, "type"), - APPLICATION_ARGUMENT((short)5, "applicationArgument"), - STANDARD_INPUT((short)6, "standardInput"), - USER_FRIENDLY_DESCRIPTION((short)7, "userFriendlyDescription"), - META_DATA((short)8, "metaData"); + TYPE((short)3, "type"), + APPLICATION_ARGUMENT((short)4, "applicationArgument"), + STANDARD_INPUT((short)5, "standardInput"), + USER_FRIENDLY_DESCRIPTION((short)6, "userFriendlyDescription"), + META_DATA((short)7, "metaData"); private static final Map byName = new HashMap(); @@ -129,21 +126,19 @@ import org.slf4j.LoggerFactory; */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // IS_EMPTY - return IS_EMPTY; - case 2: // NAME + case 1: // NAME return NAME; - case 3: // VALUE + case 2: // VALUE return VALUE; - case 4: // TYPE + case 3: // TYPE return TYPE; - case 5: // APPLICATION_ARGUMENT + case 4: // APPLICATION_ARGUMENT return APPLICATION_ARGUMENT; - case 6: // STANDARD_INPUT + case 5: // STANDARD_INPUT return STANDARD_INPUT; - case 7: // USER_FRIENDLY_DESCRIPTION + case 6: // USER_FRIENDLY_DESCRIPTION return USER_FRIENDLY_DESCRIPTION; - case 8: // META_DATA + case 7: // META_DATA return META_DATA; default: return null; @@ -185,15 +180,12 @@ import org.slf4j.LoggerFactory; } // isset id assignments - private static final int __ISEMPTY_ISSET_ID = 0; - private static final int __STANDARDINPUT_ISSET_ID = 1; + private static final int __STANDARDINPUT_ISSET_ID = 0; private byte __isset_bitfield = 0; private _Fields optionals[] = {_Fields.VALUE,_Fields.TYPE,_Fields.APPLICATION_ARGUMENT,_Fields.STANDARD_INPUT,_Fields.USER_FRIENDLY_DESCRIPTION,_Fields.META_DATA}; 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.IS_EMPTY, new org.apache.thrift.meta_data.FieldMetaData("isEmpty", org.apache.thrift.TFieldRequirementType.REQUIRED, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -213,19 +205,14 @@ import org.slf4j.LoggerFactory; } public InputDataObjectType() { - this.isEmpty = false; - this.standardInput = false; } public InputDataObjectType( - boolean isEmpty, String name) { this(); - this.isEmpty = isEmpty; - setIsEmptyIsSet(true); this.name = name; } @@ -234,7 +221,6 @@ import org.slf4j.LoggerFactory; */ public InputDataObjectType(InputDataObjectType other) { __isset_bitfield = other.__isset_bitfield; - this.isEmpty = other.isEmpty; if (other.isSetName()) { this.name = other.name; } @@ -262,8 +248,6 @@ import org.slf4j.LoggerFactory; @Override public void clear() { - this.isEmpty = false; - this.name = null; this.value = null; this.type = null; @@ -274,28 +258,6 @@ import org.slf4j.LoggerFactory; this.metaData = null; } - public boolean isIsEmpty() { - return this.isEmpty; - } - - public void setIsEmpty(boolean isEmpty) { - this.isEmpty = isEmpty; - setIsEmptyIsSet(true); - } - - public void unsetIsEmpty() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISEMPTY_ISSET_ID); - } - - /** Returns true if field isEmpty is set (has been assigned a value) and false otherwise */ - public boolean isSetIsEmpty() { - return EncodingUtils.testBit(__isset_bitfield, __ISEMPTY_ISSET_ID); - } - - public void setIsEmptyIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISEMPTY_ISSET_ID, value); - } - public String getName() { return this.name; } @@ -466,14 +428,6 @@ import org.slf4j.LoggerFactory; public void setFieldValue(_Fields field, Object value) { switch (field) { - case IS_EMPTY: - if (value == null) { - unsetIsEmpty(); - } else { - setIsEmpty((Boolean)value); - } - break; - case NAME: if (value == null) { unsetName(); @@ -535,9 +489,6 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { - case IS_EMPTY: - return Boolean.valueOf(isIsEmpty()); - case NAME: return getName(); @@ -570,8 +521,6 @@ import org.slf4j.LoggerFactory; } switch (field) { - case IS_EMPTY: - return isSetIsEmpty(); case NAME: return isSetName(); case VALUE: @@ -603,15 +552,6 @@ import org.slf4j.LoggerFactory; if (that == null) return false; - boolean this_present_isEmpty = true; - boolean that_present_isEmpty = true; - if (this_present_isEmpty || that_present_isEmpty) { - if (!(this_present_isEmpty && that_present_isEmpty)) - return false; - if (this.isEmpty != that.isEmpty) - return false; - } - boolean this_present_name = true && this.isSetName(); boolean that_present_name = true && that.isSetName(); if (this_present_name || that_present_name) { @@ -691,16 +631,6 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetIsEmpty()).compareTo(other.isSetIsEmpty()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetIsEmpty()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isEmpty, other.isEmpty); - if (lastComparison != 0) { - return lastComparison; - } - } lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName()); if (lastComparison != 0) { return lastComparison; @@ -791,10 +721,6 @@ import org.slf4j.LoggerFactory; StringBuilder sb = new StringBuilder("InputDataObjectType("); boolean first = true; - sb.append("isEmpty:"); - sb.append(this.isEmpty); - first = false; - if (!first) sb.append(", "); sb.append("name:"); if (this.name == null) { sb.append("null"); @@ -864,10 +790,6 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields - if (!isSetIsEmpty()) { - throw new org.apache.thrift.protocol.TProtocolException("Required field 'isEmpty' is unset! Struct:" + toString()); - } - if (!isSetName()) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'name' is unset! Struct:" + toString()); } @@ -911,15 +833,7 @@ import org.slf4j.LoggerFactory; break; } switch (schemeField.id) { - case 1: // IS_EMPTY - if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { - struct.isEmpty = iprot.readBool(); - struct.setIsEmptyIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 2: // NAME + case 1: // NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.name = iprot.readString(); struct.setNameIsSet(true); @@ -927,7 +841,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // VALUE + case 2: // VALUE if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.value = iprot.readString(); struct.setValueIsSet(true); @@ -935,7 +849,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // TYPE + case 3: // TYPE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.type = DataType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); @@ -943,7 +857,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // APPLICATION_ARGUMENT + case 4: // APPLICATION_ARGUMENT if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.applicationArgument = iprot.readString(); struct.setApplicationArgumentIsSet(true); @@ -951,7 +865,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // STANDARD_INPUT + case 5: // STANDARD_INPUT if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.standardInput = iprot.readBool(); struct.setStandardInputIsSet(true); @@ -959,7 +873,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 7: // USER_FRIENDLY_DESCRIPTION + case 6: // USER_FRIENDLY_DESCRIPTION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.userFriendlyDescription = iprot.readString(); struct.setUserFriendlyDescriptionIsSet(true); @@ -967,7 +881,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 8: // META_DATA + case 7: // META_DATA if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.metaData = iprot.readString(); struct.setMetaDataIsSet(true); @@ -988,9 +902,6 @@ import org.slf4j.LoggerFactory; struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - oprot.writeFieldBegin(IS_EMPTY_FIELD_DESC); - oprot.writeBool(struct.isEmpty); - oprot.writeFieldEnd(); if (struct.name != null) { oprot.writeFieldBegin(NAME_FIELD_DESC); oprot.writeString(struct.name); @@ -1053,7 +964,6 @@ import org.slf4j.LoggerFactory; @Override public void write(org.apache.thrift.protocol.TProtocol prot, InputDataObjectType struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; - oprot.writeBool(struct.isEmpty); oprot.writeString(struct.name); BitSet optionals = new BitSet(); if (struct.isSetValue()) { @@ -1098,8 +1008,6 @@ import org.slf4j.LoggerFactory; @Override public void read(org.apache.thrift.protocol.TProtocol prot, InputDataObjectType struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - struct.isEmpty = iprot.readBool(); - struct.setIsEmptyIsSet(true); struct.name = iprot.readString(); struct.setNameIsSet(true); BitSet incoming = iprot.readBitSet(6);